Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Subpath #1783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 15 commits into from
Closed

Subpath #1783

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions client/packages/lowcoder/src/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
}
}
Expand Down Expand Up @@ -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));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]: {
Expand Down
2 changes: 1 addition & 1 deletion client/packages/lowcoder/src/comps/comps/rootComp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ export interface ApplicationMeta {
title?: string;
description?: string;
image?: string;
icon?: string;
category?: ApplicationCategoriesEnum;
showheader?: boolean;
orgId: string;
Expand Down
4 changes: 4 additions & 0 deletions client/packages/lowcoder/src/i18n/locales/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3931,6 +3931,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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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} />
Expand Down
Loading
Loading