added app header settings in advanced settings

raheeliftikhar5 · raheeliftikhar5 · commit f8f2872a0fad · 2024-07-29T22:21:29.000+05:00
diff --git a/client/packages/lowcoder/src/components/PageSkeleton.tsx b/client/packages/lowcoder/src/components/PageSkeleton.tsx
@@ -83,12 +83,12 @@ export default function PageSkeleton(props: IProps) {
 
   return (
     <Layout>
-      {!hideHeader && isHeaderReady && (
+      {/* {!hideHeader && isHeaderReady && (
         <Header 
           headerStart={<StyledLogoWithName branding={true} />}
           style={{ backgroundColor: brandingConfig?.headerColor, ...props.headStyle }}
         />
-      )}
+      )} */}
       <Layout>
         {!hideSideBar && <SideBar>{skeleton}</SideBar>}
         <MainContent>{!hideContent && skeleton}</MainContent>
diff --git a/client/packages/lowcoder/src/i18n/locales/de.ts b/client/packages/lowcoder/src/i18n/locales/de.ts
@@ -2079,7 +2079,9 @@ export const de: typeof en = {
       "preloadLibsAddBtn": "Eine Bibliothek hinzufügen",
       "saveSuccess": "Erfolgreich gerettet",
       "AuthOrgTitle": "Willkommensbildschirm des Arbeitsbereichs",
-      "AuthOrgDescrition": "Die URL, unter der sich deine Nutzer beim aktuellen Arbeitsbereich anmelden können."
+      "AuthOrgDescrition": "Die URL, unter der sich deine Nutzer beim aktuellen Arbeitsbereich anmelden können.",
+      "showHeaderInPublicApps": "Kopfzeile öffentlich anzeigen",
+      "showHeaderInPublicAppsHelp": "Legen Sie die Sichtbarkeit des Headers in der öffentlichen Ansicht für alle Apps fest",
   },
   "branding": {
       ...en.branding,
diff --git a/client/packages/lowcoder/src/i18n/locales/en.ts b/client/packages/lowcoder/src/i18n/locales/en.ts
@@ -2600,8 +2600,9 @@ export const en = {
     "APIConsumption": "API Consumption",
     "APIConsumptionDescription": "Here you can see the API Consumption for All Apps in the Current Workspace.",
     "overallAPIConsumption": "Overall API Consumption in this Workspace till now",
-    "lastMonthAPIConsumption": "Last Month API Consumption, in this Workspace"
-
+    "lastMonthAPIConsumption": "Last Month API Consumption, in this Workspace",
+    "showHeaderInPublicApps": "Show Header In Public View",
+    "showHeaderInPublicAppsHelp": "Set visibility of header in public view for all apps",
   },
 
 
diff --git a/client/packages/lowcoder/src/i18n/locales/pt.ts b/client/packages/lowcoder/src/i18n/locales/pt.ts
@@ -2660,7 +2660,9 @@ export const pt: typeof en = {
         "APIConsumption": "Consumo de API",
         "APIConsumptionDescription": "Aqui você pode ver o consumo de API para todas as aplicações no espaço de trabalho atual.",
         "overallAPIConsumption": "Consumo geral de API neste espaço de trabalho até o momento",
-        "lastMonthAPIConsumption": "Consumo de API do último mês, neste espaço de trabalho"
+        "lastMonthAPIConsumption": "Consumo de API do último mês, neste espaço de trabalho",
+        "showHeaderInPublicApps": "Mostrar cabeçalho em exibição pública",
+        "showHeaderInPublicAppsHelp": "Defina a visibilidade do cabeçalho em exibição pública para todos os aplicativos",
     },
 
 
diff --git a/client/packages/lowcoder/src/i18n/locales/zh.ts b/client/packages/lowcoder/src/i18n/locales/zh.ts
@@ -2068,6 +2068,8 @@ export const zh: typeof en = {
         "APIConsumptionDescription": "API 消耗是指当前工作空间中所有应用程序的 API 消耗情况,包括调用次数和调用时间.",
         "overallAPIConsumption": "总体 API 消耗",
         "lastMonthAPIConsumption": "上个月 API 消耗",
+        "showHeaderInPublicApps": "在公共视图中显示标题",
+        "showHeaderInPublicAppsHelp": "设置所有应用程序的标题在公共视图中的可见性",
     },
     branding: {
         ...en.branding,
diff --git a/client/packages/lowcoder/src/pages/editor/editorView.tsx b/client/packages/lowcoder/src/pages/editor/editorView.tsx
@@ -53,6 +53,7 @@ import {
 } from "util/localStorageUtil";
 import { isAggregationApp } from "util/appUtils";
 import EditorSkeletonView from "./editorSkeletonView";
+import { getCommonSettings } from "@lowcoder-ee/redux/selectors/commonSettingSelectors";
 
 const LeftContent = lazy(
   () => import('./LeftContent')
@@ -278,6 +279,7 @@ function EditorView(props: EditorViewProps) {
   const editorState = useContext(EditorContext);
   const { readOnly, hideHeader } = useContext(ExternalEditorContext);
   const application = useSelector(currentApplication);
+  const commonSettings = useSelector(getCommonSettings);
   const locationState = useLocation<UserGuideLocationState>().state;
   const showNewUserGuide = locationState?.showNewUserGuide;
   const showAppSnapshot = useSelector(showAppSnapshotSelector);
@@ -369,11 +371,10 @@ function EditorView(props: EditorViewProps) {
     return () => window.removeEventListener(eventType, updateSize);
   }, []);
 
-  const hideBodyHeader = useTemplateViewMode() || (isViewMode && !showHeaderInPublic);
+  const hideBodyHeader = useTemplateViewMode() || (isViewMode && (!showHeaderInPublic || !commonSettings.showHeaderInPublicApps));
 
   // we check if we are on the public cloud
   const isLowCoderDomain = window.location.hostname === 'app.lowcoder.cloud';
-
   if (readOnly && hideHeader) {
     return (
       <CustomShortcutWrapper>
diff --git a/client/packages/lowcoder/src/pages/setting/advanced/AdvancedSetting.tsx b/client/packages/lowcoder/src/pages/setting/advanced/AdvancedSetting.tsx
@@ -25,6 +25,7 @@ import { getGlobalSettings } from "comps/utils/globalSettings";
 import { fetchJSLibrary } from "util/jsLibraryUtils";
 import { evalFunc } from "lowcoder-core";
 import { messageInstance } from "lowcoder-design/src/components/GlobalInstances";
+import { default as Switch } from "antd/es/switch";
 
 const CodeEditor = lazy(
   () => import("base/codeEditor/codeEditor")
@@ -186,6 +187,34 @@ export function AdvancedSetting() {
             {trans("advanced.saveBtn")}
           </SaveButton>
         </div>
+        <div className="section-title">{trans("advanced.showHeaderInPublicApps")}</div>
+        <HelpText style={{ marginBottom: 12 }}>{trans("advanced.showHeaderInPublicAppsHelp")}</HelpText>
+        <div className="section-content">
+          <Switch
+            style={{ marginBottom: 12 }}
+            checked={
+              settings.hasOwnProperty('showHeaderInPublicApps')
+              ? settings.showHeaderInPublicApps
+              : true
+            }
+            onChange={(value: boolean) => {
+              setSettings((v) => ({ ...v, showHeaderInPublicApps: value }));
+            }}
+          />
+          <SaveButton
+            buttonType="primary"
+            disabled={commonSettings.showHeaderInPublicApps === settings.showHeaderInPublicApps}
+            onClick={
+              () => handleSave("showHeaderInPublicApps")(
+                settings.hasOwnProperty('showHeaderInPublicApps')
+                ? settings.showHeaderInPublicApps
+                : true
+              )
+            }
+          >
+            {trans("advanced.saveBtn")}
+          </SaveButton>
+        </div>
         <div className="section-title">{trans("advanced.preloadJSTitle")}</div>
         <HelpText style={{ marginBottom: 12 }}>{trans("advanced.preloadJSHelp")}</HelpText>
         <div className="section-content">
diff --git a/client/packages/lowcoder/src/redux/reducers/uiReducers/commonSettingsReducer.ts b/client/packages/lowcoder/src/redux/reducers/uiReducers/commonSettingsReducer.ts
@@ -14,6 +14,7 @@ export interface CommonSettingsState {
     preloadLibs?: string[] | null;
     applyPreloadCSSToHomePage?: boolean | null;
     runJavaScriptInHost?: boolean | null;
+    showHeaderInPublicApps?: boolean;
   };
   setResult: boolean;
 
