Merge branch 'main' into rkeyser/reinvite-flow

Author: RobertKeyser

.github/workflows/backend_checks.yml

@@ -193,6 +193,49 @@ jobs:
       - name: Run Celery worker startup check
         run: nox -s check_worker_startup
 
+  Migration-Checks:
+    needs: [Check-Backend-Changes, Check-Container-Startup]
+    if: needs.Check-Backend-Changes.outputs.has_backend_changes == 'true'
+    strategy:
+      matrix:
+        test_selection:
+          - "check_migrations"
+          - "check_migration_downgrade"
+
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    continue-on-error: false
+    steps:
+      - name: Download container
+        uses: actions/download-artifact@v4
+        with:
+          name: python-${{ env.DEFAULT_PYTHON_VERSION }}
+          path: /tmp/
+
+      - name: Load image
+        run: docker load --input /tmp/python-${{ env.DEFAULT_PYTHON_VERSION }}.tar
+
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set Up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
+          cache: "pip"
+
+      - name: Install Nox
+        run: pip install nox>=2022
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ env.DOCKER_USER }}
+          password: ${{ env.DOCKER_RO_TOKEN }}
+
+      - name: Run migration test
+        run: nox -s "${{ matrix.test_selection }}"
+
   Misc-Tests:
     needs: [Check-Backend-Changes, Check-Container-Startup]
     if: needs.Check-Backend-Changes.outputs.has_backend_changes == 'true'
@@ -203,7 +246,6 @@ jobs:
           - "fides_db_scan"
           - "docs_check"
           - "minimal_config_startup"
-          - "check_migrations"
 
     runs-on: ubuntu-latest
     timeout-minutes: 15
@@ -523,6 +565,7 @@ jobs:
       - Build
       - Performance-Checks
       - Check-Container-Startup
+      - Migration-Checks
       - Misc-Tests
       - Safe-Tests
       # Unsafe tests are optional, so we don't include them in the summary
@@ -533,13 +576,15 @@ jobs:
           echo "Build: ${{ needs.Build.result }}"
           echo "Performance-Checks: ${{ needs.Performance-Checks.result }}"
           echo "Check-Container-Startup: ${{ needs.Check-Container-Startup.result }}"
+          echo "Migration-Checks: ${{ needs.Migration-Checks.result }}"
           echo "Misc-Tests: ${{ needs.Misc-Tests.result }}"
           echo "Safe-Tests: ${{ needs.Safe-Tests.result }}"
 
           # Fail only if jobs failed (not if skipped)
           if [ "${{ needs.Collect-Tests.result }}" == "failure" ] || \
              [ "${{ needs.Build.result }}" == "failure" ] || \
              [ "${{ needs.Check-Container-Startup.result }}" == "failure" ] || \
+             [ "${{ needs.Migration-Checks.result }}" == "failure" ] || \
              [ "${{ needs.Misc-Tests.result }}" == "failure" ] || \
              [ "${{ needs.Safe-Tests.result }}" == "failure" ]; then
             echo "❌ One or more required jobs failed"
@@ -550,6 +595,7 @@ jobs:
           if [ "${{ needs.Collect-Tests.result }}" == "cancelled" ] || \
              [ "${{ needs.Build.result }}" == "cancelled" ] || \
              [ "${{ needs.Check-Container-Startup.result }}" == "cancelled" ] || \
+             [ "${{ needs.Migration-Checks.result }}" == "cancelled" ] || \
              [ "${{ needs.Misc-Tests.result }}" == "cancelled" ] || \
              [ "${{ needs.Safe-Tests.result }}" == "cancelled" ]; then
             echo "❌ One or more required jobs were cancelled"

CHANGELOG.md

