Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

separate marketplace apps in self hosting env#706

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes fromall 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
View file
Open in desktop
Loading
Sorry, something went wrong.Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View file
Open in desktop
Loading
Sorry, something went wrong.Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletionsclient/packages/lowcoder-design/src/icons/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -177,12 +177,14 @@ export { ReactComponent as HomeQueryLibraryIcon } from "./icon-application-query
export { ReactComponent as HomeDataSourceIcon } from "./icon-application-datasource.svg";
export { ReactComponent as RecyclerIcon } from "./icon-application-recycler.svg";
export { ReactComponent as MarketplaceIcon } from "./icon-application-marketplace.svg";
export { ReactComponent as LowcoderMarketplaceIcon } from "./icon-lowcoder-marketplace.svg";
export { ReactComponent as HomeActiveIcon } from "./icon-application-home-active.svg";
export { ReactComponent as HomeModuleActiveIcon } from "./icon-application-module-active.svg";
export { ReactComponent as HomeQueryLibraryActiveIcon } from "./icon-application-query-library-active.svg";
export { ReactComponent as HomeDataSourceActiveIcon } from "./icon-application-datasource-active.svg";
export { ReactComponent as RecyclerActiveIcon } from "./icon-application-recycler-active.svg";
export { ReactComponent as MarketplaceActiveIcon } from "./icon-application-marketplace-active.svg";
export { ReactComponent as LowcoderMarketplaceActiveIcon } from "./icon-lowcoder-marketplace-active.svg";
export { ReactComponent as FavoritesIcon } from "./icon-application-favorites.svg";
export { ReactComponent as HomeSettingIcon } from "./icon-application-setting.svg";
export { ReactComponent as FolderIcon } from "./icon-application-folder.svg";
Expand Down
1 change: 1 addition & 0 deletionsclient/packages/lowcoder/src/app.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ import {
IMPORT_APP_FROM_TEMPLATE_URL,
INVITE_LANDING_URL,
isAuthUnRequired,
MARKETPLACE_TYPE_URL,
MARKETPLACE_URL,
ORG_AUTH_LOGIN_URL,
ORG_AUTH_REGISTER_URL,
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,3 +115,5 @@ export type AppSnapshotList = {
count: number; // total count
list: AppSnapshot[];
};

export type MarketplaceType = "local" | "lowcoder";
6 changes: 5 additions & 1 deletionclient/packages/lowcoder/src/constants/routesURL.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { AppViewMode } from "constants/applicationConstants";
import { AppViewMode, MarketplaceType } from "constants/applicationConstants";
import { LocationDescriptor } from "history";
import { UserGuideLocationState } from "pages/tutorials/tutorialsConstant";
import { DatasourceType } from "@lowcoder-ee/constants/queryConstants";
Expand DownExpand Up@@ -43,10 +43,14 @@ export const LDAP_AUTH_LOGIN_URL = `${USER_AUTH_URL}/ldap/login`;
export const INVITE_LANDING_URL = "/invite/:invitationId";
export const ORG_AUTH_LOGIN_URL = `/org/:orgId/auth/login`;
export const ORG_AUTH_REGISTER_URL = `/org/:orgId/auth/register`;
export const MARKETPLACE_TYPE_URL = `${MARKETPLACE_URL}/:marketplaceType`;

export const APPLICATION_VIEW_URL = (appId: string, viewMode: AppViewMode) =>
`${ALL_APPLICATIONS_URL}/${appId}/${viewMode}`;

export const MARKETPLACE_URL_BY_TYPE = (type: MarketplaceType) =>
`${MARKETPLACE_URL}/${type}`;

export const isAuthUnRequired = (pathname: string): boolean => {
return (
pathname.startsWith("/invite/") ||
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,66 @@
import { useEffect, useState } from "react";
import { useDispatch, useSelector } from "react-redux";
import { HomeLayout } from "./HomeLayout";
import { MARKETPLACE_URL } from "constants/routesURL";
import { marketplaceSelector } from "redux/selectors/applicationSelector";
import { fetchAllMarketplaceApps } from "redux/reduxActions/applicationActions";
import { MARKETPLACE_TYPE_URL, MARKETPLACE_URL } from "constants/routesURL";
import { trans } from "../../i18n";
import axios, { AxiosResponse } from "axios";
import ApplicationApi from "@lowcoder-ee/api/applicationApi";
import { ApplicationMeta, MarketplaceType } from "@lowcoder-ee/constants/applicationConstants";
import { GenericApiResponse } from "@lowcoder-ee/api/apiResponses";
import { validateResponse } from "@lowcoder-ee/api/apiUtils";
import { messageInstance } from "lowcoder-design";
import { matchPath } from "react-router";
import log from "loglevel";

export function MarketplaceView() {
const [haveFetchedApps, setHaveFetchApps] = useState<boolean>(false);
const [ marketplaceApps, setMarketplaceApps ] = useState<Array<ApplicationMeta>>([]);
const marketplaceType = matchPath<{marketplaceType?: MarketplaceType}>(window.location.pathname, MARKETPLACE_TYPE_URL)?.params
.marketplaceType;
const isLowcoderMarketplace = marketplaceType === 'lowcoder';
const marketplaceBreadcrumbText = !marketplaceType?.length
? trans("home.marketplace")
: marketplaceType === 'lowcoder'
? `${trans("home.marketplace")} (Lowcoder)`
: `${trans("home.marketplace")} (Local)`;

const dispatch = useDispatch();
const marketplaceApps = useSelector(marketplaceSelector);
const fetchLowcoderMarketplaceApps = () => {
const http = axios.create({
baseURL: 'https://api-service.lowcoder.cloud',
withCredentials: false,
});
return http.get(`/api/v1/applications/marketplace-apps`);
};

useEffect(() => {
if (!marketplaceApps.length && !haveFetchedApps) {
dispatch(fetchAllMarketplaceApps());
setHaveFetchApps(true);
const fetchLocalMarketplaceApps = () => {
return ApplicationApi.fetchAllMarketplaceApps()
}

const fetchMarketplaceApps = async () => {
try {
let response: AxiosResponse<GenericApiResponse<ApplicationMeta[]>>;
if(isLowcoderMarketplace) {
response = await fetchLowcoderMarketplaceApps();
} else {
response = await fetchLocalMarketplaceApps();
}

const isValidResponse: boolean = validateResponse(response);
if (isValidResponse) {
setMarketplaceApps(response.data.data);
}
} catch (error: any) {
messageInstance.error(error.message);
log.debug("fetch marketplace apps error: ", error);
}
}, []);
}

useEffect(() => {
if (marketplaceApps.length) {
setHaveFetchApps(true);
}
}, [marketplaceApps])
fetchMarketplaceApps();
}, [marketplaceType]);

return (
<HomeLayout
elements={marketplaceApps}
breadcrumb={[{ text:trans("home.marketplace"), path: MARKETPLACE_URL }]}
breadcrumb={[{ text:marketplaceBreadcrumbText, path: MARKETPLACE_URL }]}
mode={"marketplace"}
/>
);
Expand Down
29 changes: 27 additions & 2 deletionsclient/packages/lowcoder/src/pages/ApplicationV2/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import {
FOLDER_URL_PREFIX,
FOLDERS_URL,
MARKETPLACE_URL,
MARKETPLACE_URL_BY_TYPE,
MODULE_APPLICATIONS_URL,
QUERY_LIBRARY_URL,
SETTING,
Expand DownExpand Up@@ -33,6 +34,8 @@ import {
RecyclerIcon,
MarketplaceIcon,
MarketplaceActiveIcon,
LowcoderMarketplaceActiveIcon,
LowcoderMarketplaceIcon,
} from "lowcoder-design";
import React, { useEffect, useState } from "react";
import { fetchAllApplications, fetchHomeData } from "redux/reduxActions/applicationActions";
Expand DownExpand Up@@ -245,6 +248,7 @@ export default function ApplicationHome() {
const allAppCount = allApplications.length;
const allFoldersCount = allFolders.length;
const orgHomeId = "root";
const isSelfHost = window.location.host !== 'app.lowcoder.cloud';

const handleFolderCreate = useCreateFolder();

Expand DownExpand Up@@ -357,8 +361,16 @@ export default function ApplicationHome() {
visible: ({ user }) => user.orgDev,
},
{
text: <TabLabel>{trans("home.marketplace")}</TabLabel>,
routePath: MARKETPLACE_URL,
text: (
<TabLabel>
{
isSelfHost
? `${trans("home.marketplace")} (Local)`
: trans("home.marketplace")
}
</TabLabel>
),
routePath: isSelfHost ? MARKETPLACE_URL_BY_TYPE('local') : MARKETPLACE_URL,
routePathExact: false,
routeComp: MarketplaceView,
icon: ({ selected, ...otherProps }) =>
Expand All@@ -369,6 +381,19 @@ export default function ApplicationHome() {
),
visible: ({ user }) => user.orgDev,
},
{
text: <TabLabel>{`${trans("home.marketplace")} (Lowcoder)`}</TabLabel>,
routePath: MARKETPLACE_URL_BY_TYPE('lowcoder'),
routePathExact: false,
routeComp: MarketplaceView,
icon: ({ selected, ...otherProps }) =>
selected ? (
<LowcoderMarketplaceActiveIcon {...otherProps} />
) : (
<LowcoderMarketplaceIcon {...otherProps} />
),
visible: ({ user }) => user.orgDev && isSelfHost,
},
{
text: <TabLabel>{trans("home.trash")}</TabLabel>,
routePath: TRASH_URL,
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp