From 26efbf2195fb887d7d99e12b47986cfb1b2ab83f Mon Sep 17 00:00:00 2001
From: Weiko <corentin@twenty.com>
Date: Mon, 29 Jul 2024 18:52:17 +0200
Subject: [PATCH] rename system to browser

---
 .../twenty-front/src/generated/graphql.tsx    | 10 ++++-----
 .../src/modules/auth/hooks/useAuth.ts         |  2 +-
 .../localization/constants/DateFormat.ts      |  2 +-
 .../localization/constants/TimeFormat.ts      |  2 +-
 .../getDateFormatFromWorkspaceDateFormat.ts   |  2 +-
 .../getTimeFormatFromWorkspaceTimeFormat.ts   |  2 +-
 .../getWorkspaceDateFormatFromDateFormat.ts   |  4 ++--
 .../getWorkspaceTimeFormatFromTimeFormat.ts   |  4 ++--
 .../users/components/UserProviderEffect.tsx   |  3 ++-
 .../components/DateTimeSettings.tsx           | 18 +++++++--------
 .../DateTimeSettingsDateFormatSelect.tsx      |  6 ++---
 .../DateTimeSettingsTimeFormatSelect.tsx      |  4 ++--
 .../DateTimeSettingsTimeZoneSelect.tsx        |  4 ++--
 .../workspace-member.workspace-entity.ts      | 22 +++++++++----------
 14 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/packages/twenty-front/src/generated/graphql.tsx b/packages/twenty-front/src/generated/graphql.tsx
index 656843713f84..7a289b5c04a6 100644
--- a/packages/twenty-front/src/generated/graphql.tsx
+++ b/packages/twenty-front/src/generated/graphql.tsx
@@ -1018,19 +1018,19 @@ export type WorkspaceMember = {
   timeZone?: Maybe<Scalars['String']>;
 };
 
-/** Date format as Month first, Day first, Year first or system as default */
+/** Date format as Month first, Day first, Year first or browser as default */
 export enum WorkspaceMemberDateFormatEnum {
+  Browser = 'BROWSER',
   DayFirst = 'DAY_FIRST',
   MonthFirst = 'MONTH_FIRST',
-  System = 'SYSTEM',
   YearFirst = 'YEAR_FIRST'
 }
 
