Merge branch 'main' into melinda/admin-tokens-docs

# Conflicts: # website/docusaurus.config.ts
Unleash · Jan 30, 2025 · 5ae3b20 · 5ae3b20
2 parents f73fcbf + 87a8442
commit 5ae3b20
Show file tree

Hide file tree

Showing 132 changed files with 5,802 additions and 2,387 deletions.
diff --git a/.github/workflows/docker_publish.yaml b/.github/workflows/docker_publish.yaml
@@ -1,5 +1,9 @@
 name: Publish to dockerhub
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 on:
   push:
     branches:
@@ -10,7 +14,7 @@ on:
     inputs:
       version:
         description: "Which version to release"
-        type: 'string'
+        type: "string"
         required: true
       is-latest-version:
         description: Is this the latest version? If latest we'll update the version docker
@@ -19,12 +23,16 @@ on:
         default: true
   workflow_dispatch:
 
+permissions:
+  id-token: write
+  contents: read
+
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [ 20.18.1-alpine ]
+        version: [20.18.1-alpine]
     steps:
       - name: Checkout tag v${{ inputs.version }}
         if: ${{ inputs.version != '' }}
@@ -34,6 +42,17 @@ jobs:
       - name: Checkout
         if: ${{ inputs.version == '' }}
         uses: actions/checkout@v4
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: arn:aws:iam::726824350591:role/unleash-github-ecr-public-publish-role
+          role-session-name: unleash-actions-push-to-ecr-public
+          aws-region: us-east-1
+      - name: Login to AWS ECR
+        id: login-ecr-public
+        uses: aws-actions/amazon-ecr-login@v2
+        with:
+          registry-type: public
       - name: Setup QEmu so we can build multiplatform
         uses: docker/setup-qemu-action@v3
       - name: Setup Docker buildx
@@ -44,6 +63,7 @@ jobs:
         with:
           images: |
             unleashorg/unleash-server
+            public.ecr.aws/unleashorg/unleash-server
           flavor: latest=${{ github.event.inputs.is-latest-version || 'auto' }}
           tags: |
             # only enabled for workflow dispatch except main (assume its a release):

diff --git a/.github/workflows/notify_enterprise.yaml b/.github/workflows/notify_enterprise.yaml
@@ -29,10 +29,10 @@ jobs:
           github-token: ${{ secrets.UNLEASH_CI_BUILDER_GITHUB_TOKEN }}
           script: |
             await github.rest.actions.createWorkflowDispatch({
-              owner: 'ivarconr',
+              owner: 'bricks-software',
               repo: 'unleash-enterprise',
               workflow_id: 'cicd.yaml',
-              ref: 'master',
+              ref: 'main',
               inputs: {
                  commit: "${{ github.event.head_commit.id }}",
                  actor: ${{ toJSON(env.COMMIT_ACTOR) }},

diff --git a/frontend/package.json b/frontend/package.json
@@ -59,7 +59,7 @@
     "@types/lodash.mapvalues": "^4.6.9",
     "@types/lodash.omit": "4.5.9",
     "@types/node": "^20.12.12",
-    "@types/react": "18.3.17",
+    "@types/react": "18.3.18",
     "@types/react-dom": "18.3.5",
     "@types/react-router-dom": "5.3.3",
     "@types/react-table": "7.7.20",
@@ -119,22 +119,22 @@
     "typescript": "5.4.5",
     "use-query-params": "^2.2.1",
     "vanilla-jsoneditor": "^0.23.0",
-    "vite": "5.4.11",
+    "vite": "5.4.12",
     "vite-plugin-env-compatible": "2.0.1",
     "vite-plugin-svgr": "3.3.0",
     "vite-tsconfig-paths": "4.3.2",
     "vitest": "1.4.0",
     "whatwg-fetch": "3.6.20"
   },
   "resolutions": {
-    "@codemirror/state": "6.5.0",
+    "@codemirror/state": "6.5.1",
     "@xmldom/xmldom": "^0.9.0",
     "jsonpath-plus": "10.2.0",
     "json5": "^2.2.2",
-    "vite": "5.4.11",
+    "vite": "5.4.12",
     "semver": "7.6.3",
     "ws": "^8.18.0",
-    "@types/react": "18.3.17"
+    "@types/react": "18.3.18"
   },
   "jest": {
     "moduleNameMapper": {

diff --git a/frontend/src/assets/img/lifecycle-stages.png b/frontend/src/assets/img/lifecycle-stages.png
diff --git a/frontend/src/component/App.tsx b/frontend/src/component/App.tsx
@@ -23,6 +23,7 @@ import { LicenseBanner } from './banners/internalBanners/LicenseBanner';
 import { Demo } from './demo/Demo';
 import { LoginRedirect } from './common/LoginRedirect/LoginRedirect';
 import { SecurityBanner } from './banners/internalBanners/SecurityBanner';
+import { useUiFlag } from 'hooks/useUiFlag';
 
 const StyledContainer = styled('div')(() => ({
     '& ul': {
@@ -33,6 +34,7 @@ const StyledContainer = styled('div')(() => ({
 export const App = () => {
     const { authDetails } = useAuthDetails();
     const { refetch: refetchUiConfig } = useUiConfig();
+    const uiGlobalFontSizeVariant = useUiFlag('uiGlobalFontSize');
 
     const { user } = useAuthUser();
     const hasFetchedAuth = Boolean(authDetails || user);
@@ -43,6 +45,33 @@ export const App = () => {
         ? routes.filter((route) => !route.enterprise)
         : routes;
 
+    useEffect(() => {
+        let style: HTMLStyleElement | null = null;
+        if (!uiGlobalFontSizeVariant) return;
+        if (!uiGlobalFontSizeVariant.enabled) return;
+
+        try {
+            style = document.createElement('style');
+            style.type = 'text/css';
+            style.innerHTML = `
+                html {
+                    font-size: ${uiGlobalFontSizeVariant?.payload?.value}px;
+                    height: 100%;
+                    overflow: auto;
+                    overflow-y: scroll;
+                }
+            `;
+            document.head.appendChild(style);
+        } catch (err) {
+            console.error('Error setting global font size', err);
+        }
+
+        return () => {
+            if (!style) return;
+            document.head.removeChild(style);
+        };
+    }, [JSON.stringify(uiGlobalFontSizeVariant)]);
+
     useEffect(() => {
         if (hasFetchedAuth && Boolean(user?.id)) {
             refetchUiConfig();