Skip to content

Added version switch dropdown for Lowcoder comps and comp plugins #1047

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Jul 18, 2024
Merged

Added version switch dropdown for Lowcoder comps and comp plugins #1047

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
982f98b
added dropdown in app settings to change lowcoder-comps version
raheeliftikhar5 Jul 16, 2024
868faf5
add version change dropdown for comp plugins
raheeliftikhar5 Jul 17, 2024
e83c6b9
small fix
raheeliftikhar5 Jul 18, 2024
f905f49
Merge branch 'dev' into lowcoder-comps-version-switch
FalkWolsky Jul 18, 2024
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
Next Next commit
added dropdown in app settings to change lowcoder-comps version
  • Loading branch information
@raheeliftikhar5
raheeliftikhar5 committed Jul 17, 2024
commit 982f98be195087252d43175a7cf2006a209f57f7
45 changes: 44 additions & 1 deletion client/packages/lowcoder/src/comps/comps/appSettingsComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { dropdownInputSimpleControl } from "comps/controls/dropdownInputSimpleCo
import { MultiCompBuilder, valueComp, withDefault } from "comps/generators";
import { AddIcon, Dropdown } from "lowcoder-design";
import { EllipsisSpan } from "pages/setting/theme/styledComponents";
import { useEffect } from "react";
import { useEffect, useState } from "react";
import { useSelector } from "react-redux";
import { getDefaultTheme, getThemeList } from "redux/selectors/commonSettingSelectors";
import styled, { css } from "styled-components";
Expand All @@ -19,6 +19,8 @@ import { IconControl } from "comps/controls/iconControl";
import { dropdownControl } from "comps/controls/dropdownControl";
import { ApplicationCategoriesEnum } from "constants/applicationConstants";
import { BoolControl } from "../controls/boolControl";
import { getNpmPackageMeta } from "../utils/remote";
import { getPromiseAfterDispatch } from "@lowcoder-ee/util/promiseUtils";

const TITLE = trans("appSetting.title");
const USER_DEFINE = "__USER_DEFINE";
Expand Down Expand Up @@ -189,13 +191,15 @@ const childrenMap = {
preventAppStylesOverwriting: withDefault(BoolControl, true),
customShortcuts: CustomShortcutsComp,
disableCollision: valueComp<boolean>(false),
lowcoderCompVersion: withDefault(StringControl, 'latest'),
};
type ChildrenInstance = RecordConstructorToComp<typeof childrenMap> & {
themeList: ThemeType[];
defaultTheme: string;
};