@@ -28,9 +28,12 @@ Changes can also be flagged with a GitHub label for tracking purposes. The URL o
 ### Changed
 - Updated filter modal in new privacy request screen to store filters as query params in url [#6818](https://github.com/ethyca/fides/pull/6818)
 - Improve Privacy Center FidesJS performance and reliability by caching bundles in memory and adding `stale-while-revalidate` and `stale-if-error` cache headers for improved CDN performance and origin failure resilience [#6689](https://github.com/ethyca/fides/pull/6689)
+- Limit action center tree expansion to 4 levels (Database/Schema/Table/Field) by treating fields as leaf nodes [#6907](https://github.com/ethyca/fides/pull/6907)
 
 ### Developer Experience
+- Added keyboard navigation to CustomList component [#6903](https://github.com/ethyca/fides/pull/6903)
 - Added explicit label property to feature flags configuration for flexible display names [#6889](https://github.com/ethyca/fides/pull/6889)
+- Added Cypress command to override feature flags in tests without UI interaction [#6890](https://github.com/ethyca/fides/pull/6890)
 
 ## [2.73.1](https://github.com/ethyca/fides/compare/2.73.0..2.73.1)
 

clients/admin-ui/cypress/e2e/feature-flags.cy.ts

@@ -22,6 +22,7 @@ describe("Feature Flags", () => {
     cy.wait("@createConfigurationSettings");
 
     cy.get("#flag-webMonitor").as("flag");
+    cy.get("@flag").should("have.attr", "aria-checked", "true");
 
     // Check UI and localStorage state has updated
     cy.get("@flag").click().should("have.attr", "aria-checked", "false");
@@ -51,4 +52,45 @@ describe("Feature Flags", () => {
     // Check that both UI and localStorage state remain unchanged
     cy.get("@flag").should("have.attr", "aria-checked", "false");
   });
+
+  it("Override feature flags programmatically via Cypress command", () => {
+    // Initial Login
+    stubOpenIdProviders();
+    stubPlusAuth();
+    cy.login();
+    stubPlus(true);
+
+    // Set flags BEFORE visiting the page - this is the ideal pattern
+    cy.overrideFeatureFlag("webMonitor", false);
+    cy.overrideFeatureFlag("dataCatalog", false);
+
+    // Navigate to feature flags
+    stubFeatureFlags();
+    cy.visit("/settings/about");
+    cy.wait("@createConfigurationSettings");
+
+    // Verify the flags were set correctly on initial load
+    cy.get("#flag-webMonitor").should("have.attr", "aria-checked", "false");
+    cy.get("#flag-dataCatalog").should("have.attr", "aria-checked", "false");
+
+    // Can also override after the page loads and it updates automatically
+    cy.overrideFeatureFlag("webMonitor", true);
+    cy.get("#flag-webMonitor").should("have.attr", "aria-checked", "true");
+  });
+
+  it("Set flags before visiting any page for feature-specific tests", () => {
+    stubOpenIdProviders();
+    stubPlusAuth();
+    cy.login();
+    stubPlus(true);
+
+    // This pattern is useful when testing features behind flags
+    // Set the flag before navigating to test the enabled state
+    cy.overrideFeatureFlag("dataCatalog", false);
+
+    // Now visit a page that uses this flag
+    cy.visit("/data-catalog");
+    // The feature will be disabled from the start
+    cy.getByTestId("Data catalog").should("not.exist");
+  });
 });

clients/admin-ui/cypress/support/commands.ts

@@ -78,6 +78,53 @@ Cypress.Commands.add("assumeRole", (role) => {
   });
 });
 
+Cypress.Commands.add("overrideFeatureFlag", (flagName, value) => {
+  cy.window().then((win) => {
+    // Get or initialize the persisted state from localStorage
+    const storageKey = STORAGE_ROOT_KEY;
+    const persistedStateStr = win.localStorage.getItem(storageKey);
+    const persistedState = persistedStateStr
+      ? JSON.parse(persistedStateStr)
+      : {};
+
+    // Parse the features slice (redux-persist double-stringifies nested objects)
+    const featuresStr = persistedState.features;
+    const features = featuresStr ? JSON.parse(featuresStr) : { flags: {} };
+
+    // Get or create the flag configuration
+    const currentFlag = features.flags[flagName] || {
+      development: value,
+      test: value,
+      production: value,
+    };
+
+    // Update the flag for the current environment
+    const env = process.env.NEXT_PUBLIC_APP_ENV || "test";
+    features.flags[flagName] = {
+      ...currentFlag,
+      [env]: value,
+    };
+
+    // Save back to localStorage
+    persistedState.features = JSON.stringify(features);
+    win.localStorage.setItem(storageKey, JSON.stringify(persistedState));
+
+    // If the Redux store is available (app already loaded), also dispatch to it
+    // eslint-disable-next-line no-underscore-dangle
+    if ((win as any).__REDUX_STORE__) {
+      // eslint-disable-next-line no-underscore-dangle
+      (win as any).__REDUX_STORE__.dispatch({
+        type: "features/override",
+        payload: {
+          flag: flagName,
+          env,
+          value,
+        },
+      });
+    }
+  });
+});
+
 // this prevents an infinite loop that occurs sometimes and causes tests to
 // fail-- see https://github.com/cypress-io/cypress/issues/20341
 Cypress.on("uncaught:exception", (err) => {
@@ -149,6 +196,18 @@ declare global {
        * @example removeMultiValue("input-singlefield");
        */
       clearSingleValue(selectorId: string): void;
+      /**
+       * Override a feature flag value in the Redux store for testing.
+       * This allows you to toggle feature flags on/off during tests
+       * without needing to modify the UI.
+       *
+       * @example cy.overrideFeatureFlag("webMonitor", false)
+       * @example cy.overrideFeatureFlag("dataCatalog", true)
+       */
+      overrideFeatureFlag(
+        flagName: string,
+        value: boolean | string | number,
+      ): void;
     }
   }
 }

clients/admin-ui/global.d.ts

@@ -2,3 +2,10 @@ declare module globalThis {
   // needs to be in global scope of Admin UI for when we import fides-js components which contain fidesDebugger
   let fidesDebugger: (...args: unknown[]) => void;
 }
+
+interface Window {
+  // Cypress is available on window when running in Cypress tests
+  Cypress?: any;
+  // Redux store is exposed for Cypress testing
+  __REDUX_STORE__?: any;
+}

clients/admin-ui/jest.config.js

@@ -43,7 +43,7 @@ module.exports = {
     "^.+\\.(js|jsx|ts|tsx)$": ["babel-jest", { presets: ["next/babel"] }],
   },
   transformIgnorePatterns: [
-    "/node_modules/",
+    "/node_modules/(?!(react-hotkeys-hook)/)",
     "^.+\\.module\\.(css|sass|scss)$",
   ],
   watchPathIgnorePatterns: ["node_modules"],

clients/admin-ui/package.json

@@ -70,6 +70,7 @@
     "react-dnd-html5-backend": "^16.0.1",
     "react-dom": "^18.3.1",
     "react-dropzone": "^14.2.3",
+    "react-hotkeys-hook": "^5.2.1",
     "react-redux": "^9.1.2",
     "redux-persist": "^6.0.0",
     "swagger-ui-react": "^5.19.0",

clients/admin-ui/src/features/data-discovery-and-detection/action-center/fields/FieldActions.const.tsx

@@ -78,8 +78,13 @@ export const AVAILABLE_ACTIONS = {
     FieldActionType.MUTE,
     FieldActionType.APPROVE,
     FieldActionType.PROMOTE,
+    FieldActionType.ASSIGN_CATEGORIES,
+  ],
+  Approved: [
+    FieldActionType.MUTE,
+    FieldActionType.PROMOTE,
+    FieldActionType.ASSIGN_CATEGORIES,
   ],
-  Approved: [FieldActionType.MUTE, FieldActionType.PROMOTE],
   Classifying: [],
   Confirmed: [],
   Ignored: [FieldActionType.UN_MUTE],

clients/admin-ui/src/features/data-discovery-and-detection/action-center/fields/MonitorTree.tsx

@@ -62,7 +62,9 @@ const mapResponseToTreeData = (
         ? () => <IconComponent className="h-full" />
         : undefined,
       status: treeNode.update_status,
-      isLeaf: !treeNode.has_grandchildren,
+      isLeaf:
+        treeNode.resource_type === StagedResourceTypeValue.FIELD ||
+        !treeNode.has_grandchildren,
     };
   });
 

clients/admin-ui/src/pages/_app.tsx

@@ -38,36 +38,46 @@ const SafeHydrate = ({ children }: { children: ReactNode }) => (
   </div>
 );
 
-const MyApp = ({ Component, pageProps }: AppProps) => (
-  <SafeHydrate>
-    <Provider store={store}>
-      <PersistGate loading={null} persistor={persistor}>
-        <FidesUIProvider theme={theme} antTheme={defaultAntTheme}>
-          <DndProvider backend={HTML5Backend}>
-            <NuqsAdapter>
-              {Component === Login || Component === LoginWithOIDC ? (
-                // Only the login page is accessible while logged out. If there is
-                // a use case for more unprotected routes, Next has a guide for
-                // per-page layouts:
-                // https://nextjs.org/docs/basic-features/layouts#per-page-layouts
-                <Component {...pageProps} />
-              ) : (
-                <ProtectedRoute>
-                  <CommonSubscriptions />
-                  <Flex width="100%" height="100%" flex={1}>
-                    <MainSideNav />
-                    <Flex direction="column" width="100%">
-                      <Component {...pageProps} />
+const MyApp = ({ Component, pageProps }: AppProps) => {
+  // Expose Redux store to window for Cypress testing
+  React.useEffect(() => {
+    if (typeof window !== "undefined" && window.Cypress) {
+      // eslint-disable-next-line no-underscore-dangle
+      window.__REDUX_STORE__ = store;
+    }
+  }, []);
+
+  return (
+    <SafeHydrate>
+      <Provider store={store}>
+        <PersistGate loading={null} persistor={persistor}>
+          <FidesUIProvider theme={theme} antTheme={defaultAntTheme}>
+            <DndProvider backend={HTML5Backend}>
+              <NuqsAdapter>
+                {Component === Login || Component === LoginWithOIDC ? (
+                  // Only the login page is accessible while logged out. If there is
+                  // a use case for more unprotected routes, Next has a guide for
+                  // per-page layouts:
+                  // https://nextjs.org/docs/basic-features/layouts#per-page-layouts
+                  <Component {...pageProps} />
+                ) : (
+                  <ProtectedRoute>
+                    <CommonSubscriptions />
+                    <Flex width="100%" height="100%" flex={1}>
+                      <MainSideNav />
+                      <Flex direction="column" width="100%">
+                        <Component {...pageProps} />
+                      </Flex>
                     </Flex>
-                  </Flex>
-                </ProtectedRoute>
-              )}
-            </NuqsAdapter>
-          </DndProvider>
-        </FidesUIProvider>
-      </PersistGate>
-    </Provider>
-  </SafeHydrate>
-);
+                  </ProtectedRoute>
+                )}
+              </NuqsAdapter>
+            </DndProvider>
+          </FidesUIProvider>
+        </PersistGate>
+      </Provider>
+    </SafeHydrate>
+  );
+};
 
 export default MyApp;