Production Release 2023-11-20

.github/workflows/codeql-analysis.yml

@@ -42,7 +42,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
+        uses: github/codeql-action/init@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7
         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@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
+        uses: github/codeql-action/autobuild@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7
 
       # ℹ️ 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@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
+        uses: github/codeql-action/analyze@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7

package.json

@@ -9,12 +9,12 @@
     "@emotion/styled": "11.11.0",
     "@fontsource/mulish": "5.0.15",
     "@fontsource/poppins": "5.0.8",
-    "@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/icons-material": "5.14.18",
+    "@mui/lab": "5.0.0-alpha.153",
+    "@mui/material": "5.14.18",
+    "@mui/x-data-grid": "6.18.1",
     "@mui/x-date-pickers": "5.0.20",
-    "axios": "1.6.0",
+    "axios": "1.6.2",
     "base64url": "3.0.1",
     "bignumber.js": "9.1.2",
     "date-fns": "2.30.0",
@@ -57,24 +57,24 @@
     "@graphql-codegen/typescript-operations": "4.0.1",
     "@graphql-codegen/typescript-react-apollo": "4.1.0",
     "@graphql-codegen/visitor-plugin-common": "4.0.1",
-    "@types/chart.js": "2.9.39",
+    "@types/chart.js": "2.9.40",
     "@types/classnames": "2.3.0",
-    "@types/jest": "29.5.7",
+    "@types/jest": "29.5.8",
     "@types/jwt-decode": "2.2.1",
-    "@types/lodash": "4.14.200",
-    "@types/papaparse": "5.3.10",
-    "@types/react": "18.2.34",
-    "@types/react-dom": "18.2.14",
+    "@types/lodash": "4.14.201",
+    "@types/papaparse": "5.3.11",
+    "@types/react": "18.2.37",
+    "@types/react-dom": "18.2.15",
     "@types/react-router-dom": "5.3.3",
-    "@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.1",
-    "eslint": "8.52.0",
+    "@typescript-eslint/eslint-plugin": "6.11.0",
+    "@typescript-eslint/parser": "6.11.0",
+    "@vitejs/plugin-basic-ssl": "1.0.2",
+    "@vitejs/plugin-react": "4.2.0",
+    "eslint": "8.53.0",
     "eslint-config-prettier": "9.0.0",
     "eslint-plugin-react": "7.33.2",
     "husky": "8.0.3",
-    "prettier": "3.0.3",
+    "prettier": "3.1.0",
     "typescript": "5.2.2",
     "vite": "4.5.0",
     "vite-plugin-checker": "0.6.2",

src/components/Creatives/CreateCreativeButton.tsx

@@ -61,7 +61,7 @@ export function CreateCreativeButton() {
       }
       loading={loading}
     >
-      Add
+      Save Ad
     </LoadingButton>
   );
 }

src/components/Creatives/CreativeList.tsx

@@ -87,7 +87,7 @@ export function CreativeList() {
         />
       )}
       <CardContainer
-        header="Creatives"
+        header="Ads"
         sx={{
           flexGrow: 1,
           overflowX: "auto",

src/components/Creatives/hooks/useSubmitCreative.tsx

@@ -17,7 +17,7 @@ export function useSubmitCreative(props: { id: string }) {
   const refetchQueries = [
     refetchAdvertiserCreativesQuery({ advertiserId: advertiser.id }),
   ];
-  const onCompleted = () => history.replace("/user/main/creatives");
+  const onCompleted = () => history.replace("/user/main/ads");
 
   const [createCreative, { error: createError, loading: createLoading }] =
     useCreateCreativeMutation({

src/components/Drawer/MiniSideBar.tsx

@@ -57,8 +57,8 @@ export default function MiniSideBar({ children }: PropsWithChildren) {
       disabled: !advertiser.selfServiceManageCampaign,
     },
     {
-      label: "Creatives",
-      href: "/user/main/creatives",
+      label: "Ads",
+      href: "/user/main/ads",
       icon: (
         <LightbulbOutlinedIcon
           fontSize="large"

src/components/Location/LocationPicker.tsx

@@ -11,7 +11,7 @@ const checkedIcon = <CheckBoxIcon fontSize="small" />;
 
 export const LocationPicker = () => {
   const { data } = useActiveGeocodesQuery();
-  const sorted = _.sortBy(data?.activeGeocodes?.data ?? [], "name");
+  const sorted = _.sortBy(data?.activeGeocodes?.data ?? [], "code");
   const [formProps, meta, helper] = useField<GeocodeInput[]>("geoTargets");
   const errorMessage = meta.error;
 
@@ -25,7 +25,7 @@ export const LocationPicker = () => {
       options={sorted}
       disableCloseOnSelect
       autoHighlight
-      getOptionLabel={(option) => option.name}
+      getOptionLabel={(option) => option.name ?? option.code}
       renderOption={(props, option, { selected }) => (
         <li {...props}>
           <Checkbox

src/components/Navigation/Navbar.tsx

@@ -24,7 +24,7 @@ export function Navbar() {
       component: <UploadImage />,
     },
     {
-      route: "user/main/creatives",
+      route: "user/main/ads",
       component: <NewCreativeButton />,
     },
   ];