@evenicanpm/admin-integrate 2.3.1 → 2.4.0

package/src/pages/integration-create/integration-create.tsx

@@ -1,8 +1,7 @@
 import type {
 	ConfigExport,
 	ConfigImport,
-	ConfigMerge,
-	InputMaybe,
+	ConfigurationMergeMutationVariables,
 } from "@evenicanpm/admin-core/api/e4/graphqlRequestSdk";
 import {
 	processConfigImport,
@@ -27,7 +26,6 @@ import SelectStep from "./select-step";
 import TemplateListStep, { DirectionType } from "./template-list-step";
 import TemplateOptionsStep from "./template-options-step";
 import WizardStep from "./wizard-step";
-import { TemplateOption } from "./template-options-step";
 
 export default function IntegrationCreate() {
 	const t = useTranslations("Integrate");
@@ -61,17 +59,7 @@ export default function IntegrationCreate() {
 	const [dualSourceThenTarget, setDualSourceThenTarget] = useState(false);
 
 	useEffect(() => {
-		const templateOption = searchParams.get("option");
-
-		if (
-			(templateOption === TemplateOption.Source &&
-				searchParams.get(DirectionType.Incoming)) ||
-			(templateOption === TemplateOption.Target &&
-				searchParams.get(DirectionType.Outgoing)) ||
-			(templateOption === TemplateOption.SourceAndTarget &&
-				searchParams.get(DirectionType.Incoming) &&
-				searchParams.get(DirectionType.Outgoing))
-		) {
+		if (searchParams.get("group")) {
 			setStep(INTEGRATION_CREATE_STEPS.wizard);
 		}
 	}, [searchParams]);
@@ -105,31 +93,32 @@ export default function IntegrationCreate() {
 			c.code = code;
 		}
 
-		const templateOption = searchParams.get("option");
-
-		let sourceConfig: InputMaybe<ConfigMerge> | undefined = null;
-		let targetConfig: InputMaybe<ConfigMerge> | undefined = null;
-		let targetSourcesConfig: InputMaybe<ConfigMerge> | undefined = null;
+		console.log("configMergeInput", configMergeInput);
 
-		const mergedInput = removeTemplateConfig(newProcessConfigMerge?.input) as
-			| { config: Array<Record<string, unknown>> }
-			| undefined;
+		const sourceName = configMergeInput?.input?.config?.find(
+			(item) => (item?.source as string)?.toLowerCase() === "source",
+		)?.uniqueIdentifier;
 
-		if (templateOption === TemplateOption.SourceAndTarget) {
-			sourceConfig = (mergedInput?.config?.[0] ?? null) as ConfigMerge | null;
-			targetConfig = (mergedInput?.config?.[1] ?? null) as ConfigMerge | null;
-		} else if (templateOption === TemplateOption.Source) {
-			sourceConfig = (mergedInput?.config?.[0] ?? null) as ConfigMerge | null;
-		} else if (templateOption === TemplateOption.Target) {
-			targetSourcesConfig = (mergedInput?.config?.[0] ??
-				null) as ConfigMerge | null;
-			targetConfig = (mergedInput?.config?.[1] ?? null) as ConfigMerge | null;
+		if (sourceName) {
+			configMergeInput.input.config = configMergeInput.input.config.map(
+				(item) => {
+					if (item?.queues) {
+						return {
+							...item,
+							queues: `${sourceName}_endpoint`,
+						};
+					} else {
+						return item;
+					}
+				},
+			);
 		}
 
 		processConfigMergeMutation.mutate(
 			{
-				// eslint-disable-next-line @typescript-eslint/no-explicit-any
-				input: { sourceConfig, targetConfig, targetSourcesConfig } as any,
+				input:
+					removeTemplateConfig(newProcessConfigMerge?.input) ||
+					({} as ConfigurationMergeMutationVariables),
 			},
 			{
 				onSuccess: ({ configurationMerge }) => {
@@ -247,20 +236,23 @@ export default function IntegrationCreate() {
 				<TemplateListStep
 					listStepTitle={t("Templates.SelectSource")}
 					directionType={DirectionType.Incoming}
-					onSelectTemplate={() => {
-						if (dualSourceThenTarget)
-							setStep(INTEGRATION_CREATE_STEPS.targetTemplateList);
-						//else setStep(INTEGRATION_CREATE_STEPS.wizard)
-					}}
+					onSelectTemplate={
+						dualSourceThenTarget
+							? (id) => {
+									const p = new URLSearchParams(searchParams.toString());
+									p.set(`${t("Templates.sourceGroup")}`, id);
+									p.delete(`${t("Templates.group")}`);
+									router.replace(`${pathname}?${p}`);
+									setStep(INTEGRATION_CREATE_STEPS.targetTemplateList);
+								}
+							: undefined
+					}
 				/>
 			)}
 			{step === INTEGRATION_CREATE_STEPS.targetTemplateList && (
 				<TemplateListStep
 					listStepTitle={t("Templates.SelectTarget")}
 					directionType={DirectionType.Outgoing}
-					// onSelectTemplate={
-					// 	()=>setStep(INTEGRATION_CREATE_STEPS.wizard)
-					// }
 				/>
 			)}
 			{/* </Card> */}

package/src/pages/integration-create/pre-creation-step.tsx

@@ -50,7 +50,7 @@ export default function PreCreationStep(props: Readonly<Props>) {
 				processTaskId={undefined}
 				onTaskClick={(processTask: ProcessTask) => {
 					const endpoint = (props.processConfig?.Endpoints ?? []).find(
-						(ep) => ep?.Name === processTask.endpoint,
+						(ep) => ep?.Name === processTask.endpoint?.name,
 					);
 
 					let templateConfig: string | undefined;

package/src/pages/integration-create/template-list-step.tsx

@@ -1,8 +1,8 @@
 import type {
 	FilterQueryInput,
-	GetProcessTemplatesQuery,
+	GetProcessTemplateGroupsQuery,
 } from "@evenicanpm/admin-core/api/e4/graphqlRequestSdk";
-import { getProcessTemplates } from "@evenicanpm/admin-integrate/api/templates/queries";
+import { getProcessTemplateGroups } from "@evenicanpm/admin-integrate/api/templates/queries";
 import type { Head } from "@evenicanpm/admin-integrate/components/data-table/table-header";
 import TemplatesList from "@evenicanpm/admin-integrate/components/templatesV2/templates-list";
 import { Box, Typography, useTheme } from "@mui/material";
@@ -17,12 +17,12 @@ export enum DirectionType {
 
 interface Props {
 	listStepTitle?: string;
-	directionType: DirectionType;
+	directionType?: DirectionType;
 	/** When set, skips default `group` URL handoff (e.g. source pick in dual flow). */
 	onSelectTemplate?: (id: string) => void;
 }
 
-export default function TemplateListStep(props: Props) {
+export default function TemplateListStep(props?: Props) {
 	const t = useTranslations("Integrate.Templates");
 
 	const router = useRouter();
@@ -62,15 +62,18 @@ export default function TemplateListStep(props: Props) {
 		skip: 0,
 	});
 
-	const { data, isLoading } = getProcessTemplates.useData({
+	const { data, isLoading } = getProcessTemplateGroups.useData({
 		input: input,
 	});
 
 	const handleRedirect = (id: string) => {
+		if (props?.onSelectTemplate) {
+			props.onSelectTemplate(id);
+			return;
+		}
 		const currentParams = new URLSearchParams(searchParams.toString());
-		currentParams.set(props.directionType, id);
+		currentParams.set("group", id);
 		router.replace(`${pathname}?${currentParams.toString()}`);
-		if (props?.onSelectTemplate) props.onSelectTemplate(id);
 	};
 
 	return (
@@ -86,11 +89,13 @@ export default function TemplateListStep(props: Props) {
 			</Box>
 			<TemplatesList
 				heading={heading}
-				data={data as GetProcessTemplatesQuery}
+				data={data as GetProcessTemplateGroupsQuery}
 				loading={isLoading}
+				// input={{ ...input, directionType: props?.directionType }}
 				input={input}
 				setInput={setInput}
 				handleRedirect={handleRedirect}
+				isTemplateGroupsList
 			/>
 		</Box>
 	);

package/src/pages/integration-create/template-options-step.tsx

@@ -12,13 +12,6 @@ import {
 import { useTranslations } from "next-intl";
 import type React from "react";
 import { INTEGRATION_CREATE_STEPS } from "./integration-create-steps";
-import { usePathname, useRouter, useSearchParams } from "next/navigation";
-
-export enum TemplateOption {
-	Source = "source",
-	Target = "target",
-	SourceAndTarget = "both",
-}
 
 interface Props {
 	setStep: React.Dispatch<React.SetStateAction<number>>;
@@ -31,27 +24,14 @@ export default function TemplateOptionsStep(props: Props) {
 	const theme = useTheme();
 	const styles = getStyles(theme);
 
-	const router = useRouter();
-	const pathname = usePathname();
-	const searchParams = useSearchParams();
-
-	const handleClickOption = (option: TemplateOption) => {
-		switch (option) {
-			case TemplateOption.SourceAndTarget:
-				props.onSourceAndTarget?.();
-				props.setStep(INTEGRATION_CREATE_STEPS.sourceTemplateList);
-				break;
-			case TemplateOption.Source:
-				props.setStep(INTEGRATION_CREATE_STEPS.sourceTemplateList);
-				break;
-			case TemplateOption.Target:
-				props.setStep(INTEGRATION_CREATE_STEPS.targetTemplateList);
-		}
-
-		const currentParams = new URLSearchParams(searchParams.toString());
-		currentParams.set("option", option);
-		router.replace(`${pathname}?${currentParams.toString()}`);
+	const handleClickOption1 = () => {
+		props.onSourceAndTarget?.();
+		props.setStep(INTEGRATION_CREATE_STEPS.sourceTemplateList);
 	};
+	const handleClickOption2 = () =>
+		props.setStep(INTEGRATION_CREATE_STEPS.sourceTemplateList);
+	const handleClickOption3 = () =>
+		props.setStep(INTEGRATION_CREATE_STEPS.targetTemplateList);
 
 	return (
 		<Box sx={styles.main}>
@@ -65,7 +45,7 @@ export default function TemplateOptionsStep(props: Props) {
 					<LinkCard
 						title={t("templateOption1")}
 						description={t("templateOption1Description")}
-						onClick={() => handleClickOption(TemplateOption.SourceAndTarget)}
+						onClick={handleClickOption1}
 					>
 						<Box
 							sx={{
@@ -82,7 +62,7 @@ export default function TemplateOptionsStep(props: Props) {
 					<LinkCard
 						title={t("templateOption2")}
 						description={t("templateOption2Description")}
-						onClick={() => handleClickOption(TemplateOption.Source)}
+						onClick={handleClickOption2}
 					>
 						<Box
 							sx={{
@@ -99,7 +79,7 @@ export default function TemplateOptionsStep(props: Props) {
 					<LinkCard
 						title={t("templateOption3")}
 						description={t("templateOption3Description")}
-						onClick={() => handleClickOption(TemplateOption.Target)}
+						onClick={handleClickOption3}
 					>
 						<Box
 							sx={{

package/src/pages/integration-create/wizard-step.tsx

@@ -8,8 +8,6 @@ import { Box } from "@mui/material";
 import { usePathname, useRouter, useSearchParams } from "next/navigation";
 import { INTEGRATION_CREATE_STEPS } from "./integration-create-steps";
 
-import { DirectionType } from "./template-list-step";
-
 const metadata = {
 	name: "",
 	code: "",
@@ -39,26 +37,14 @@ export default function WizardStep(props: Readonly<Props>) {
 		router.replace(pathname);
 	};
 
-	console.log(
-		"SEARHCPARAMS",
-		searchParams.get(DirectionType.Incoming)?.toString(),
-	);
-	console.log(
-		"SEARHCPARAMS",
-		searchParams.get(DirectionType.Outgoing)?.toString(),
-	);
-
 	return (
 		<Box>
 			<Wizard
 				metadata={metadata}
-				// processTemplateGroupId={}
-				sourceTemplateId={searchParams.get(DirectionType.Incoming)?.toString()}
-				targetTemplateId={searchParams.get(DirectionType.Outgoing)?.toString()}
+				processTemplateGroupId={searchParams.get("group")?.toString()}
 				handleBack={handleBack}
 				handleFinish={handleFinish}
 				setProcessConfigMerge={props.setProcessConfigMerge}
-				config={{}}
 				isCreateMode
 			/>
 		</Box>

package/src/pages/integration-details/integration-details.tsx

@@ -3,6 +3,7 @@ import type {
 	ConfigImport,
 	ConfigurationExportQuery,
 	GetProcessByIdQuery,
+	ProcessTask,
 } from "@evenicanpm/admin-core/api/e4/graphqlRequestSdk";
 import { getProcessById } from "@evenicanpm/admin-integrate/api/process/queries";
 import { buildProcessByIdQueryKey } from "@evenicanpm/admin-integrate/api/process/queries/get-process-by-id.query";
@@ -298,7 +299,7 @@ export default function IntegrationDetails() {
 			type: TaskActionType.OPEN_ADD,
 			sort: data.sort,
 			parallelProcessingGroup: data.paralellelProcessingGroup,
-		} as EditAction);
+		} as unknown as EditAction);
 	};
 
 	useEffect(() => {
@@ -404,62 +405,32 @@ export default function IntegrationDetails() {
 								.configurationExport as ConfigExport)
 						}
 						variant="process"
-						onTaskClick={(processTask: any) => {
+						onTaskClick={(processTask: ProcessTask) => {
 							const endpoint = (
 								config ??
 								(configFromApi as ConfigurationExportQuery).configurationExport
 							)?.Endpoints?.find(
-								(ep) => !!ep && ep.Name === processTask.endpoint,
+								(ep) => !!ep && ep.Name === processTask.endpoint?.name,
 							);
 
-							let filteredConfig: ConfigExport | null =
-								config ||
-								(configFromApi as ConfigurationExportQuery)?.configurationExport
-									? JSON.parse(
-											JSON.stringify(
-												config ||
-													(configFromApi as ConfigurationExportQuery)
-														?.configurationExport,
-											),
-										)
-									: null;
-
-							if (filteredConfig?.Processes?.[0]) {
-								filteredConfig.Processes[0].ProcessTasks =
-									filteredConfig.Processes[0].ProcessTasks?.filter(
-										(task) =>
-											!!task &&
-											Number.parseInt(task.ProcessTaskId ?? "") ===
-												Number.parseInt(processTask.id),
-									) || [];
-
-								filteredConfig.Endpoints =
-									filteredConfig.Endpoints?.filter(
-										(ep) => !!ep && ep.Name === processTask.endpoint,
-									) || [];
-
-								if ((filteredConfig.Endpoints?.length ?? 0) > 0 && endpoint) {
-									filteredConfig.Entities =
-										filteredConfig.Entities?.filter(
-											(entity) =>
-												!!entity &&
-												entity.Name === filteredConfig?.Endpoints?.[0]?.Entity,
-										) || [];
+							let templateConfig: string | undefined;
+
+							if (endpoint) {
+								if (typeof endpoint.TemplateConfig === "string") {
+									templateConfig = endpoint.TemplateConfig;
+								} else if (typeof endpoint.TemplateConfig === "object") {
+									templateConfig = JSON.stringify(endpoint.TemplateConfig);
 								}
 							}
 
-							console.log("filtered down Config", filteredConfig);
-
 							dispatchTaskState({
 								type: TaskActionType.OPEN_EDIT,
 								processTaskId: processTask.id,
-								//templateConfig: templateConfig,
-								config: filteredConfig,
+								templateConfig: templateConfig,
 								sort: processTask.sort,
 								parallelProcessingGroup: processTask.parallelProcessingGroup,
-								processTemplateId: processTask.processTemplateId,
+								processTemplateId: endpoint?.ProcessTemplateId,
 								name: processTask.name,
-								directionTypeId: processTask.directionTypeId,
 							} as EditAction);
 						}}
 						drawerOpen={taskState.open}

package/src/pages/integration-details/task-drawer/add-task.tsx

@@ -160,7 +160,6 @@ export default function AddTask(props: Readonly<Props>) {
 					isCreateMode
 					handleBack={handleBack}
 					handleFinish={handleNext}
-					config={{}}
 				/>
 			)}
 			{props.taskState.step === 2 && (

package/src/pages/integration-details/task-drawer/edit-task.tsx

@@ -1,6 +1,7 @@
 import type {
 	ConfigExport,
 	ConfigurationMergeMutation,
+	ConfigurationMergeMutationVariables,
 } from "@evenicanpm/admin-core/api/e4/graphqlRequestSdk";
 import { processConfigMerge } from "@evenicanpm/admin-integrate/api/process-config/mutation";
 import { TitleEdit } from "@evenicanpm/admin-integrate/components/core";
@@ -62,21 +63,12 @@ export default function EditTask(props: Readonly<Props>) {
 
 	useEffect(() => {
 		if (processConfigMergeInput) {
-			const input = (removeTemplateConfig(processConfigMergeInput?.input) ||
-				{}) as {
-				config: Array<Record<string, unknown>>;
-			};
+			const input =
+				removeTemplateConfig(processConfigMergeInput?.input) ||
+				({} as ConfigurationMergeMutationVariables);
 			processConfigMergeMutation.mutate(
 				{
-					// eslint-disable-next-line @typescript-eslint/no-explicit-any
-					input: {
-						sourceConfig:
-							props.taskState.directionTypeId === 0 ? input?.config[0] : null,
-						targetConfig:
-							props.taskState.directionTypeId === 1 ? input?.config[1] : null,
-						targetSourcesConfig:
-							props.taskState.directionTypeId === 1 ? input?.config[0] : null,
-					} as any,
+					input: input,
 				},
 				{
 					onSuccess: async (data: ConfigurationMergeMutation) => {
@@ -151,24 +143,13 @@ export default function EditTask(props: Readonly<Props>) {
 						setProcessConfigMerge={setProcessConfigMergeInput}
 						handleBack={handleBack}
 						handleFinish={handleFinish}
-						//templateConfig={props.taskState.templateConfig}
+						templateConfig={props.taskState.templateConfig}
 						processTemplateId={props.taskState.processTemplateId as string}
 						isEditMode
 						isCreateMode={false}
 						disableBackToTemplates
 						readOnly={!props.editable}
 						sharedCount={(count: number) => setSharedCount(count)}
-						sourceTemplateId={
-							(props.taskState.directionTypeId as number) == 0
-								? props.taskState.processTemplateId
-								: undefined
-						}
-						targetTemplateId={
-							(props.taskState.directionTypeId as number) == 1
-								? props.taskState.processTemplateId
-								: undefined
-						}
-						config={{ json: props.taskState.config as Record<string, unknown> }}
 					/>
 				)}
 			{props.taskState.step === 1 && (

package/src/pages/integration-details/task-drawer/task-reducer.ts

@@ -23,8 +23,6 @@ export interface EditAction extends TaskAction {
 	parallelProcessingGroup?: number;
 	processTemplateId?: string;
 	name?: string;
-	directionTypeId?: number;
-	config?: object;
 }
 
 export interface TaskState {
@@ -37,8 +35,6 @@ export interface TaskState {
 	parallelProcessingGroup?: number;
 	processTemplateId?: string;
 	name?: string;
-	directionTypeId?: number;
-	config?: object | null;
 }
 
 export function taskReducer(state: TaskState, action: TaskAction): TaskState {
@@ -73,8 +69,6 @@ export function taskReducer(state: TaskState, action: TaskAction): TaskState {
 				parallelProcessingGroup: (action as EditAction).parallelProcessingGroup,
 				processTemplateId: (action as EditAction).processTemplateId,
 				name: (action as EditAction).name,
-				directionTypeId: (action as EditAction).directionTypeId,
-				config: (action as EditAction).config,
 			};
 		}
 		case TaskActionType.INCREMENT_STEP: {

package/tsconfig.json

@@ -12,27 +12,13 @@
 		"outDir": "./dist",
 		"jsx": "preserve",
 		"baseUrl": "./",
-		"typeRoots": ["../../../../admin/node_modules/@types"],
 		"paths": {
-			"*": ["../../../../admin/node_modules/*"],
-			"@/lib/*": [
-				"../../../../admin/node_modules/@evenicanpm/admin-integrate/src/lib/*"
-			],
-			"@/auth/*": [
-				"../../../../admin/node_modules/@evenicanpm/admin-integrate/src/auth/*"
-			],
-			"@/api/*": [
-				"../../../../admin/node_modules/@evenicanpm/admin-integrate/src/api/*"
-			],
-			"@/components/*": [
-				"../../../../admin/node_modules/@evenicanpm/admin-integrate/src/components/*"
-			],
-			"@evenicanpm/admin-core/*": [
-				"../../../../admin/node_modules/@evenicanpm/admin-core/src/*"
-			],
-			"@evenicanpm/admin-integrate/*": [
-				"../../../../admin/node_modules/@evenicanpm/admin-integrate/src/*"
-			]
+			"@/lib/*": ["src/lib/*"],
+			"@/auth/*": ["src/auth/*"],
+			"@/api/*": ["src/api/*"],
+			"@/components/*": ["src/components/*"],
+			"@evenicanpm/admin-core/*": ["../admin-core/src/*"],
+			"@evenicanpm/admin-integrate/*": ["src/*"]
 		}
 	},
 	"include": ["src"]