Skip to content
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

Jump to bottom

chore: Plugin Action Editor routing #37389

Merged
merged 2 commits into from
Nov 14, 2024
Merged

chore: Plugin Action Editor routing #37389

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b52487
chore: Plugin Action Editor routing
hetunandu Nov 14, 2024
3a7fda7
removed ee files
hetunandu Nov 14, 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
105 changes: 85 additions & 20 deletions app/client/src/ce/pages/Editor/IDE/EditorPane/Query/hooks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,16 @@ export const useQueryAdd = () => {
return;
}

let url = "";
const url = getQueryUrl(currentEntityInfo);

url = getQueryUrl(currentEntityInfo);
history.push(url);
}, [currentEntityInfo]);
}, [currentEntityInfo, dispatch, ideViewMode]);

const closeAddQuery = useCallback(() => {
let url = "";
const url = getQueryUrl(currentEntityInfo, false);

url = getQueryUrl(currentEntityInfo, false);
history.push(url);
}, [currentEntityInfo, ideViewMode]);
}, [currentEntityInfo]);

return { openAddQuery, closeAddQuery };
};
Expand Down Expand Up @@ -113,6 +111,15 @@ export const useGroupedAddQueryOperations = (): GroupedAddOperations => {
return groups;
};

const PluginActionEditor = lazy(async () =>
retryPromise(
async () =>
import(
/* webpackChunkName: "PluginActionEditor" */ "pages/Editor/AppPluginActionEditor"
),
),
);

