Merge branch 'dev' into fix/myorg

Author: dragonpoo

client/VERSION

@@ -1 +1 @@
-2.7.0
+2.7.2

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-frontend",
-  "version": "2.7.0",
+  "version": "2.7.2",
   "type": "module",
   "private": true,
   "workspaces": [

client/packages/lowcoder-comps/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-comps",
-  "version": "2.7.1",
+  "version": "2.7.2",
   "type": "module",
   "license": "MIT",
   "dependencies": {

client/packages/lowcoder-design/src/icons/index.tsx

@@ -255,7 +255,7 @@ export { ReactComponent as RecyclerIcon } from "./remix/delete-bin-line.svg";
 export { ReactComponent as MarketplaceIcon } from "./v1/icon-application-marketplace.svg";
 export { ReactComponent as FavoritesIcon } from "./v1/icon-application-favorites.svg";
 export { ReactComponent as HomeSettingIcon } from "./remix/settings-4-line.svg";
-export { ReactComponent as EnterpriseIcon } from "./remix/earth-line.svg";
+export { ReactComponent as EnterpriseIcon } from "./remix/shield-star-line.svg";
 export { ReactComponent as VerticalIcon } from "./remix/vertical.svg";
 export { ReactComponent as HorizontalIcon } from "./remix/horizontal.svg";
 

client/packages/lowcoder-sdk-webpack-bundle/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lowcoder-sdk-webpack-bundle",
   "description": "",
-  "version": "2.7.0",
+  "version": "2.7.2",
   "main": "index.jsx",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

client/packages/lowcoder-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-sdk",
-  "version": "2.7.0",
+  "version": "2.7.2",
   "type": "module",
   "files": [
     "src",

client/packages/lowcoder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowcoder",
-  "version": "2.7.0",
+  "version": "2.7.2",
   "private": true,
   "type": "module",
   "main": "src/index.sdk.ts",

client/packages/lowcoder/src/api/newsApi.ts

@@ -132,7 +132,7 @@ export const getHubspotContent = async () => {
   };
   try {
     const result = await NewsApi.secureRequest(apiBody);
-    return result?.data[0]?.hubspot?.length > 0 ? result.data[0].hubspot as any[] : [];
+    return result?.data[0]?.results?.length > 0 ? result.data[0].results as any[] : [];
   } catch (error) {
     console.error("Error getting news:", error);
     throw error;

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]: {