Merge pull request #1231 from brave/master

Production Release 2024-06-13
brave · Jun 13, 2024 · 59fa77c · 59fa77c
2 parents 8f06673 + c7a54f0
commit 59fa77c
Show file tree

Hide file tree

Showing 42 changed files with 908 additions and 1,292 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@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
+ uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
  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@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
+ uses: github/codeql-action/autobuild@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
 
  # ℹ️ 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@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
+ uses: github/codeql-action/analyze@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
diff --git a/eslint.config.js b/eslint.config.js
@@ -84,6 +84,7 @@ export default tseslint.config(
  "zonedTimeToUtc",
  "utcToZonedTime",
  "graphql",
+ "getGenericMultiSelect",
  ],
  ignoreProperty: [
  "documentTitle",

diff --git a/package.json b/package.json
@@ -20,8 +20,8 @@
  "@mui/icons-material": "5.15.19",
  "@mui/lab": "5.0.0-alpha.170",
  "@mui/material": "5.15.19",
- "@mui/x-data-grid": "7.6.1",
- "@mui/x-date-pickers": "7.6.1",
+ "@mui/x-data-grid": "7.6.2",
+ "@mui/x-date-pickers": "7.6.2",
  "bignumber.js": "9.1.2",
  "dayjs": "1.11.11",
  "formik": "2.4.6",
@@ -66,7 +66,7 @@
  "@lingui/cli": "4.11.1",
  "@lingui/vite-plugin": "4.11.1",
  "@parcel/watcher": "2.4.1",
- "@types/lodash": "4.17.4",
+ "@types/lodash": "4.17.5",
  "@types/papaparse": "5.3.14",
  "@types/react": "18.3.3",
  "@types/react-dom": "18.3.0",
@@ -81,13 +81,13 @@
  "eslint-plugin-react": "7.34.2",
  "eslint-plugin-react-hooks": "4.6.2",
  "husky": "9.0.11",
- "knip": "5.17.3",
+ "knip": "5.18.1",
  "lint-staged": "15.2.5",
  "npm-run-all2": "6.2.0",
- "prettier": "3.2.5",
+ "prettier": "3.3.1",
  "typescript": "5.4.5",
- "typescript-eslint": "7.11.0",
- "vite": "5.2.12",
+ "typescript-eslint": "7.12.0",
+ "vite": "5.2.13",
  "vite-plugin-checker": "0.6.4",
  "vite-tsconfig-paths": "4.3.2",
  "vitest": "1.6.0"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/auth/components/AdvertiserDetailsForm.tsx b/src/auth/components/AdvertiserDetailsForm.tsx
@@ -10,7 +10,6 @@ import { useHistory } from "react-router-dom";
 import {
  AdvertiserBillingAddressDocument,
  PaymentType,
- UpdateAdvertiserDocument,
 } from "@/graphql-client/graphql";
 import { AdvertiserAgreed } from "@/auth/components/AdvertiserAgreed";
 import { FormikSubmitButton } from "@/form/FormikButton";
@@ -20,6 +19,16 @@ import { useTrackWithMatomo } from "@/hooks/useTrackWithMatomo";
 import _ from "lodash";
 import { msg, Trans } from "@lingui/macro";
 import { useMutation, useQuery } from "@apollo/client";
+import { graphql } from "@/graphql-client/index";
+
+export const Advertiser_Update = graphql(`
+ mutation UpdateAdvertiser($input: UpdateSelfServeAdvertiserInput!) {
+ updateSelfServeAdvertiser(updateAdvertiserInput: $input) {
+ id
+ publicKey
+ }
+ }
+`);
 
 export function AdvertiserDetailsForm() {
  const { trackMatomoEvent } = useTrackWithMatomo({
@@ -35,7 +44,7 @@ export function AdvertiserDetailsForm() {
  initialAdvertiserForm(!requiresPaymentAgree),
  );
 
- const [mutation] = useMutation(UpdateAdvertiserDocument, {
+ const [mutation] = useMutation(Advertiser_Update, {
  async onCompleted() {
  const user = await getUser();
  setSessionUser(user);
@@ -63,7 +72,7 @@ export function AdvertiserDetailsForm() {
  setSubmitting(true);
  await mutation({
  variables: {
- updateAdvertiserInput: {
+ input: {
  id: advertiser.id,
  agreed: v.terms && v.tracking && v.payment && v.language,
  billingAddress: v.address.id

diff --git a/src/components/Date/DateRangePicker.tsx b/src/components/Date/DateRangePicker.tsx
@@ -23,13 +23,14 @@ export const DateRangePicker = ({
 
  return (
  <LocalizationProvider dateAdapter={AdapterDayjs}>
- <Stack direction="row" spacing={1} margin={1}>
+ <Stack direction="row" spacing={1}>
  <DatePicker
  label={_(msg`From`)}
  value={from}
+ timezone="UTC"
  onChange={(newValue) => {
  if (newValue) {
- onFromChange(newValue);
+ onFromChange(newValue.startOf("day"));
  }
  }}
  slotProps={{
@@ -42,9 +43,10 @@ export const DateRangePicker = ({
  <DatePicker
  label={_(msg`To`)}
  value={to}
+ timezone="UTC"
  onChange={(newValue) => {
  if (newValue) {
- onToChange(newValue);
+ onToChange(newValue.endOf("day"));
  }
  }}
  slotProps={{

diff --git a/src/graphql-client/gql.ts b/src/graphql-client/gql.ts
diff --git a/src/graphql-client/graphql.ts b/src/graphql-client/graphql.ts
diff --git a/src/graphql/ads-serve.graphql.schema.json b/src/graphql/ads-serve.graphql.schema.json
@@ -5813,15 +5813,11 @@
  "name": "emailVerified",
  "description": null,
  "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "SCALAR",
- "name": "Boolean",
- "ofType": null
- }
+ "kind": "SCALAR",
+ "name": "Boolean",
+ "ofType": null
  },
- "defaultValue": null,
+ "defaultValue": "false",
  "isDeprecated": false,
  "deprecationReason": null
  },
@@ -9192,6 +9188,39 @@
  "isDeprecated": false,
  "deprecationReason": null
  },
+ {
+ "name": "updateSelfServeAdvertiser",
+ "description": null,
+ "args": [
+ {
+ "name": "updateAdvertiserInput",
+ "description": null,
+ "type": {
+ "kind": "NON_NULL",
+ "name": null,
+ "ofType": {
+ "kind": "INPUT_OBJECT",
+ "name": "UpdateSelfServeAdvertiserInput",
+ "ofType": null
+ }
+ },
+ "defaultValue": null,
+ "isDeprecated": false,
+ "deprecationReason": null
+ }
+ ],
+ "type": {
+ "kind": "NON_NULL",
+ "name": null,
+ "ofType": {
+ "kind": "OBJECT",
+ "name": "Advertiser",
+ "ofType": null
+ }
+ },
+ "isDeprecated": false,
+ "deprecationReason": null
+ },
  {
  "name": "updateUser",
  "description": null,
@@ -14526,6 +14555,69 @@
  "enumValues": null,
  "possibleTypes": null
  },
+ {
+ "kind": "INPUT_OBJECT",
+ "name": "UpdateSelfServeAdvertiserInput",
+ "description": null,
+ "fields": null,
+ "inputFields": [
+ {
+ "name": "agreed",
+ "description": "Agreed to Terms And Conditions - Advertiser Facing Dashboard",
+ "type": {
+ "kind": "SCALAR",
+ "name": "Boolean",
+ "ofType": null
+ },
+ "defaultValue": null,
+ "isDeprecated": false,
+ "deprecationReason": null
+ },
+ {
+ "name": "billingAddress",
+ "description": null,
+ "type": {
+ "kind": "INPUT_OBJECT",
+ "name": "UpdateAddressInput",
+ "ofType": null
+ },
+ "defaultValue": null,
+ "isDeprecated": false,
+ "deprecationReason": null
+ },
+ {
+ "name": "id",
+ "description": null,
+ "type": {
+ "kind": "NON_NULL",
+ "name": null,
+ "ofType": {
+ "kind": "SCALAR",
+ "name": "String",
+ "ofType": null
+ }
+ },
+ "defaultValue": null,
+ "isDeprecated": false,
+ "deprecationReason": null
+ },
+ {
+ "name": "publicKey",
+ "description": null,
+ "type": {
+ "kind": "SCALAR",
+ "name": "String",
+ "ofType": null
+ },
+ "defaultValue": null,
+ "isDeprecated": false,
+ "deprecationReason": null
+ }
+ ],
+ "interfaces": null,
+ "enumValues": null,
+ "possibleTypes": null
+ },
  {
  "kind": "INPUT_OBJECT",
  "name": "UpdateUserInput",
@@ -14552,7 +14644,7 @@
  "name": "Boolean",
  "ofType": null
  },
- "defaultValue": null,
+ "defaultValue": "false",
  "isDeprecated": false,
  "deprecationReason": null
  },

diff --git a/src/graphql/advertiser.graphql b/src/graphql/advertiser.graphql
@@ -17,13 +17,6 @@ query Advertiser($id: String!) {
  }
 }
 
-mutation UpdateAdvertiser($updateAdvertiserInput: UpdateAdvertiserInput!) {
- updateAdvertiser(updateAdvertiserInput: $updateAdvertiserInput) {
- id
- publicKey
- }
-}
-
 fragment AdvertiserCampaigns on Advertiser {
  id
  name