Merge pull request #966 from brave/master

Production Release 2023-11-06
brave · Nov 6, 2023 · a2a47b7 · a2a47b7
2 parents c494fa1 + 5788339
commit a2a47b7
Show file tree

Hide file tree

Showing 8 changed files with 353 additions and 304 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -42,7 +42,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@49abf0ba24d0b7953cb586944e918a0b92074c80 # v2.22.4
+        uses: github/codeql-action/init@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@49abf0ba24d0b7953cb586944e918a0b92074c80 # v2.22.4
+        uses: github/codeql-action/autobuild@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@49abf0ba24d0b7953cb586944e918a0b92074c80 # v2.22.4
+        uses: github/codeql-action/analyze@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
diff --git a/.github/workflows/deploy-to-production.yml b/.github/workflows/deploy-to-production.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Use Node.js
-        uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3.8.2
+        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
         with:
           node-version: 18.12.0
           cache: npm

diff --git a/.github/workflows/deploy-to-staging.yml b/.github/workflows/deploy-to-staging.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Use Node.js
-        uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3.8.2
+        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
         with:
           node-version: 18.12.0
           cache: npm

diff --git a/.github/workflows/sanity-check.yml b/.github/workflows/sanity-check.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Use Node.js
-        uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3.8.2
+        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
         with:
           node-version: 18.12.0
           cache: npm

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,25 +3,25 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@apollo/client": "3.8.6",
+    "@apollo/client": "3.8.7",
     "@date-io/moment": "2.17.0",
     "@emotion/react": "11.11.1",
     "@emotion/styled": "11.11.0",
-    "@fontsource/mulish": "5.0.14",
+    "@fontsource/mulish": "5.0.15",
     "@fontsource/poppins": "5.0.8",
-    "@mui/icons-material": "5.14.14",
-    "@mui/lab": "5.0.0-alpha.149",
-    "@mui/material": "5.14.14",
-    "@mui/x-data-grid": "6.16.3",
+    "@mui/icons-material": "5.14.16",
+    "@mui/lab": "5.0.0-alpha.151",
+    "@mui/material": "5.14.16",
+    "@mui/x-data-grid": "6.17.0",
     "@mui/x-date-pickers": "5.0.20",
-    "axios": "1.5.1",
+    "axios": "1.6.0",
     "base64url": "3.0.1",
     "bignumber.js": "9.1.2",
     "date-fns": "2.30.0",
     "date-fns-tz": "2.0.0",
     "formik": "2.4.5",
     "graphql": "16.8.1",
-    "highcharts": "11.1.0",
+    "highcharts": "11.2.0",
     "highcharts-react-official": "3.2.1",
     "immer": "10.0.3",
     "jwt-decode": "3.1.2",
@@ -56,21 +56,21 @@
     "@graphql-codegen/near-operation-file-preset": "3.0.0",
     "@graphql-codegen/typescript": "4.0.1",
     "@graphql-codegen/typescript-operations": "4.0.1",
-    "@graphql-codegen/typescript-react-apollo": "4.0.0",
+    "@graphql-codegen/typescript-react-apollo": "4.1.0",
     "@graphql-codegen/visitor-plugin-common": "4.0.1",
     "@types/chart.js": "2.9.39",
     "@types/classnames": "2.3.0",
-    "@types/jest": "29.5.6",
+    "@types/jest": "29.5.7",
     "@types/jwt-decode": "2.2.1",
     "@types/lodash": "4.14.200",
     "@types/papaparse": "5.3.10",
-    "@types/react": "18.2.31",
+    "@types/react": "18.2.34",
     "@types/react-dom": "18.2.14",
     "@types/react-router-dom": "5.3.3",
-    "@typescript-eslint/eslint-plugin": "6.8.0",
-    "@typescript-eslint/parser": "6.8.0",
+    "@typescript-eslint/eslint-plugin": "6.9.1",
+    "@typescript-eslint/parser": "6.9.1",
     "@vitejs/plugin-basic-ssl": "1.0.1",
-    "@vitejs/plugin-react": "4.1.0",
+    "@vitejs/plugin-react": "4.1.1",
     "eslint": "8.52.0",
     "eslint-config-prettier": "9.0.0",
     "eslint-plugin-react": "7.33.2",

diff --git a/src/user/views/adsManager/views/advanced/components/adSet/fields/PickerFields.tsx b/src/user/views/adsManager/views/advanced/components/adSet/fields/PickerFields.tsx
@@ -2,20 +2,26 @@ import { Typography } from "@mui/material";
 import { SegmentPicker } from "components/Segment/SegmentPicker";
 import { PlatformPicker } from "components/Platform/PlatformPicker";
 import { CardContainer } from "components/Card/CardContainer";
+import { useField } from "formik";
+import { CampaignFormat } from "graphql/types";
 
 interface Props {
   index: number;
 }
 
 export function PickerFields({ index }: Props) {
+  const [, format] = useField<CampaignFormat>("format");
+
   return (
     <>
-      <CardContainer header="Categories">
-        <Typography variant="body2" sx={{ mb: 2 }}>
-          Select the audience you would like to advertise to by interests.
-        </Typography>
-        <SegmentPicker idx={index} />
-      </CardContainer>
+      {format.value !== CampaignFormat.NewsDisplayAd && (
+        <CardContainer header="Categories">
+          <Typography variant="body2" sx={{ mb: 2 }}>
+            Select the audience you would like to advertise to by interests.
+          </Typography>
+          <SegmentPicker idx={index} />
+        </CardContainer>
+      )}
 
       <CardContainer header="Platforms">
         <Typography variant="body2" sx={{ mb: 2 }}>

diff --git a/src/user/views/adsManager/views/advanced/components/review/components/AdSetReview.tsx b/src/user/views/adsManager/views/advanced/components/review/components/AdSetReview.tsx
@@ -13,7 +13,7 @@ interface Props {
   errors?: string | FormikErrors<AdSetForm>;
 }
 
-export function AdSetReview({ adSet, idx, errors }: Props) {
+export function AdSetReview({ adSet, idx, errors, format }: Props) {
   const included = adSet.creatives.filter((c) => c.included);
   const hasErrors = !!errors;
   if (typeof errors === "string") {
@@ -37,11 +37,13 @@ export function AdSetReview({ adSet, idx, errors }: Props) {
         value={adSet.name || `Ad Set ${idx + 1}`}
         error={hasErrors ? adSetError?.name : ""}
       />
-      <ReviewField
-        caption="Audiences"
-        value={segmentValue(mapToString(adSet.segments))}
-        error={hasErrors ? (adSetError?.segments as string) : ""}
-      />
+      {format !== CampaignFormat.NewsDisplayAd && (
+        <ReviewField
+          caption="Audiences"
+          value={segmentValue(mapToString(adSet.segments))}
+          error={hasErrors ? (adSetError?.segments as string) : ""}
+        />
+      )}
       <ReviewField
         caption="Platforms"
         value={mapToString(adSet.oses)}