Merge branch 'dev' of github.com:lowcoder-org/lowcoder into feat/myorg-endpoint

Author: iamfaran

client/packages/lowcoder/src/app.tsx

@@ -60,7 +60,6 @@ import GlobalInstances from 'components/GlobalInstances';
 import { fetchHomeData, fetchServerSettingsAction } from "./redux/reduxActions/applicationActions";
 import { getNpmPackageMeta } from "./comps/utils/remote";
 import { packageMetaReadyAction, setLowcoderCompsLoading } from "./redux/reduxActions/npmPluginActions";
-import { fetchBrandingSetting } from "./redux/reduxActions/enterpriseActions";
 import { EnterpriseProvider } from "./util/context/EnterpriseContext";
 import { SimpleSubscriptionContextProvider } from "./util/context/SimpleSubscriptionContext";
 import { getBrandingSetting } from "./redux/selectors/enterpriseSelectors";
@@ -137,7 +136,6 @@ type AppIndexProps = {
   defaultHomePage: string | null | undefined;
   fetchHomeDataFinished: boolean;
   fetchConfig: (orgId?: string) => void;
-  fetchBrandingSetting: (orgId?: string) => void;
   fetchHomeData: (currentUserAnonymous?: boolean | undefined) => void;
   fetchLowcoderCompVersions: () => void;
   getCurrentUser: () => void;
@@ -167,7 +165,6 @@ class AppIndex extends React.Component<AppIndexProps, any> {
       if (!this.props.currentUserAnonymous) {
         this.props.fetchHomeData(this.props.currentUserAnonymous);
         this.props.fetchLowcoderCompVersions();
-        this.props.fetchBrandingSetting(this.props.currentOrgId);
       }
     }
   }
