Merge branch 'main' into MNTOR-3868-data-broker-new-tab

mozilla · Feb 24, 2025 · aaca98f · aaca98f
2 parents aa7b020 + 415e321
commit aaca98f
Show file tree

Hide file tree

Showing 84 changed files with 7,027 additions and 7,261 deletions.
diff --git a/eslint.config.js b/eslint.config.js
@@ -169,20 +169,13 @@ const config = [
       "@typescript-eslint/no-unsafe-call": "off",
     },
   },
-  // Ignore the following files for now.
+  // Next is not running ESLint on root files by default. The only way to
+  // include those would be to explicitly add them one by one. Instead, we
+  // run ESLint directly in addition to next lint on just the root files.
+  // For more info see:
+  // https://nextjs.org/docs/app/api-reference/config/eslint#linting-custom-directories-and-files
   {
-    files: [
-      "src/app/global-error.js",
-      "src/db/migrations/*.js",
-      "src/scripts/build/*.js",
-      "src/scripts/loadtest/*.js",
-      // Next is not running ESLint on root files by default. The only way to
-      // include those would be to explicitly add them one by one. Instead, we
-      // run ESLint directly in addition to next lint on just the root files.
-      // For more info see:
-      // https://nextjs.org/docs/app/api-reference/config/eslint#linting-custom-directories-and-files
-      "*.{js,cjs,ts}",
-    ],
+    files: ["*.{js,cjs,ts}"],
     languageOptions: {
       parserOptions: { project: null },
     },

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -73,8 +73,8 @@
     "npm": "10.1.0"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.749.0",
-    "@aws-sdk/lib-storage": "^3.749.0",
+    "@aws-sdk/client-s3": "^3.750.0",
+    "@aws-sdk/lib-storage": "^3.750.0",
     "@fluent/bundle": "^0.18.0",
     "@fluent/langneg": "^0.7.0",
     "@fluent/react": "^0.15.2",
@@ -113,20 +113,20 @@
     "react-toastify": "^11.0.2",
     "server-only": "^0.0.1",
     "sharp": "^0.33.5",
-    "uuid": "^11.0.5",
+    "uuid": "^11.1.0",
     "winston": "^3.17.0"
   },
   "devDependencies": {
     "@faker-js/faker": "^9.5.0",
     "@google-cloud/bigquery": "^7.9.1",
     "@playwright/test": "^1.50.1",
-    "@storybook/addon-a11y": "^8.5.6",
-    "@storybook/addon-actions": "^8.5.6",
-    "@storybook/addon-essentials": "^8.5.6",
-    "@storybook/addon-interactions": "^8.5.6",
-    "@storybook/addon-links": "^8.5.6",
-    "@storybook/nextjs": "^8.5.6",
-    "@storybook/react": "^8.5.6",
+    "@storybook/addon-a11y": "^8.5.8",
+    "@storybook/addon-actions": "^8.5.8",
+    "@storybook/addon-essentials": "^8.5.8",
+    "@storybook/addon-interactions": "^8.5.8",
+    "@storybook/addon-links": "^8.5.8",
+    "@storybook/nextjs": "^8.5.8",
+    "@storybook/react": "^8.5.8",
     "@storybook/test": "^8.5.2",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.2.0",
@@ -135,19 +135,19 @@
     "@types/canvas-confetti": "^1.9.0",
     "@types/eslint": "^9.6.1",
     "@types/jest-axe": "^3.5.9",
-    "@types/jsonwebtoken": "^9.0.8",
+    "@types/jsonwebtoken": "^9.0.9",
     "@types/jwk-to-pem": "^2.0.3",
-    "@types/k6": "^0.57.0",
+    "@types/k6": "^0.57.1",
     "@types/mjml": "^4.7.4",
     "@types/mjml-browser": "^4.15.0",
     "@types/nodemailer": "^6.4.17",
-    "@typescript-eslint/eslint-plugin": "^8.24.0",
-    "@typescript-eslint/parser": "^8.24.0",
+    "@typescript-eslint/eslint-plugin": "^8.24.1",
+    "@typescript-eslint/parser": "^8.24.1",
     "adm-zip": "^0.5.16",
     "esbuild": "0.25.0",
-    "eslint": "^9.20.1",
+    "eslint": "^9.21.0",
     "eslint-config-next": "^15.1.7",
-    "eslint-import-resolver-typescript": "^3.8.0",
+    "eslint-import-resolver-typescript": "^3.8.3",
     "eslint-plugin-check-file": "^3.1.0",
     "eslint-plugin-header": "^3.1.1",
     "eslint-plugin-import": "^2.31.0",
@@ -164,13 +164,13 @@
     "lint-staged": "^15.4.3",
     "mjml-browser": "^4.15.3",
     "patch-package": "^8.0.0",
-    "prettier": "3.5.1",
+    "prettier": "3.5.2",
     "sass": "^1.85.0",
     "storybook": "^8.4.6",
     "stylelint": "^16.14.1",
     "stylelint-config-recommended-scss": "^14.1.0",
-    "stylelint-scss": "^6.11.0",
-    "tsx": "^4.19.2",
+    "stylelint-scss": "^6.11.1",
+    "tsx": "^4.19.3",
     "typescript": "^5.7.3",
     "yaml": "^2.7.0"
   },

