Merge branch 'main' into chore/electron-31

NiceNode · Jul 10, 2024 · 74a7e42 · 74a7e42
2 parents 2ca048f + 59b7b20
commit 74a7e42
Show file tree

Hide file tree

Showing 9 changed files with 108 additions and 0 deletions.
diff --git a/src/main/ipc.ts b/src/main/ipc.ts
@@ -77,6 +77,7 @@ import {
   setNativeThemeSetting,
   setThemeSetting,
 } from './state/settings';
+import { getSetIsDeveloperModeEnabled } from './state/settings.js';
 import store from './state/store';
 import { getSystemInfo } from './systemInfo';
 
@@ -256,6 +257,12 @@ export const initialize = () => {
       return getSetIsPreReleaseUpdatesEnabled(isPreReleaseUpdatesEnabled);
     },
   );
+  ipcMain.handle(
+    'getSetIsDeveloperModeEnabled',
+    (_event, isDeveloperModeEnabled?: boolean) => {
+      return getSetIsDeveloperModeEnabled(isDeveloperModeEnabled);
+    },
+  );
 
   // Notifications
   ipcMain.handle('getNotifications', getNotifications);

diff --git a/src/main/preload.ts b/src/main/preload.ts
@@ -166,6 +166,9 @@ contextBridge.exposeInMainWorld('electron', {
       isPreReleaseUpdatesEnabled,
     );
   },
+  getSetIsDeveloperModeEnabled: (isDeveloperModeEnabled?: boolean) => {
+    ipcRenderer.invoke('getSetIsDeveloperModeEnabled', isDeveloperModeEnabled);
+  },
 
   // Notifications
   getNotifications: () => ipcRenderer.invoke('getNotifications'),

diff --git a/src/main/state/settings.ts b/src/main/state/settings.ts
@@ -23,6 +23,7 @@ const APP_IS_OPEN_ON_STARTUP = 'appIsOpenOnStartup';
 const APP_IS_NOTIFICATIONS_ENABLED = 'appIsNotificationsEnabled';
 export const APP_IS_EVENT_REPORTING_ENABLED = 'appIsEventReportingEnabled';
 const APP_IS_PRE_RELEASE_UPDATES_ENABLED = 'appIsPreReleaseUpdatesEnabled';
