Merge branch 'dev' into add/lineHeight

Author: raheeliftikhar5

client/packages/lowcoder-comps/src/comps/calendarComp/calendarComp.tsx

@@ -32,6 +32,7 @@ import {
   hiddenPropertyView,
   ChangeEventHandlerControl,
   DragEventHandlerControl,
+  CalendarEventHandlerControl,
   Section,
   sectionNames,
   dropdownControl,
@@ -45,7 +46,9 @@ import {
   CalendarDeleteIcon,
   Tooltip,
   useMergeCompStyles,
-} from "lowcoder-sdk";
+  EditorContext,
+  CompNameContext,
+} from 'lowcoder-sdk';
 
 import {
   DefaultWithFreeViewOptions,
@@ -76,7 +79,7 @@ let childrenMap: any = {
   resourcesEvents: jsonValueExposingStateControl("resourcesEvents", resourcesEventsDefaultData),
   resources: jsonValueExposingStateControl("resources", resourcesDefaultData),
   resourceName: withDefault(StringControl, trans("calendar.resourcesDefault")),
-  onEvent: ChangeEventHandlerControl,
+  onEvent: CalendarEventHandlerControl,
   // onDropEvent: safeDragEventHandlerControl,
   editable: withDefault(BoolControl, true),
   showEventTime: withDefault(BoolControl, true),
@@ -120,6 +123,12 @@ let CalendarBasicComp = (function () {
     currentFreeView?: string; 
     currentPremiumView?: string; 
   }, dispatch: any) => {
+  
+  const comp = useContext(EditorContext).getUICompByName(
+    useContext(CompNameContext)
+    );
+    const onEventVal = comp?.toJsonValue().comp.onEvent;
+  
 
     const theme = useContext(ThemeContext);
     const ref = createRef<HTMLDivElement>();
@@ -303,7 +312,12 @@ let CalendarBasicComp = (function () {
         };
         showModal(eventInfo, true);
       } else {
-        showModal(editEvent.current, false);
+        if (onEventVal && onEventVal.some((e: any) => e.name === 'doubleClick')) {
+          // Check if 'doubleClick' is included in the array
+          props.onEvent('doubleClick');
+        } else {
+          showModal(editEvent.current as EventType, false);
+        }
       }
     };
 
@@ -433,7 +447,6 @@ let CalendarBasicComp = (function () {
         props.onDropEvent("dropEvent");
       }
     };
-
     return (
       <Wrapper
         ref={ref}

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>

client/packages/lowcoder/src/comps/comps/tableComp/tableCompView.tsx

@@ -189,6 +189,7 @@ const TableWrapper = styled.div<{
 
   .ant-table.ant-table-middle .ant-table-cell-with-append .ant-table-row-expand-icon {
     top: 14px;
+    margin-right:5px;
   }
 
   .ant-table {

client/packages/lowcoder/src/comps/controls/eventHandlerControl.tsx

@@ -700,6 +700,11 @@ export const DragEventHandlerControl = eventHandlerControl([
   dropEvent,
 ] as const);
 
+export const CalendarEventHandlerControl = eventHandlerControl([
+  changeEvent,
+  doubleClickEvent,
+] as const);
+
 export const ElementEventHandlerControl = eventHandlerControl([
   openEvent,
   editedEvent,

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,

client/packages/lowcoder/src/i18n/locales/en.ts

@@ -2601,8 +2601,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",
   },
 
 

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",
     },
 
 

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,

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>

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">

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;
 

server/node-service/src/plugins/index.ts

@@ -35,6 +35,7 @@ import bigQueryPlugin from "./bigQuery";
 import appConfigPlugin from "./appconfig";
 import tursoPlugin from "./turso";
 import postmanEchoPlugin from "./postmanEcho";
+import lowcoderPlugin from "./lowcoder";
 
 let plugins: (DataSourcePlugin | DataSourcePluginFactory)[] = [
   s3Plugin,
@@ -73,6 +74,7 @@ let plugins: (DataSourcePlugin | DataSourcePluginFactory)[] = [
   appConfigPlugin,
   tursoPlugin,
   postmanEchoPlugin,
+  lowcoderPlugin,
 ];
 
 try {

server/node-service/src/plugins/lowcoder/index.ts

@@ -0,0 +1,75 @@
+import { readYaml } from "../../common/util";
+import _ from "lodash";
+import path from "path";
+import { OpenAPIV3, OpenAPI } from "openapi-types";
+import { ConfigToType, DataSourcePlugin } from "lowcoder-sdk/dataSource";
+import { runOpenApi } from "../openApi";
+import { parseOpenApi, ParseOpenApiOptions } from "../openApi/parse";
+
+import spec from './lowcoder.spec.json';
+
+const dataSourceConfig = {
+  type: "dataSource",
+  params: [
+    {
+      key: "serverURL",
+      type: "textInput",
+      label: "Lowcoder API Service URL",
+      rules: [{ required: true }],
+      placeholder: "https://<your-lowcoder-api-service>:port",
+      tooltip: "Input the server url of your self-hosting instance or api-service.lowcoder.cloud if you are running your apps on the free public Community Edition Cloud Service.",
+    },
+    {
+      "type": "groupTitle",
+      "key": "API Key",
+      "label": "Api Key Auth"
+    },
+    {
+      type: "password",
+      key: "bearerAuth.value",
+      label: "Authorization",
+      "tooltip": "API Key Authentication with a Bearer token. Copy your API Key here. (e.g. 'Bearer eyJhbGciO...')",
+      "placeholder": "API Key Authentication with a Bearer token. Copy your API Key here. (e.g. 'Bearer eyJhbGciO...')"
+    }
+]
+} as const;
+
+const parseOptions: ParseOpenApiOptions = {
+  actionLabel: (method: string, path: string, operation: OpenAPI.Operation) => {
+    return _.upperFirst(operation.operationId || "");
+  },
+};
+
+type DataSourceConfigType = ConfigToType<typeof dataSourceConfig>;
+
+const lowcoderPlugin: DataSourcePlugin<any, DataSourceConfigType> = {
+  id: "lowcoder",
+  name: "Lowcoder API",
+  icon: "lowcoder.svg",
+  category: "api",
+  dataSourceConfig,
+  queryConfig: async () => {
+    const { actions, categories } = await parseOpenApi(spec as unknown as OpenAPI.Document, parseOptions);
+    return {
+      type: "query",
+      label: "Action",
+      categories: {
+        label: "Resources",
+        items: categories,
+      },
+      actions,
+    };
+  },
+  run: function (actionData, dataSourceConfig): Promise<any> {
+    const { serverURL, ...otherDataSourceConfig } = dataSourceConfig;
+    console.log("Lowcoder API Plugin: run", serverURL, otherDataSourceConfig);
+    const runApiDsConfig = {
+      url: "",
+      serverURL: serverURL,
+      dynamicParamsConfig: otherDataSourceConfig,
+    };
+    return runOpenApi(actionData, runApiDsConfig, spec as OpenAPIV3.Document);
+  },
+};
+
+export default lowcoderPlugin;