-/** Time time as Military, Standard or system as default */
+/** Time time as Military, Standard or browser as default */
 export enum WorkspaceMemberTimeFormatEnum {
+  Browser = 'BROWSER',
   Hour_12 = 'HOUR_12',
-  Hour_24 = 'HOUR_24',
-  System = 'SYSTEM'
+  Hour_24 = 'HOUR_24'
 }
 
 export type Field = {
diff --git a/packages/twenty-front/src/modules/auth/hooks/useAuth.ts b/packages/twenty-front/src/modules/auth/hooks/useAuth.ts
index 50a34ff1bc1e..c9ddff99cd48 100644
--- a/packages/twenty-front/src/modules/auth/hooks/useAuth.ts
+++ b/packages/twenty-front/src/modules/auth/hooks/useAuth.ts
@@ -120,7 +120,7 @@ export const useAuth = () => {
         // TODO: factorize with UserProviderEffect
         setDateTimeFormat({
           timeZone:
-            workspaceMember.timeZone && workspaceMember.timeZone !== 'system'
+            workspaceMember.timeZone && workspaceMember.timeZone !== 'browser'
               ? workspaceMember.timeZone
               : detectTimeZone(),
           dateFormat: isDefined(user.workspaceMember.dateFormat)
diff --git a/packages/twenty-front/src/modules/localization/constants/DateFormat.ts b/packages/twenty-front/src/modules/localization/constants/DateFormat.ts
index 503e28ce3b03..5a37e5025b87 100644
--- a/packages/twenty-front/src/modules/localization/constants/DateFormat.ts
+++ b/packages/twenty-front/src/modules/localization/constants/DateFormat.ts
@@ -1,5 +1,5 @@
 export enum DateFormat {
-  SYSTEM = 'SYSTEM',
+  BROWSER = 'BROWSER',
   MONTH_FIRST = 'MMM d, yyyy', // US
   DAY_FIRST = 'd MMM, yyyy', // UK
   YEAR_FIRST = 'yyyy MMM d',
diff --git a/packages/twenty-front/src/modules/localization/constants/TimeFormat.ts b/packages/twenty-front/src/modules/localization/constants/TimeFormat.ts
index a169872b3357..c39bae1f8818 100644
--- a/packages/twenty-front/src/modules/localization/constants/TimeFormat.ts
+++ b/packages/twenty-front/src/modules/localization/constants/TimeFormat.ts
@@ -1,5 +1,5 @@
 export enum TimeFormat {
-  SYSTEM = 'SYSTEM',
+  BROWSER = 'SYSTEM',
   HOUR_24 = 'HH:mm',
   HOUR_12 = 'h:mm aa',
 }
diff --git a/packages/twenty-front/src/modules/localization/utils/getDateFormatFromWorkspaceDateFormat.ts b/packages/twenty-front/src/modules/localization/utils/getDateFormatFromWorkspaceDateFormat.ts
index f32bdbb93355..cb1ea6e01746 100644
--- a/packages/twenty-front/src/modules/localization/utils/getDateFormatFromWorkspaceDateFormat.ts
+++ b/packages/twenty-front/src/modules/localization/utils/getDateFormatFromWorkspaceDateFormat.ts
@@ -6,7 +6,7 @@ export const getDateFormatFromWorkspaceDateFormat = (
   workspaceDateFormat: WorkspaceMemberDateFormatEnum,
 ) => {
   switch (workspaceDateFormat) {
-    case WorkspaceMemberDateFormatEnum.System:
+    case WorkspaceMemberDateFormatEnum.Browser:
       return detectDateFormat();
     case WorkspaceMemberDateFormatEnum.MonthFirst:
       return DateFormat.MONTH_FIRST;
diff --git a/packages/twenty-front/src/modules/localization/utils/getTimeFormatFromWorkspaceTimeFormat.ts b/packages/twenty-front/src/modules/localization/utils/getTimeFormatFromWorkspaceTimeFormat.ts
index f6aebb43779b..1686ecfc0bd8 100644
--- a/packages/twenty-front/src/modules/localization/utils/getTimeFormatFromWorkspaceTimeFormat.ts
+++ b/packages/twenty-front/src/modules/localization/utils/getTimeFormatFromWorkspaceTimeFormat.ts
@@ -6,7 +6,7 @@ export const getTimeFormatFromWorkspaceTimeFormat = (
   workspaceTimeFormat: WorkspaceMemberTimeFormatEnum,
 ) => {
   switch (workspaceTimeFormat) {
-    case WorkspaceMemberTimeFormatEnum.System:
+    case WorkspaceMemberTimeFormatEnum.Browser:
       return detectTimeFormat();
     case WorkspaceMemberTimeFormatEnum.Hour_24:
       return TimeFormat.HOUR_24;
diff --git a/packages/twenty-front/src/modules/localization/utils/getWorkspaceDateFormatFromDateFormat.ts b/packages/twenty-front/src/modules/localization/utils/getWorkspaceDateFormatFromDateFormat.ts
index 251a575824f5..6fb799d133c3 100644
--- a/packages/twenty-front/src/modules/localization/utils/getWorkspaceDateFormatFromDateFormat.ts
+++ b/packages/twenty-front/src/modules/localization/utils/getWorkspaceDateFormatFromDateFormat.ts
@@ -5,8 +5,8 @@ export const getWorkspaceDateFormatFromDateFormat = (
   dateFormat: DateFormat,
 ) => {
   switch (dateFormat) {
-    case DateFormat.SYSTEM:
-      return WorkspaceMemberDateFormatEnum.System;
+    case DateFormat.BROWSER:
+      return WorkspaceMemberDateFormatEnum.Browser;
     case DateFormat.MONTH_FIRST:
       return WorkspaceMemberDateFormatEnum.MonthFirst;
     case DateFormat.DAY_FIRST:
diff --git a/packages/twenty-front/src/modules/localization/utils/getWorkspaceTimeFormatFromTimeFormat.ts b/packages/twenty-front/src/modules/localization/utils/getWorkspaceTimeFormatFromTimeFormat.ts
index 58a563f96177..3ba0a4a0786a 100644
--- a/packages/twenty-front/src/modules/localization/utils/getWorkspaceTimeFormatFromTimeFormat.ts
+++ b/packages/twenty-front/src/modules/localization/utils/getWorkspaceTimeFormatFromTimeFormat.ts
@@ -5,8 +5,8 @@ export const getWorkspaceTimeFormatFromTimeFormat = (
   timeFormat: TimeFormat,
 ) => {
   switch (timeFormat) {
-    case TimeFormat.SYSTEM:
-      return WorkspaceMemberTimeFormatEnum.System;
+    case TimeFormat.BROWSER:
+      return WorkspaceMemberTimeFormatEnum.Browser;
     case TimeFormat.HOUR_24:
       return WorkspaceMemberTimeFormatEnum.Hour_24;
     case TimeFormat.HOUR_12:
diff --git a/packages/twenty-front/src/modules/users/components/UserProviderEffect.tsx b/packages/twenty-front/src/modules/users/components/UserProviderEffect.tsx
index cdddf3934306..f7ba048c8a81 100644
--- a/packages/twenty-front/src/modules/users/components/UserProviderEffect.tsx
+++ b/packages/twenty-front/src/modules/users/components/UserProviderEffect.tsx
@@ -59,7 +59,7 @@ export const UserProviderEffect = () => {
       // TODO: factorize
       setDateTimeFormat({
         timeZone:
-          workspaceMember.timeZone && workspaceMember.timeZone !== 'system'
+          workspaceMember.timeZone && workspaceMember.timeZone !== 'browser'
             ? workspaceMember.timeZone
             : detectTimeZone(),
         dateFormat: isDefined(workspaceMember.dateFormat)
@@ -87,6 +87,7 @@ export const UserProviderEffect = () => {
     setWorkspaces,
     queryData?.currentUser,
     setIsCurrentUserLoaded,
+    setDateTimeFormat,
   ]);
 
   return <></>;
diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettings.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettings.tsx
index 6a2e58e52c1f..61dc39f1c86e 100644
--- a/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettings.tsx
+++ b/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettings.tsx
@@ -68,7 +68,7 @@ export const DateTimeSettings = () => {
     switch (settingName) {
       case 'timeZone': {
         workspaceMember[settingName] = value;
-        dateTime[settingName] = value === 'system' ? detectTimeZone() : value;
+        dateTime[settingName] = value === 'browser' ? detectTimeZone() : value;
         break;
       }
       case 'dateFormat': {
@@ -76,7 +76,7 @@ export const DateTimeSettings = () => {
           value as DateFormat,
         );
         dateTime[settingName] =
-          (value as DateFormat) === DateFormat.SYSTEM
+          (value as DateFormat) === DateFormat.BROWSER
             ? detectDateFormat()
             : (value as DateFormat);
         break;
@@ -86,7 +86,7 @@ export const DateTimeSettings = () => {
           value as TimeFormat,
         );
         dateTime[settingName] =
-          (value as TimeFormat) === TimeFormat.SYSTEM
+          (value as TimeFormat) === TimeFormat.BROWSER
             ? detectTimeFormat()
             : (value as TimeFormat);
         break;
@@ -110,18 +110,18 @@ export const DateTimeSettings = () => {
   };
 
   const timeZone =
-    currentWorkspaceMember.timeZone === 'system'
-      ? 'system'
+    currentWorkspaceMember.timeZone === 'browser'
+      ? 'browser'
       : dateTimeFormat.timeZone;
 
   const dateFormat =
-    currentWorkspaceMember.dateFormat === WorkspaceMemberDateFormatEnum.System
-      ? DateFormat.SYSTEM
+    currentWorkspaceMember.dateFormat === WorkspaceMemberDateFormatEnum.Browser
+      ? DateFormat.BROWSER
       : dateTimeFormat.dateFormat;
 
   const timeFormat =
-    currentWorkspaceMember.timeFormat === WorkspaceMemberTimeFormatEnum.System
-      ? TimeFormat.SYSTEM
+    currentWorkspaceMember.timeFormat === WorkspaceMemberTimeFormatEnum.Browser
+      ? TimeFormat.BROWSER
       : dateTimeFormat.timeFormat;
 
   return (
diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsDateFormatSelect.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsDateFormatSelect.tsx
index c17f7a8e712c..a237b154eb74 100644
--- a/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsDateFormatSelect.tsx
+++ b/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsDateFormatSelect.tsx
@@ -15,7 +15,7 @@ export const DateTimeSettingsDateFormatSelect = ({
   timeZone,
   value,
 }: DateTimeSettingsDateFormatSelectProps) => {
-  const setTimeZone = timeZone === 'system' ? detectTimeZone() : timeZone;
+  const setTimeZone = timeZone === 'browser' ? detectTimeZone() : timeZone;
   return (
     <Select
       dropdownId="datetime-settings-date-format"
@@ -25,8 +25,8 @@ export const DateTimeSettingsDateFormatSelect = ({
       value={value}
       options={[
         {
-          label: `System settings`,
-          value: DateFormat.SYSTEM,
+          label: `Browser settings`,
+          value: DateFormat.BROWSER,
         },
         {
           label: `${formatInTimeZone(
diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx
index 9aa24254b4b1..9e07865c988a 100644
--- a/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx
+++ b/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx
@@ -15,7 +15,7 @@ export const DateTimeSettingsTimeFormatSelect = ({
   timeZone,
   value,
 }: DateTimeSettingsTimeFormatSelectProps) => {
-  const setTimeZone = timeZone === 'system' ? detectTimeZone() : timeZone;
+  const setTimeZone = timeZone === 'browser' ? detectTimeZone() : timeZone;
   return (
     <Select
       dropdownId="datetime-settings-time-format"
@@ -26,7 +26,7 @@ export const DateTimeSettingsTimeFormatSelect = ({
       options={[
         {
           label: 'System settings',
-          value: TimeFormat.SYSTEM,
+          value: TimeFormat.BROWSER,
         },
         {
           label: `24h (${formatInTimeZone(
diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsTimeZoneSelect.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsTimeZoneSelect.tsx
index a48dea5db8de..46fbec59df5e 100644
--- a/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsTimeZoneSelect.tsx
+++ b/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsTimeZoneSelect.tsx
@@ -19,8 +19,8 @@ export const DateTimeSettingsTimeZoneSelect = ({
       label="Time zone"
       fullWidth
       value={
-        value === 'system'
-          ? 'System settings'
+        value === 'browser'
+          ? 'Browser settings'
           : findAvailableTimeZoneOption(value)?.value
       }
       options={[
diff --git a/packages/twenty-server/src/modules/workspace-member/standard-objects/workspace-member.workspace-entity.ts b/packages/twenty-server/src/modules/workspace-member/standard-objects/workspace-member.workspace-entity.ts
index bb19b0566cb7..d9faf2a8324b 100644
--- a/packages/twenty-server/src/modules/workspace-member/standard-objects/workspace-member.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/workspace-member/standard-objects/workspace-member.workspace-entity.ts
@@ -30,27 +30,27 @@ import { AuditLogWorkspaceEntity } from 'src/modules/timeline/standard-objects/a
 import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-objects/timeline-activity.workspace-entity';
 
 export enum WorkspaceMemberDateFormatEnum {
-  SYSTEM = 'SYSTEM',
+  BROWSER = 'BROWSER',
   MONTH_FIRST = 'MONTH_FIRST',
   DAY_FIRST = 'DAY_FIRST',
   YEAR_FIRST = 'YEAR_FIRST',
 }
 
 export enum WorkspaceMemberTimeFormatEnum {
-  SYSTEM = 'SYSTEM',
+  BROWSER = 'BROWSER',
   HOUR_12 = 'HOUR_12',
   HOUR_24 = 'HOUR_24',
 }
 
 registerEnumType(WorkspaceMemberTimeFormatEnum, {
   name: 'WorkspaceMemberTimeFormatEnum',
-  description: 'Time time as Military, Standard or system as default',
+  description: 'Time time as Military, Standard or browser as default',
 });
 
 registerEnumType(WorkspaceMemberDateFormatEnum, {
   name: 'WorkspaceMemberDateFormatEnum',
   description:
-    'Date format as Month first, Day first, Year first or system as default',
+    'Date format as Month first, Day first, Year first or browser as default',
 });
 
 @WorkspaceEntity({
@@ -273,7 +273,7 @@ export class WorkspaceMemberWorkspaceEntity extends BaseWorkspaceEntity {
     standardId: WORKSPACE_MEMBER_STANDARD_FIELD_IDS.timeZone,
     type: FieldMetadataType.TEXT,
     label: 'Time zone',
-    defaultValue: "'system'",
+    defaultValue: "'browser'",
     description: 'User time zone',
     icon: 'IconTimezone',
   })
@@ -287,8 +287,8 @@ export class WorkspaceMemberWorkspaceEntity extends BaseWorkspaceEntity {
     icon: 'IconCalendarEvent',
     options: [
       {
-        value: WorkspaceMemberDateFormatEnum.SYSTEM,
-        label: 'System',
+        value: WorkspaceMemberDateFormatEnum.BROWSER,
+        label: 'Browser',
         position: 0,
         color: 'turquoise',
       },
@@ -311,7 +311,7 @@ export class WorkspaceMemberWorkspaceEntity extends BaseWorkspaceEntity {
         color: 'sky',
       },
     ],
-    defaultValue: `'${WorkspaceMemberDateFormatEnum.SYSTEM}'`,
+    defaultValue: `'${WorkspaceMemberDateFormatEnum.BROWSER}'`,
   })
   dateFormat: string;
 
@@ -323,8 +323,8 @@ export class WorkspaceMemberWorkspaceEntity extends BaseWorkspaceEntity {
     icon: 'IconClock2',
     options: [
       {
-        value: WorkspaceMemberTimeFormatEnum.SYSTEM,
-        label: 'System',
+        value: WorkspaceMemberTimeFormatEnum.BROWSER,
+        label: 'Browser',
         position: 0,
         color: 'sky',
       },
@@ -341,7 +341,7 @@ export class WorkspaceMemberWorkspaceEntity extends BaseWorkspaceEntity {
         color: 'purple',
       },
     ],
-    defaultValue: `'${WorkspaceMemberTimeFormatEnum.SYSTEM}'`,
+    defaultValue: `'${WorkspaceMemberTimeFormatEnum.BROWSER}'`,
   })
   timeFormat: string;
 }