diff --git a/...p/(proper_react)/(redesign)/(authenticated)/admin/feature-flags/components/FlagEditor.tsx b/...p/(proper_react)/(redesign)/(authenticated)/admin/feature-flags/components/FlagEditor.tsx
@@ -16,9 +16,13 @@ import { Button } from "../../../../../../components/client/Button";
 import { CreateFeatureFlagRequestBody } from "../../../../../../api/v1/admin/feature-flags/route";
 import { FeatureFlagName } from "../../../../../../../db/tables/featureFlags";
 
-export const NewFlagEditor = (props: { flagName: FeatureFlagName }) => {
+export const NewFlagEditor = (props: {
+  flagName: FeatureFlagName;
+  adminOnly: boolean;
+}) => {
   return (
     <FlagEditor
+      adminOnly={props.adminOnly}
       flagName={props.flagName}
       isEnabled={false}
       onToggleEnable={async (isEnabled) => {
@@ -45,9 +49,13 @@ export const NewFlagEditor = (props: { flagName: FeatureFlagName }) => {
   );
 };
 
-export const ExistingFlagEditor = (props: { flag: FeatureFlagRow }) => {
+export const ExistingFlagEditor = (props: {
+  flag: FeatureFlagRow;
+  adminOnly: boolean;
+}) => {
   return (
     <FlagEditor
+      adminOnly={props.adminOnly}
       flagName={props.flag.name}
       isEnabled={props.flag.is_enabled}
       onToggleEnable={async (isEnabled) => {
@@ -82,6 +90,7 @@ type Props = {
   isEnabled: boolean;
   onToggleEnable: (isEnabled: boolean) => Promise<void>;
   allowList: string[];
+  adminOnly: boolean;
   onUpdateAllowlist: (allowList: string[]) => Promise<void>;
 };
 const FlagEditor = (props: Props) => {
@@ -114,8 +123,9 @@ const FlagEditor = (props: Props) => {
             variant="secondary"
             onPress={() => void setIsEnabled(true)}
             small
+            disabled={props.adminOnly}
           >
-            Enable for everyone
+            {props.adminOnly ? "Allow list only" : "Enable for everyone"}
           </Button>
         )}
       </div>

diff --git a/src/app/(proper_react)/(redesign)/(authenticated)/admin/feature-flags/page.tsx b/src/app/(proper_react)/(redesign)/(authenticated)/admin/feature-flags/page.tsx
@@ -8,6 +8,7 @@ import {
   FeatureFlagName,
   featureFlagNames,
   getAllFeatureFlags,
+  isFeatureFlagAdminOnly,
 } from "../../../../../../db/tables/featureFlags";
 import { isAdmin } from "../../../../../api/utils/auth";
 import { Toolbar } from "../../../../../components/client/toolbar/Toolbar";
@@ -77,11 +78,16 @@ export default async function FeatureFlagPage() {
         <div className={styles.flagList}>
           {disabledFlags.map((flagOrFlagName) => {
             return typeof flagOrFlagName === "string" ? (
-              <NewFlagEditor key={flagOrFlagName} flagName={flagOrFlagName} />
+              <NewFlagEditor
+                key={flagOrFlagName}
+                flagName={flagOrFlagName}
+                adminOnly={isFeatureFlagAdminOnly(flagOrFlagName)}
+              />
             ) : (
               <ExistingFlagEditor
                 key={flagOrFlagName.name}
                 flag={flagOrFlagName}
+                adminOnly={isFeatureFlagAdminOnly(flagOrFlagName.name)}
               />
             );
           })}
@@ -95,7 +101,11 @@ export default async function FeatureFlagPage() {
                 featureFlagNames.includes(flag.name as FeatureFlagName),
             )
             .map((flag) => (
-              <ExistingFlagEditor key={flag.name} flag={flag} />
+              <ExistingFlagEditor
+                key={flag.name}
+                flag={flag}
+                adminOnly={isFeatureFlagAdminOnly(flag.name)}
+              />
             ))}
         </div>
       </div>