Merge branch 'main' into feat/delta-api-test

Unleash · Dec 30, 2024 · 328ad0d · 328ad0d
2 parents 310456b + 5633529
commit 328ad0d
Show file tree

Hide file tree

Showing 114 changed files with 2,394 additions and 1,999 deletions.
diff --git a/.github/workflows/docker_publish.yaml b/.github/workflows/docker_publish.yaml
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [ 20.14.0-alpine ]
+        version: [ 20.18.1-alpine ]
     steps:
       - name: Checkout tag v${{ inputs.version }}
         if: ${{ inputs.version != '' }}
@@ -51,9 +51,7 @@ jobs:
             type=semver,pattern={{ major }}.{{ minor }},enable=${{ github.event_name == 'workflow_dispatch' && inputs.version != '' }},value=${{ inputs.version }}
             type=semver,pattern={{ major }},enable=${{ github.event_name == 'workflow_dispatch' && inputs.version != '' }},value=${{ inputs.version }}
             # only enabled in main:
-            type=edge,prefix=main-,suffix=-${{ matrix.version }},enable=${{ github.ref == 'refs/heads/main' }}
-            # only enabled on workflow_dispatch:
-            type=sha,suffix=-${{ matrix.version }},enable=${{ github.event_name == 'workflow_dispatch' }}
+            type=edge,prefix=main-,enable=${{ github.ref == 'refs/heads/main' }}
       - name: Login to docker hub
         uses: docker/login-action@v3
         with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,57 @@
 
 All notable changes to this project will be documented in this file.
 
