Improve external restart handling

Co-authored-by: Meyn <loads@gmx.de>

frontend/src/Components/Page/Header/PageHeaderActionsMenu.tsx

@@ -18,7 +18,7 @@ interface PageHeaderActionsMenuProps {
 function PageHeaderActionsMenu(props: PageHeaderActionsMenuProps) {
   const { onKeyboardShortcutsPress } = props;
 
-  const { authentication, isDocker } = useSystemStatusData();
+  const { authentication, isContainerized } = useSystemStatusData();
   const { mutate: restart } = useRestart();
   const { mutate: shutdown } = useShutdown();
 
@@ -45,24 +45,22 @@ function PageHeaderActionsMenu(props: PageHeaderActionsMenuProps) {
             {translate('KeyboardShortcuts')}
           </MenuItem>
 
-          {isDocker ? null : (
-            <>
-              <MenuItemSeparator />
+          <MenuItemSeparator />
 
-              <MenuItem onPress={handleRestartPress}>
-                <Icon className={styles.itemIcon} name={icons.RESTART} />
-                {translate('Restart')}
-              </MenuItem>
+          <MenuItem onPress={handleRestartPress}>
+            <Icon className={styles.itemIcon} name={icons.RESTART} />
+            {translate('Restart')}
+          </MenuItem>
 
-              <MenuItem onPress={handleShutdownPress}>
-                <Icon
-                  className={styles.itemIcon}
-                  name={icons.SHUTDOWN}
-                  kind={kinds.DANGER}
-                />
-                {translate('Shutdown')}
-              </MenuItem>
-            </>
+          {isContainerized ? null : (
+            <MenuItem onPress={handleShutdownPress}>
+              <Icon
+                className={styles.itemIcon}
+                name={icons.SHUTDOWN}
+                kind={kinds.DANGER}
+              />
+              {translate('Shutdown')}
+            </MenuItem>
           )}
 
           {formsAuth ? (

frontend/src/System/Status/About/About.tsx

@@ -17,7 +17,7 @@ function About() {
     packageVersion,
     packageAuthor,
     isNetCore,
-    isDocker,
+    isContainerized,
     runtimeVersion,
     databaseVersion,
     databaseType,
@@ -62,7 +62,7 @@ function About() {
           />
         ) : null}
 
-        {isDocker ? (
+        {isContainerized ? (
           <DescriptionListItem title={translate('Docker')} data="Yes" />
         ) : null}
 

frontend/src/typings/SystemStatus.ts

@@ -9,7 +9,7 @@ interface SystemStatus {
   instanceName: string;
   isAdmin: boolean;
   isDebug: boolean;
-  isDocker: boolean;
+  isContainerized: boolean;
   isLinux: boolean;
   isNetCore: boolean;
   isOsx: boolean;