[fix] [old-main] add marketing field to user notification settings (#314

)
someengineering · Oct 21, 2024 · 4035151 · 4035151
1 parent 6d722dd
commit 4035151
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 15 deletions.
diff --git a/src/locales/de-DE/messages.po b/src/locales/de-DE/messages.po
@@ -1429,7 +1429,7 @@ msgstr ""
 msgid "In the Select Members window, type the name of the App you created earlier:"
 msgstr ""
 
-#: src/pages/panel/user-settings/UserSettingsNotification.tsx:77
+#: src/pages/panel/user-settings/UserSettingsNotification.tsx:70
 msgid "Inactivity reminder"
 msgstr "Inaktivitätserinnerung"
 
@@ -1569,6 +1569,10 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
+#: src/pages/panel/user-settings/UserSettingsNotification.tsx:87
+msgid "Marketing"
+msgstr ""
+
 #: src/shared/defined-messages/getMessage.ts:11
 msgid "Medium"
 msgstr "Mittel"

diff --git a/src/locales/en-US/messages.po b/src/locales/en-US/messages.po
@@ -1429,7 +1429,7 @@ msgstr "In the search field, type Management groups:"
 msgid "In the Select Members window, type the name of the App you created earlier:"
 msgstr "In the Select Members window, type the name of the App you created earlier:"
 
-#: src/pages/panel/user-settings/UserSettingsNotification.tsx:77
+#: src/pages/panel/user-settings/UserSettingsNotification.tsx:70
 msgid "Inactivity reminder"
 msgstr "Inactivity reminder"
 
@@ -1569,6 +1569,10 @@ msgstr "Management Group or subscription"
 msgid "Manual"
 msgstr "Manual"
 
+#: src/pages/panel/user-settings/UserSettingsNotification.tsx:87
+msgid "Marketing"
+msgstr "Marketing"
+
 #: src/shared/defined-messages/getMessage.ts:11
 msgid "Medium"
 msgstr "Medium"

diff --git a/src/pages/panel/user-settings/UserSettingsNotification.tsx b/src/pages/panel/user-settings/UserSettingsNotification.tsx
@@ -61,14 +61,7 @@ export const UserSettingsNotification = () => {
  <CircularProgress size={20} />
  </Stack>
  ) : (
- <Checkbox
- checked={data?.weekly_report}
- onChange={(e) => {
- if (data) {
- mutate({ inactivity_reminder: data.inactivity_reminder, weekly_report: e.target.checked })
- }
- }}
- />
+ <Checkbox checked={data?.weekly_report} onChange={(e) => data && mutate({ ...data, weekly_report: e.target.checked })} />
  )}
  </TableCell>
  </TableRow>
@@ -84,15 +77,25 @@ export const UserSettingsNotification = () => {
  ) : (
  <Checkbox
  checked={data?.inactivity_reminder}
- onChange={(e) => {
- if (data) {
- mutate({ weekly_report: data.weekly_report, inactivity_reminder: e.target.checked })
- }
- }}
+ onChange={(e) => data && mutate({ ...data, inactivity_reminder: e.target.checked })}
  />
  )}
  </TableCell>
  </TableRow>
+ <TableRow>
+ <TableCell>
+ <Trans>Marketing</Trans>
+ </TableCell>
+ <TableCell>
+ {isPending ? (
+ <Stack justifyContent="center" direction="column" padding={1} margin="1px">
+ <CircularProgress size={20} />
+ </Stack>
+ ) : (
+ <Checkbox checked={data?.marketing} onChange={(e) => data && mutate({ ...data, marketing: e.target.checked })} />
+ )}
+ </TableCell>
+ </TableRow>
  </TableBody>
  </Table>
  </TableContainer>

diff --git a/src/shared/types/server/requests/PutNotificationUser.ts b/src/shared/types/server/requests/PutNotificationUser.ts
@@ -1,4 +1,6 @@
 export type PutNotificationUserRequest = {
  weekly_report: boolean
  inactivity_reminder: boolean
+ marketing: boolean
+ tutorial: boolean
 }
diff --git a/src/shared/types/server/responses/GetNotificationUser.ts b/src/shared/types/server/responses/GetNotificationUser.ts
@@ -1,4 +1,6 @@
 export type GetNotificationUserResponse = {
  weekly_report: boolean
  inactivity_reminder: boolean
+ marketing: boolean
+ tutorial: boolean
 }