+## [6.5.3] - 2024-12-19
+
+### Bug Fixes
+
+- Use strategyName instead of name property for component to load ([#8983](https://github.com/Unleash/unleash/issues/8983))
+
+- Can't sort on undefined sdks ([#8982](https://github.com/Unleash/unleash/issues/8982))
+
+- Now null sdks will also be handled nicely ([#8984](https://github.com/Unleash/unleash/issues/8984))
+
+- Check for enterprise in the create/edit templates UI ([#8985](https://github.com/Unleash/unleash/issues/8985))
+
+- Streaming error handling ([#8999](https://github.com/Unleash/unleash/issues/8999))
+
+
+### Documentation
+
+- Swapi.dev no longer exists ([#8997](https://github.com/Unleash/unleash/issues/8997))
+
+
+### Features
+
+- Move delta controller to new path ([#8981](https://github.com/Unleash/unleash/issues/8981))
+
+- Add prom metrics ([#8980](https://github.com/Unleash/unleash/issues/8980))
+
+- Segment delta ([#8990](https://github.com/Unleash/unleash/issues/8990))
+
+- Authentication configuration permission ([#8987](https://github.com/Unleash/unleash/issues/8987))
+
+- Release templates strategy interaction improvements ([#8992](https://github.com/Unleash/unleash/issues/8992))
+
+- Date range selector ([#8991](https://github.com/Unleash/unleash/issues/8991))
+
+- Store memory footprints to grafana ([#9001](https://github.com/Unleash/unleash/issues/9001))
+
+
+### Miscellaneous Tasks
+
+- Rebrand cache to delta ([#8986](https://github.com/Unleash/unleash/issues/8986))
+
+- Rename to seats used ([#8993](https://github.com/Unleash/unleash/issues/8993))
+
+- Default event log span 1 year ([#8995](https://github.com/Unleash/unleash/issues/8995))
+
+
+### Migration
+
+- Add auth config permission ([#8988](https://github.com/Unleash/unleash/issues/8988))
+
+
 ## [6.5.2] - 2024-12-13
 
 ### Bug Fixes

diff --git a/README.md b/README.md
@@ -143,7 +143,7 @@ Check out [the CONTRIBUTING.md file](./CONTRIBUTING.md) for contribution guideli
 - 2 [environments](https://docs.getunleash.io/reference/environments)
 - Organize feature flags using [tags](https://docs.getunleash.io/reference/feature-toggles#tags)
 - Out-of-the-box integrations with popular tools ([Slack](https://docs.getunleash.io/addons/slack), [Microsoft Teams](https://docs.getunleash.io/addons/teams), [Datadog](https://docs.getunleash.io/addons/datadog)) + integrate with anything with [webhooks](https://docs.getunleash.io/addons/webhook)
-- [Dashboard for managing technical debt](https://docs.getunleash.io/reference/technical-debt) and [stale flags](https://docs.getunleash.io/reference/technical-debt#stale-and-potentially-stale-toggles)
+- [Insights for managing technical debt](https://docs.getunleash.io/reference/technical-debt) and [stale flags](https://docs.getunleash.io/reference/technical-debt#stale-and-potentially-stale-flags)
 - API-first: _everything_ can be automated. No exceptions.
 - [12 official client SDKs](https://docs.getunleash.io/reference/sdks#official-sdks), and 10 [community-contributed client SDKs](https://docs.getunleash.io/reference/sdks#community-sdks)
 - Run it via Docker with the [official Docker image](https://hub.docker.com/r/unleashorg/unleash-server) or as a pure Node.js application

diff --git a/frontend/package.json b/frontend/package.json
@@ -48,7 +48,7 @@
     "@tanstack/react-table": "^8.10.7",
     "@testing-library/dom": "10.4.0",
     "@testing-library/jest-dom": "6.6.3",
-    "@testing-library/react": "16.0.1",
+    "@testing-library/react": "16.1.0",
     "@testing-library/user-event": "14.5.2",
     "@types/css-mediaquery": "^0.1.4",
     "@types/debounce": "1.2.4",
@@ -59,15 +59,15 @@
     "@types/lodash.mapvalues": "^4.6.9",
     "@types/lodash.omit": "4.5.9",
     "@types/node": "^20.12.12",
-    "@types/react": "18.3.12",
-    "@types/react-dom": "18.3.1",
+    "@types/react": "18.3.17",
+    "@types/react-dom": "18.3.5",
     "@types/react-router-dom": "5.3.3",
     "@types/react-table": "7.7.20",
-    "@types/react-test-renderer": "18.3.0",
+    "@types/react-test-renderer": "18.3.1",
     "@types/semver": "7.5.8",
     "@types/uuid": "^9.0.0",
-    "@uiw/codemirror-theme-duotone": "4.23.6",
-    "@uiw/react-codemirror": "4.23.6",
+    "@uiw/codemirror-theme-duotone": "4.23.7",
+    "@uiw/react-codemirror": "4.23.7",
     "@vitejs/plugin-react": "4.3.4",
     "cartesian": "^1.0.1",
     "chart.js": "3.9.1",
@@ -77,7 +77,7 @@
     "copy-to-clipboard": "3.3.3",
     "countries-and-timezones": "^3.4.0",
     "css-mediaquery": "^0.1.2",
-    "cypress": "13.16.0",
+    "cypress": "13.17.0",
     "cypress-vite": "^1.4.0",
     "date-fns": "2.30.0",
     "date-fns-tz": "^2.0.0",
@@ -93,7 +93,7 @@
     "lodash.mapvalues": "^4.6.0",
     "lodash.omit": "4.5.0",
     "millify": "^6.0.0",
-    "msw": "2.6.6",
+    "msw": "2.7.0",
     "orval": "^6.31.0",
     "pkginfo": "0.4.1",
     "plausible-tracker": "0.3.9",
@@ -112,10 +112,10 @@
     "react-router-dom": "6.16.0",
     "react-table": "7.8.0",
     "react-test-renderer": "18.3.1",
-    "sass": "1.81.1",
+    "sass": "1.83.0",
     "semver": "7.6.3",
     "swr": "2.2.5",
-    "tss-react": "4.9.13",
+    "tss-react": "4.9.14",
     "typescript": "5.4.5",
     "use-query-params": "^2.2.1",
     "vanilla-jsoneditor": "^0.23.0",
@@ -127,14 +127,14 @@
     "whatwg-fetch": "3.6.20"
   },
   "resolutions": {
-    "@codemirror/state": "6.4.1",
+    "@codemirror/state": "6.5.0",
     "@xmldom/xmldom": "^0.9.0",
     "jsonpath-plus": "10.2.0",
     "json5": "^2.2.2",
     "vite": "5.4.11",
     "semver": "7.6.3",
     "ws": "^8.18.0",
-    "@types/react": "18.3.12"
+    "@types/react": "18.3.17"
   },
   "jest": {
     "moduleNameMapper": {

diff --git a/frontend/src/assets/icons/AI.svg b/frontend/src/assets/icons/AI.svg
diff --git a/frontend/src/assets/img/aiPreview.svg b/frontend/src/assets/img/aiPreview.svg
diff --git a/frontend/src/component/admin/auth/AuthSettings.tsx b/frontend/src/component/admin/auth/AuthSettings.tsx
@@ -8,7 +8,7 @@ import { ScimSettings } from './ScimSettings/ScimSettings';
 import { PasswordAuth } from './PasswordAuth/PasswordAuth';
 import { GoogleAuth } from './GoogleAuth/GoogleAuth';
 import { PermissionGuard } from 'component/common/PermissionGuard/PermissionGuard';
-import { ADMIN } from '@server/types/permissions';
+import { ADMIN, UPDATE_AUTH_CONFIGURATION } from '@server/types/permissions';
 import { PremiumFeature } from 'component/common/PremiumFeature/PremiumFeature';
 import { useState } from 'react';
 import { TabPanel } from 'component/common/TabNav/TabPanel/TabPanel';
@@ -51,7 +51,7 @@ export const AuthSettings = () => {
 
     return (
         <div>
-            <PermissionGuard permissions={ADMIN}>
+            <PermissionGuard permissions={[ADMIN, UPDATE_AUTH_CONFIGURATION]}>
                 <PageContent
                     withTabs
                     header={

diff --git a/.../src/component/admin/roles/RoleForm/RolePermissionCategories/RolePermissionCategories.tsx b/.../src/component/admin/roles/RoleForm/RolePermissionCategories/RolePermissionCategories.tsx
@@ -91,7 +91,8 @@ export const RolePermissionCategories = ({
                     .filter(
                         ({ label }) =>
                             granularAdminPermissionsEnabled ||
-                            label !== 'Instance maintenance',
+                            (label !== 'Instance maintenance' &&
+                                label !== 'Authentication'),
                     )
                     .map(({ label, type, permissions }) => (
                         <RolePermissionCategory

diff --git a/frontend/src/component/admin/users/UsersHeader/LicensedUsersSidebar.tsx b/frontend/src/component/admin/users/UsersHeader/LicensedUsersSidebar.tsx
@@ -90,7 +90,7 @@ export const LicensedUsersSidebar = ({
         >
             <ModalContentContainer>
                 <HeaderRow>
-                    <ModalHeader>Licensed seats</ModalHeader>
+                    <ModalHeader>Seats used</ModalHeader>
                 </HeaderRow>
                 <WidgetContainer>
                     <Row>