+export const APP_IS_DEVELOPER_MODE_ENABLED = 'appIsDeveloperModeEnabled';
 
 export type ThemeSetting = 'light' | 'dark' | 'auto';
 export type Settings = {
@@ -37,6 +38,7 @@ export type Settings = {
   [APP_IS_NOTIFICATIONS_ENABLED]?: boolean;
   [APP_IS_EVENT_REPORTING_ENABLED]?: boolean;
   [APP_IS_PRE_RELEASE_UPDATES_ENABLED]?: boolean;
+  [APP_IS_DEVELOPER_MODE_ENABLED]?: boolean;
 };
 
 /**
@@ -191,6 +193,22 @@ export const getSetIsPreReleaseUpdatesEnabled = (
   return savedIsPreReleaseUpdatesEnabled;
 };
 
+export const getSetIsDeveloperModeEnabled = (
+  isDeveloperModeEnabled?: boolean,
+) => {
+  if (isDeveloperModeEnabled !== undefined) {
+    logger.info(`Setting isDeveloperModeEnabled to ${isDeveloperModeEnabled}`);
+    store.set(
+      `${SETTINGS_KEY}.${APP_IS_DEVELOPER_MODE_ENABLED}`,
+      isDeveloperModeEnabled,
+    );
+  }
+  const savedIsDeveloperModeEnabled: boolean = store.get(
+    `${SETTINGS_KEY}.${APP_IS_DEVELOPER_MODE_ENABLED}`,
+  );
+  return savedIsDeveloperModeEnabled;
+};
+
 // listen to OS theme updates
 nativeTheme.on('updated', () => {
   console.log("nativeTheme.on('updated')");

diff --git a/src/renderer/Presentational/DevMode/DevMode.tsx b/src/renderer/Presentational/DevMode/DevMode.tsx
@@ -0,0 +1,25 @@
+import { useEffect, useState } from 'react';
+import type { Settings } from '../../../main/state/settings.js';
+import { useGetSettingsQuery } from '../../state/settingsService.js';
+
+export const DevMode = ({ children }) => {
+  const [sIsVisible, setIsVisible] = useState(false);
+  const qSettings = useGetSettingsQuery();
+
+  useEffect(() => {
+    qSettings.refetch();
+    const settingsData = qSettings?.data as Settings;
+    // console.log('DEV MODE: settingsData', settingsData);
+    setIsVisible(settingsData?.appIsDeveloperModeEnabled === true);
+  }, [qSettings.data]);
+
+  if (sIsVisible) {
+    return (
+      <div style={{ border: 1, borderStyle: 'dashed' }}>
+        <span>👷</span>
+        {children}
+      </div>
+    );
+  }
+  return null;
+};
diff --git a/src/renderer/Presentational/ModalManager/PreferencesModal.tsx b/src/renderer/Presentational/ModalManager/PreferencesModal.tsx
@@ -41,6 +41,7 @@ export const PreferencesModal = ({ modalOnClose }: Props) => {
       isNotificationsEnabled,
       isEventReportingEnabled,
       isPreReleaseUpdatesEnabled,
+      isDeveloperModeEnabled,
       language,
     } = updatedConfig || (modalConfig as ModalConfig);
 
@@ -68,6 +69,9 @@ export const PreferencesModal = ({ modalOnClose }: Props) => {
         reportEvent('DisablePreReleaseUpdates');
       }
     }
+    if (isDeveloperModeEnabled !== undefined) {
+      await electron.getSetIsDeveloperModeEnabled(isDeveloperModeEnabled);
+    }
     if (language) {
       await electron.setLanguage(language);
       qSettings.refetch();

diff --git a/src/renderer/Presentational/NodeScreen/NodeScreen.tsx b/src/renderer/Presentational/NodeScreen/NodeScreen.tsx
@@ -5,6 +5,7 @@ import { useNavigate } from 'react-router-dom';
 
 import { NodeStatus } from '../../../common/node';
 import Button from '../../Generics/redesign/Button/Button';
+import CopyButton from '../../Generics/redesign/CopyButton/CopyButton.js';
 import { HeaderButton } from '../../Generics/redesign/HeaderButton/HeaderButton';
 import type { NodeAction } from '../../Generics/redesign/consts';
 import type { NodeBackgroundId } from '../../assets/images/nodeBackgrounds';
@@ -27,6 +28,7 @@ import { hexToDecimal } from '../../utils';
 import ContentSingleClient, {
   type SingleNodeContent,
 } from '../ContentSingleClient/ContentSingleClient';
+import { DevMode } from '../DevMode/DevMode.js';
 import {
   backButtonContainer,
   container,
@@ -384,6 +386,21 @@ const NodeScreen = () => {
         nodeOverview={nodeContent}
         isPodmanRunning={isPodmanRunning}
       />
+      <p>Controller version: {spec?.version}</p>
+      <DevMode>
+        <div style={{ display: 'flex', gap: '10px' }}>
+          <span>Active Controller Json</span>
+          <CopyButton data={JSON.stringify(selectedNode, null, 2)} />
+        </div>
+        <div style={{ display: 'flex', gap: '10px' }}>
+          <span>Controller Config Json</span>
+          <CopyButton data={JSON.stringify(selectedNode.config, null, 2)} />
+        </div>
+        <div style={{ display: 'flex', gap: '10px' }}>
+          <span>Controller Json</span>
+          <CopyButton data={JSON.stringify(selectedNode.spec, null, 2)} />
+        </div>
+      </DevMode>
     </>
   );
 };

diff --git a/src/renderer/Presentational/Preferences/Preferences.tsx b/src/renderer/Presentational/Preferences/Preferences.tsx
@@ -35,6 +35,7 @@ export type Preference =
   | 'isNotificationsEnabled'
   | 'isEventReportingEnabled'
   | 'isPreReleaseUpdatesEnabled'
+  | 'isDeveloperModeEnabled'
   | 'language';
 export interface PreferencesProps {
   themeSetting?: ThemeSetting;
@@ -43,6 +44,7 @@ export interface PreferencesProps {
   isNotificationsEnabled?: boolean;
   isEventReportingEnabled?: boolean;
   isPreReleaseUpdatesEnabled?: boolean;
+  isDeveloperModeEnabled?: boolean;
   version?: string;
   language?: string;
   onChange?: (preference: Preference, value: unknown) => void;
@@ -55,6 +57,7 @@ const Preferences = ({
   isNotificationsEnabled,
   isEventReportingEnabled,
   isPreReleaseUpdatesEnabled,
+  isDeveloperModeEnabled,
   version,
   language,
   onChange,
@@ -270,6 +273,24 @@ const Preferences = ({
                     />
                   ),
                 },
+                {
+                  label: `${t('Developer mode')}`,
+                  description: t(
+                    'Show developer information throuhout the app marked by  👷',
+                  ),
+                  value: (
+                    <Toggle
+                      onText={t('Enabled')}
+                      offText={t('Disabled')}
+                      checked={isDeveloperModeEnabled}
+                      onChange={(newValue) => {
+                        if (onChange) {
+                          onChange('isDeveloperModeEnabled', newValue);
+                        }
+                      }}
+                    />
+                  ),
+                },
               ],
             },
           ]}

diff --git a/src/renderer/Presentational/Preferences/PreferencesWrapper.tsx b/src/renderer/Presentational/Preferences/PreferencesWrapper.tsx
@@ -23,6 +23,8 @@ const PreferencesWrapper = ({
     useState<boolean>();
   const [sIsPreReleaseUpdatesEnabled, setIsPreReleaseUpdatesEnabled] =
     useState<boolean>();
+  const [sIsDeveloperModeEnabled, setIsDeveloperModeEnabled] =
+    useState<boolean>();
   const [sNiceNodeVersion, setNiceNodeVersion] = useState<string>();
   const [sLanguageSetting, setLanguageSetting] = useState<string>();
 
@@ -49,12 +51,15 @@ const PreferencesWrapper = ({
         userSettings.appIsEventReportingEnabled || false;
       const isPreReleaseUpdatesEnabled =
         userSettings.appIsPreReleaseUpdatesEnabled || false;
+      const isDeveloperModeEnabled =
+        userSettings.appIsDeveloperModeEnabled || false;
       setThemeSetting(themeSetting);
       setOsIsDarkMode(osIsDarkMode);
       setIsNotificationsEnabled(notificationsSetting);
       setIsOpenOnStartup(isOpenAtStartupSetting);
       setIsEventReportingEnabled(isEventReportingEnabled);
       setIsPreReleaseUpdatesEnabled(isPreReleaseUpdatesEnabled);
+      setIsDeveloperModeEnabled(isDeveloperModeEnabled);
     };
 
     const getNiceNodeVersion = async () => {
@@ -122,6 +127,12 @@ const PreferencesWrapper = ({
         modalOnChangeConfig({
           isPreReleaseUpdatesEnabled,
         });
+      } else if (preference === 'isDeveloperModeEnabled') {
+        const isDeveloperModeEnabled = value as boolean;
+        setIsDeveloperModeEnabled(isDeveloperModeEnabled);
+        modalOnChangeConfig({
+          isDeveloperModeEnabled,
+        });
       } else if (preference === 'language') {
         const language = value as string;
         setLanguageSetting(language);
@@ -143,6 +154,7 @@ const PreferencesWrapper = ({
       isNotificationsEnabled={sIsNotificationsEnabled}
       isEventReportingEnabled={sIsEventReportingEnabled}
       isPreReleaseUpdatesEnabled={sIsPreReleaseUpdatesEnabled}
+      isDeveloperModeEnabled={sIsDeveloperModeEnabled}
       language={sLanguageSetting}
       onChange={onChangePreference}
     />

diff --git a/src/renderer/preload.d.ts b/src/renderer/preload.d.ts
@@ -141,6 +141,7 @@ declare global {
       getSetIsPreReleaseUpdatesEnabled(
         isPreReleaseUpdatesEnabled?: boolean,
       ): void;
+      getSetIsDeveloperModeEnabled(isDeveloperModeEnabled?: boolean): void;
 
       // Notifications
       getNotifications(): any;