function AppSettingsModal(props: ChildrenInstance) {
const [lowcoderCompVersions, setLowcoderCompVersions] = useState(['latest']);
const {
themeList,
defaultTheme,
Expand All @@ -207,11 +211,14 @@ function AppSettingsModal(props: ChildrenInstance) {
category,
showHeaderInPublic,
preventAppStylesOverwriting,
lowcoderCompVersion,
} = props;

const THEME_OPTIONS = themeList?.map((theme) => ({
label: theme.name,
value: theme.id + "",
}));

const themeWithDefault = (
themeId.getView() === DEFAULT_THEMEID ||
(!!themeId.getView() &&
Expand All @@ -225,6 +232,17 @@ function AppSettingsModal(props: ChildrenInstance) {
themeId.dispatchChangeValueAction(themeWithDefault);
}
}, [themeWithDefault]);

useEffect(() => {
const fetchCompsPackageMeta = async () => {
const packageMeta = await getNpmPackageMeta('lowcoder-comps');
if (packageMeta?.versions) {
setLowcoderCompVersions(Object.keys(packageMeta.versions).reverse())
}
}
fetchCompsPackageMeta();
}, [])


const DropdownItem = (params: { value: string }) => {
const themeItem = themeList.find((theme) => theme.id === params.value);
Expand Down Expand Up @@ -308,6 +326,31 @@ function AppSettingsModal(props: ChildrenInstance) {
})}
</div>
</DivStyled>
<DividerStyled />
<DivStyled>
<Dropdown
defaultValue={lowcoderCompVersion.getView()}
placeholder={'Select version'}
options={
lowcoderCompVersions.map(version => ({label: version, value: version}))
}
label={'Lowcoder Comps Version'}
placement="bottom"
allowClear
onChange={async (value) => {
await getPromiseAfterDispatch(
lowcoderCompVersion.dispatch,
lowcoderCompVersion.changeValueAction(value), {
autoHandleAfterReduce: true,
}
)
setTimeout(() => {
window.location.reload();
}, 1000);
}}
/>
</DivStyled>
<DividerStyled />
{props.customShortcuts.getPropertyView()}
</SettingsStyled>
);
Expand Down
26 changes: 18 additions & 8 deletions client/packages/lowcoder/src/comps/comps/remoteComp/remoteComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ import { GreyTextColor } from "constants/style";
import log from "loglevel";
import { Comp, CompAction, CompParams, customAction, isCustomAction } from "lowcoder-core";
import { WhiteLoading } from "lowcoder-design";
import { useState } from "react";
import { useContext, useState } from "react";
import { useMount } from "react-use";
import styled from "styled-components";
import { RemoteCompInfo, RemoteCompLoader } from "types/remoteComp";
import { loaders } from "./loaders";
import { withErrorBoundary } from "comps/generators/withErrorBoundary";
import { EditorContext } from "@lowcoder-ee/comps/editorState";

const ViewError = styled.div`
display: flex;
Expand Down Expand Up @@ -45,18 +46,22 @@ interface RemoteCompReadyAction {
}

interface RemoteCompViewProps {
loadComp: () => Promise<void>;
isLowcoderComp?: boolean;
loadComp: (packageVersion?: string) => Promise<void>;
loadingElement?: () => React.ReactNode;
errorElement?: (error: any) => React.ReactNode;
}

function RemoteCompView(props: React.PropsWithChildren<RemoteCompViewProps>) {
const { loadComp, loadingElement, errorElement } = props;
const { loadComp, loadingElement, errorElement, isLowcoderComp } = props;
const [error, setError] = useState<any>("");

const editorState = useContext(EditorContext);
const lowcoderCompPackageVersion = editorState?.getAppSettings().lowcoderCompVersion || 'latest';
const packageVersion = isLowcoderComp ? lowcoderCompPackageVersion : 'latest';

useMount(() => {
setError("");
loadComp().catch((e) => {
loadComp(packageVersion).catch((e) => {
setError(String(e));
});
});
Expand Down Expand Up @@ -96,7 +101,7 @@ export function remoteComp<T extends RemoteCompInfo = RemoteCompInfo>(
this.compValue = params.value;
}

private async load() {
private async load(packageVersion = 'latest') {
if (!remoteInfo) {
return;
}
Expand All @@ -108,7 +113,7 @@ export function remoteComp<T extends RemoteCompInfo = RemoteCompInfo>(
log.error("loader not found, remote info:", remoteInfo);
return;
}
const RemoteExportedComp = await finalLoader(remoteInfo);
const RemoteExportedComp = await finalLoader({...remoteInfo, packageVersion});
if (!RemoteExportedComp) {
return;
}
Expand All @@ -135,7 +140,12 @@ export function remoteComp<T extends RemoteCompInfo = RemoteCompInfo>(
getView() {
const key = `${remoteInfo?.packageName}-${remoteInfo?.packageVersion}-${remoteInfo?.compName}`;
return (
<RemoteCompView key={key} loadComp={() => this.load()} loadingElement={loadingElement} />
<RemoteCompView
key={key}
isLowcoderComp={remoteInfo?.packageName === 'lowcoder-comps'}
loadComp={(packageVersion?: string) => this.load(packageVersion)}
loadingElement={loadingElement}
/>
);
}

Expand Down