@@ -521,7 +518,6 @@ const mapDispatchToProps = (dispatch: any) => ({
   fetchHomeData: (currentUserAnonymous: boolean | undefined) => {
     dispatch(fetchHomeData({}));
   },
-  fetchBrandingSetting: (orgId?: string) => dispatch(fetchBrandingSetting({ orgId, fallbackToGlobal: true })),
   fetchLowcoderCompVersions: async () => {
     try {
       dispatch(setLowcoderCompsLoading(true));

client/packages/lowcoder/src/comps/comps/moduleContainerComp/moduleLayoutComp.tsx

@@ -65,11 +65,12 @@ function ModuleLayoutView(props: IProps) {
   const defaultGrid = useContext(ThemeContext)?.theme?.gridColumns || "24"; //Added By Aqib Mirza
   const { readOnly } = useContext(ExternalEditorContext);
 
-  if (readOnly) {
-    return (
-      <ModulePreviewWrapper className={CNRootContainer}>{props.containerView}</ModulePreviewWrapper>
-    );
-  }
+  // Removed this so that module load with canvas view and app settings will apply
+  // if (readOnly) {
+  //   return (
+  //     <ModulePreviewWrapper className={CNRootContainer}>{props.containerView}</ModulePreviewWrapper>
+  //   );
+  // }
 
   const layout = {
     [moduleContainerId]: {

client/packages/lowcoder/src/comps/comps/rootComp.tsx

@@ -82,7 +82,7 @@ const RootView = React.memo((props: RootViewProps) => {
     localDefaultTheme;
 
   const themeId = selectedTheme ? selectedTheme.id : (
-    previewTheme ? "preview-theme" : 'default-theme-id'
+    previewTheme?.previewTheme ? "preview-theme" : 'default-theme-id'
   ); 
 
   useEffect(() => {

client/packages/lowcoder/src/comps/comps/tableComp/column/simpleColumnTypeComps.tsx

@@ -16,10 +16,11 @@ import { ToViewReturn } from "@lowcoder-ee/comps/generators/multi";
 import { clickEvent, eventHandlerControl, doubleClickEvent } from "comps/controls/eventHandlerControl";
 import { migrateOldData } from "@lowcoder-ee/comps/generators/simpleGenerators";
 import { useCompClickEventHandler } from "@lowcoder-ee/comps/utils/useCompClickEventHandler";
+import { isArray } from "lodash";
 
 export const fixOldActionData = (oldData: any) => {
   if (!oldData) return oldData;
-  if (Boolean(oldData.onClick)) {
+  if (Boolean(oldData.onClick && !isArray(oldData.onClick))) {
     return {
       ...oldData,
       onClick: [{

client/packages/lowcoder/src/comps/comps/textInputComp/textInputConstants.tsx

@@ -11,7 +11,7 @@ import { stringExposingStateControl } from "comps/controls/codeStateControl";
 import { LabelControl } from "comps/controls/labelControl";
 import { InputLikeStyleType, LabelStyleType, heightCalculator, widthCalculator } from "comps/controls/styleControlConstants";
 import { Section, sectionNames, ValueFromOption } from "lowcoder-design";
-import { fromPairs } from "lodash";
+import { debounce, fromPairs } from "lodash";
 import { css } from "styled-components";
 import { EMAIL_PATTERN, URL_PATTERN } from "util/stringUtils";
 import { MultiBaseComp, RecordConstructorToComp, RecordConstructorToView } from "lowcoder-core";
@@ -33,7 +33,7 @@ import {
   showDataLoadingIndicatorsPropertyView,
 } from "comps/utils/propertyUtils";
 import { trans } from "i18n";
-import { ChangeEvent, useEffect, useRef, useState } from "react";
+import { ChangeEvent, useEffect, useMemo, useRef, useState } from "react";
 import { refMethods } from "comps/generators/withMethodExposing";
 import { InputRef } from "antd/es/input";
 import {
@@ -199,7 +199,6 @@ export const useTextInputProps = (props: RecordConstructorToView<typeof textInpu
         },
       })
     );
-    propsRef.current.onEvent("change");
     changeRef.current = false;
   }, [localInputValue]);
 
@@ -216,19 +215,21 @@ export const useTextInputProps = (props: RecordConstructorToView<typeof textInpu
     );
   }, [props.customRule])
 
-  const onChangeRef = useRef(
-    (value: string) => {
-      props.value.onChange(value);
-    }
+  const debouncedOnChangeRef = useRef(
+    debounce(function (value: string, valueCtx: any) {
+      propsRef.current.value.onChange(value);
+      propsRef.current.onEvent("change");
+    }, 1000)
   );
+  
 
   const handleChange = (e: ChangeEvent<HTMLInputElement>) => {
     const value = e.target.value;
     setLocalInputValue(value);
 
     changeRef.current = true;
     touchRef.current = true;
-    onChangeRef.current?.(value);
+    debouncedOnChangeRef.current?.(value, propsRef.current.value);
   };
 
   // Cleanup refs on unmount
@@ -237,7 +238,7 @@ export const useTextInputProps = (props: RecordConstructorToView<typeof textInpu
       changeRef.current = false;
       touchRef.current = false;
       propsRef.current = null as any;
-      onChangeRef.current = null as any;
+      debouncedOnChangeRef.current.cancel();
     };
   }, []);
 

client/packages/lowcoder/src/constants/applicationConstants.ts

@@ -81,6 +81,7 @@ export interface ApplicationMeta {
   title?: string;
   description?: string;
   image?: string;
+  icon?: string;
   category?: ApplicationCategoriesEnum;
   showheader?: boolean;
   orgId: string;

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

@@ -3932,6 +3932,10 @@ export const en = {
     "datasource": "Data Sources",
     "selectDatasourceType": "Select Data Source Type",
     "home": "Home",
+    "desc": "Description",
+    "renameApp": "Rename app",
+    "updateAppName": "Update Application Name",
+    "titleUpdateWarning": "The card displays the app title. Changing the app name will not update the card view.",
     "all": "All",
     "app": "App",
     "navigation": "Navigation",

client/packages/lowcoder/src/pages/ApplicationV2/HomeLayout.tsx

@@ -469,7 +469,7 @@ export function HomeLayout(props: HomeLayoutProps) {
               title: e.title,
               description: e.description,
               category: e.category,
-              icon: e.image,
+              icon: e.icon,
               type: HomeResTypeEnum[HomeResTypeEnum[e.applicationType] as HomeResKey],
               creator: e?.creatorEmail ?? e.createBy,
               lastModifyTime: e.lastModifyTime,
@@ -630,7 +630,7 @@ export function HomeLayout(props: HomeLayoutProps) {
 
             <Divider />
 
-            <ContentWrapper>
+            <ContentWrapper>     
 
               {isFetching && resList.length === 0 ? (
                 <SkeletonStyle active paragraph={{ rows: 8, width: 648 }} title={false} />