const ApiEditor = lazy(async () =>
retryPromise(
async () =>
Expand Down Expand Up @@ -145,13 +152,65 @@ const QueryEmpty = lazy(async () =>
);

export const useQueryEditorRoutes = (path: string): UseRoutes => {
return useMemo(
const isActionRedesignEnabled = useFeatureFlag(
FEATURE_FLAG.release_actions_redesign_enabled,
);

const skeleton = useMemo(() => <Skeleton />, []);

const newComponents = useMemo(
() => [
{
key: "PluginActionEditor",
component: () => {
return (
<Suspense fallback={skeleton}>
<PluginActionEditor />
</Suspense>
);
},
path: [
BUILDER_PATH + API_EDITOR_ID_PATH,
BUILDER_CUSTOM_PATH + API_EDITOR_ID_PATH,
BUILDER_PATH_DEPRECATED + API_EDITOR_ID_PATH,
BUILDER_PATH + SAAS_EDITOR_API_ID_PATH,
BUILDER_CUSTOM_PATH + SAAS_EDITOR_API_ID_PATH,
BUILDER_PATH_DEPRECATED + SAAS_EDITOR_API_ID_PATH,
path + "/:baseQueryId",
],
exact: true,
},
{
key: "AddQuery",
exact: true,
component: () => (
<Suspense fallback={skeleton}>
<AddQuery />
</Suspense>
),
path: [`${path}${ADD_PATH}`, `${path}/:baseQueryId${ADD_PATH}`],
},
{
key: "QueryEmpty",
component: () => (
<Suspense fallback={skeleton}>
<QueryEmpty />
</Suspense>
),
exact: true,
path: [path],
},
],
[path, skeleton],
);

const oldComponents = useMemo(
() => [
{
key: "ApiEditor",
component: (args) => {
component: (args: object) => {
return (
<Suspense fallback={<Skeleton />}>
<Suspense fallback={skeleton}>
<ApiEditor {...args} />
</Suspense>
);
Expand All @@ -166,18 +225,18 @@ export const useQueryEditorRoutes = (path: string): UseRoutes => {
{
key: "AddQuery",
exact: true,
component: (args) => (
<Suspense fallback={<Skeleton />}>
<AddQuery {...args} />
component: () => (
<Suspense fallback={skeleton}>
<AddQuery />
</Suspense>
),
path: [`${path}${ADD_PATH}`, `${path}/:baseQueryId${ADD_PATH}`],
},
{
key: "SAASEditor",
component: (args) => {
component: (args: object) => {
return (
<Suspense fallback={<Skeleton />}>
<Suspense fallback={skeleton}>
<QueryEditor {...args} />
</Suspense>
);
Expand All @@ -191,9 +250,9 @@ export const useQueryEditorRoutes = (path: string): UseRoutes => {
},
{
key: "QueryEditor",
component: (args) => {
component: (args: object) => {
return (
<Suspense fallback={<Skeleton />}>
<Suspense fallback={skeleton}>
<QueryEditor {...args} />
</Suspense>
);
Expand All @@ -203,17 +262,23 @@ export const useQueryEditorRoutes = (path: string): UseRoutes => {
},
{
key: "QueryEmpty",
component: (args) => (
<Suspense fallback={<Skeleton />}>
<QueryEmpty {...args} />
component: () => (
<Suspense fallback={skeleton}>
<QueryEmpty />
</Suspense>
),
exact: true,
path: [path],
},
],
[path],
[path, skeleton],
);

if (isActionRedesignEnabled) {
return newComponents;
}

return oldComponents;
};

export const useAddQueryListItems = () => {
Expand Down
3 changes: 0 additions & 3 deletions app/client/src/ee/pages/Editor/AppPluginActionEditor/AppPluginActionEditor.tsx
View file
Open in desktop

This file was deleted.

Empty file added app/client/src/ee/pages/Editor/PackageEditor/PackageIDE/MainPane/useRoutes.ts
View file
Open in desktop
Empty file.
Empty file added app/client/src/ee/pages/Editor/WorkflowEditor/WorkflowIDE/MainPane/useRoutes.ts
View file
Open in desktop
Empty file.
9 changes: 0 additions & 9 deletions app/client/src/pages/Editor/APIEditor/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ import { resolveIcon } from "../utils";
import { ENTITY_ICON_SIZE, EntityIcon } from "../Explorer/ExplorerIcons";
import { getIDEViewMode } from "selectors/ideSelectors";
import { EditorViewMode } from "ee/entities/IDE/constants";
import { AppPluginActionEditor } from "pages/Editor/AppPluginActionEditor";

type ApiEditorWrapperProps = RouteComponentProps<APIEditorRouteParams>;

Expand Down Expand Up @@ -164,14 +163,6 @@ function ApiEditorWrapper(props: ApiEditorWrapperProps) {
return <ConvertEntityNotification icon={icon} name={action?.name || ""} />;
}, [action?.name, isConverting, icon]);

const isActionRedesignEnabled = useFeatureFlag(
FEATURE_FLAG.release_actions_redesign_enabled,
);

if (isActionRedesignEnabled) {
return <AppPluginActionEditor />;
}

return (
<ApiEditorContextProvider
actionRightPaneBackLink={actionRightPaneBackLink}
Expand Down
0 ...tor/components/AppPluginActionToolbar.tsx → ...tor/components/AppPluginActionToolbar.tsx
View file
Open in desktop
File renamed without changes.
0 ...ts/ConvertToModule/ConvertToModuleCTA.tsx → ...ts/ConvertToModule/ConvertToModuleCTA.tsx
View file
Open in desktop
File renamed without changes.
0 ...onvertToModule/ConvertToModuleCallout.tsx → ...onvertToModule/ConvertToModuleCallout.tsx
View file
Open in desktop
File renamed without changes.
0 ...nvertToModule/ConvertToModuleDisabler.tsx → ...nvertToModule/ConvertToModuleDisabler.tsx
View file
Open in desktop
File renamed without changes.
0 ...itor/components/ConvertToModule/index.tsx → ...itor/components/ConvertToModule/index.tsx
View file
Open in desktop
File renamed without changes.
0 ...ionEditor/components/ToolbarMenu/Copy.tsx → ...ionEditor/components/ToolbarMenu/Copy.tsx
View file
Open in desktop
File renamed without changes.
0 ...nEditor/components/ToolbarMenu/Delete.tsx → ...nEditor/components/ToolbarMenu/Delete.tsx
View file
Open in desktop
File renamed without changes.
0 ...ionEditor/components/ToolbarMenu/Move.tsx → ...ionEditor/components/ToolbarMenu/Move.tsx
View file
Open in desktop
File renamed without changes.
0 ...r/components/ToolbarMenu/PageMenuItem.tsx → ...r/components/ToolbarMenu/PageMenuItem.tsx
View file
Open in desktop
File renamed without changes.
0 ...nEditor/components/ToolbarMenu/Rename.tsx → ...nEditor/components/ToolbarMenu/Rename.tsx
View file
Open in desktop
File renamed without changes.
0 ...or/components/ToolbarMenu/ToolbarMenu.tsx → ...or/components/ToolbarMenu/ToolbarMenu.tsx
View file
Open in desktop
File renamed without changes.
0 ...ionEditor/components/ToolbarMenu/index.ts → ...ionEditor/components/ToolbarMenu/index.ts
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion app/client/src/pages/Editor/AppPluginActionEditor/index.ts
View file
Open in desktop

This file was deleted.

0 ...ginActionEditor/AppPluginActionEditor.tsx → ...es/Editor/AppPluginActionEditor/index.tsx
View file
Open in desktop
File renamed without changes.
9 changes: 0 additions & 9 deletions app/client/src/pages/Editor/QueryEditor/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ import { resolveIcon } from "../utils";
import { ENTITY_ICON_SIZE, EntityIcon } from "../Explorer/ExplorerIcons";
import { getIDEViewMode } from "selectors/ideSelectors";
import { EditorViewMode } from "ee/entities/IDE/constants";
import { AppPluginActionEditor } from "../AppPluginActionEditor";
import { saveActionName } from "actions/pluginActionActions";

type QueryEditorProps = RouteComponentProps<QueryEditorRouteParams>;
Expand Down Expand Up @@ -187,14 +186,6 @@ function QueryEditor(props: QueryEditorProps) {
);
}, [action?.name, isConverting, icon]);

const isActionRedesignEnabled = useFeatureFlag(
FEATURE_FLAG.release_actions_redesign_enabled,
);

if (isActionRedesignEnabled) {
return <AppPluginActionEditor />;
}

return (
<QueryEditorContextProvider
actionRightPaneBackLink={actionRightPaneBackLink}
Expand Down
Loading