@evenicanpm/admin-integrate 2.4.2 → 2.5.0

package/src/pages/executions/executions-list/executions-list.tsx

@@ -104,7 +104,7 @@ const ExecutionsList: React.FC<Props> = (props: Props) => {
 			),
 		});
 		setFetched(false);
-		setPerPage(itemsPerPage as number);
+		setPerPage(itemsPerPage || 10);
 		setPage(1);
 	};
 

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

@@ -1,11 +1,10 @@
 import type {
 	ConfigExport,
 	ConfigImport,
-	ConfigurationMergeMutationVariables,
 } from "@evenicanpm/admin-core/api/e4/graphqlRequestSdk";
 import {
-	processConfigImport,
-	processConfigMerge,
+	useProcessConfigImport,
+	useProcessConfigMerge,
 } from "@evenicanpm/admin-integrate/api/process-config/mutation";
 import {
 	type Crumb,
@@ -36,8 +35,8 @@ export default function IntegrationCreate() {
 	const router = useRouter();
 	const searchParams = useSearchParams();
 	const pathname = usePathname();
-	const processConfigMergeMutation = processConfigMerge();
-	const processConfigImportMutation = processConfigImport();
+	const processConfigMergeMutation = useProcessConfigMerge();
+	const processConfigImportMutation = useProcessConfigImport();
 
 	const breadcrumbs: Crumb[] = [
 		{
@@ -116,9 +115,7 @@ export default function IntegrationCreate() {
 
 		processConfigMergeMutation.mutate(
 			{
-				input:
-					removeTemplateConfig(newProcessConfigMerge?.input) ||
-					({} as ConfigurationMergeMutationVariables),
+				input: removeTemplateConfig(newProcessConfigMerge?.input) || {},
 			},
 			{
 				onSuccess: ({ configurationMerge }) => {

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

@@ -17,12 +17,11 @@ export enum DirectionType {
 
 interface Props {
 	listStepTitle?: string;
-	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?: Readonly<Props>) {
 	const t = useTranslations("Integrate.Templates");
 
 	const router = useRouter();

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

@@ -19,7 +19,7 @@ interface Props {
 	onSourceAndTarget?: () => void;
 }
 
-export default function TemplateOptionsStep(props: Props) {
+export default function TemplateOptionsStep(props: Readonly<Props>) {
 	const t = useTranslations("Integrate.Templates");
 	const theme = useTheme();
 	const styles = getStyles(theme);

package/src/pages/integration-details/import-process/copy-tasks-list.tsx

@@ -3,7 +3,7 @@ import type {
 	ProcessTask,
 } from "@evenicanpm/admin-core/api/e4/graphqlRequestSdk";
 import { getQueryClient } from "@evenicanpm/admin-core/api/sdk/get-query-client";
-import { copyProcess } from "@evenicanpm/admin-integrate/api/process/mutations";
+import { useCopyProcess } from "@evenicanpm/admin-integrate/api/process/mutations";
 import { buildProcessByIdQueryKey } from "@evenicanpm/admin-integrate/api/process/queries/get-process-by-id.query";
 import {
 	TableHeader,
@@ -102,14 +102,14 @@ export default function CopyTasksList(props: Readonly<Props>) {
 		setChecked(newChecked);
 	};
 
-	const copy = copyProcess();
+	const copy = useCopyProcess();
 
 	const handleConfirm = () => {
 		if (props.data?.processById && checked) {
 			const idsToCopy: string[] = [];
 			for (const id of Object.keys(checked)) {
 				if (checked[id]) {
-					idsToCopy.push(id as string);
+					idsToCopy.push(id);
 				}
 			}
 
@@ -162,7 +162,7 @@ export default function CopyTasksList(props: Readonly<Props>) {
 			{!props.loading && props.data?.processById?.processTasks && (
 				<Box>
 					<Typography sx={styles.name} variant="h6">
-						{props.data.processById.name as string}
+						{props.data.processById.name}
 					</Typography>
 					<Card>
 						{props.data.processById.processTasks.length > 0 && checked && (

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

@@ -24,7 +24,7 @@ import { useTranslations } from "next-intl";
 import { useEffect, useReducer, useState } from "react";
 import { configurationExport } from "../../api/configuration/queries";
 import { buildConfigurationExportQueryKey } from "../../api/configuration/queries/configuration-export.query";
-import { processConfigImport } from "../../api/process-config/mutation";
+import { useProcessConfigImport } from "../../api/process-config/mutation";
 import ImportDrawer from "./import-process/import-drawer";
 import {
 	ImportActionType,
@@ -38,64 +38,82 @@ import {
 	taskReducer,
 } from "./task-drawer/task-reducer";
 
-function mergeByKey<T>(
-	keyFields: string | string[],
-	arr1: T[] = [],
-	arr2: T[] = [],
-): T[] {
-	const keys = Array.isArray(keyFields) ? keyFields : [keyFields];
+type ItemRecord = Record<string, unknown> | null | undefined;
+
+const MERGE_EXCLUDED_PROPS = new Set(["Sort", "ParallelProcessingGroup"]);
 
-	// Build lookup maps for each key -> value => baseItem (from arr1)
+function getItemVal(item: unknown, key: string): unknown {
+	return (item as ItemRecord)?.[key];
+}
+
+function registerInLookups<T>(
+	item: T,
+	keys: string[],
+	lookupByKey: Record<string, Map<unknown, T>>,
+): void {
+	for (const key of keys) {
+		const val = getItemVal(item, key);
+		if (val !== undefined && val !== null) {
+			lookupByKey[key].set(val, item);
+		}
+	}
+}
+
+function buildLookupMaps<T>(
+	keys: string[],
+	arr: T[],
+): Record<string, Map<unknown, T>> {
 	const lookupByKey: Record<string, Map<unknown, T>> = {};
 	for (const k of keys) {
 		lookupByKey[k] = new Map();
 	}
+	for (const item of arr) {
+		registerInLookups(item, keys, lookupByKey);
+	}
+	return lookupByKey;
+}
 
-	for (const item of arr1) {
-		for (const key of keys) {
-			const val = (item as Record<string, unknown> | null | undefined)?.[key];
-			if (val !== undefined && val !== null) {
-				lookupByKey[key].set(val, item);
-			}
+function findMatchByKeys<T>(
+	item: T,
+	keys: string[],
+	lookupByKey: Record<string, Map<unknown, T>>,
+): T | undefined {
+	for (const key of keys) {
+		const val = getItemVal(item, key);
+		if (val !== undefined && val !== null) {
+			const candidate = lookupByKey[key].get(val);
+			if (candidate !== undefined) return candidate;
 		}
 	}
+	return undefined;
+}
 
-	// Use a Set to preserve insertion order and ensure uniqueness
+function mergeItemProps<T>(base: T, source: T): void {
+	const sourceRecord = source as ItemRecord;
+	for (const prop of Object.keys(sourceRecord ?? {})) {
+		if (!MERGE_EXCLUDED_PROPS.has(prop)) {
+			(base as Record<string, unknown>)[prop] = sourceRecord?.[prop];
+		}
+	}
+}
+
+function mergeByKey<T>(
+	keyFields: string | string[],
+	arr1: T[] = [],
+	arr2: T[] = [],
+): T[] {
+	const keys = Array.isArray(keyFields) ? keyFields : [keyFields];
+	const lookupByKey = buildLookupMaps(keys, arr1);
 	const resultSet = new Set<T>(arr1);
 
 	for (const item of arr2) {
-		let matchedBase: T | undefined;
-
-		// Try keys in order of priority
-		for (const key of keys) {
-			const val = (item as Record<string, unknown> | null | undefined)?.[key];
-			if (val !== undefined && val !== null) {
-				const candidate = lookupByKey[key].get(val);
-				if (candidate !== undefined) {
-					matchedBase = candidate;
-					break;
-				}
-			}
-		}
+		const matchedBase = findMatchByKeys(item, keys, lookupByKey);
 
-		if (matchedBase !== undefined) {
-			// Merge properties from item into matched base (respecting exclusions)
-			const itemRecord = item as Record<string, unknown> | null | undefined;
-			for (const prop of Object.keys(itemRecord ?? {})) {
-				if (prop !== "Sort" && prop !== "ParallelProcessingGroup") {
-					(matchedBase as Record<string, unknown>)[prop] = itemRecord?.[prop];
-				}
-			}
-		} else {
-			// No match found by any tiered key -> add as new
+		if (matchedBase === undefined) {
 			resultSet.add(item);
-			// Register the newly added item in lookups so subsequent arr2 items can match it
-			for (const key of keys) {
-				const val = (item as Record<string, unknown> | null | undefined)?.[key];
-				if (val !== undefined && val !== null) {
-					lookupByKey[key].set(val, item);
-				}
-			}
+			registerInLookups(item, keys, lookupByKey);
+		} else {
+			mergeItemProps(matchedBase, item);
 		}
 	}
 
@@ -225,7 +243,7 @@ export default function IntegrationDetails() {
 		setConfig(configData);
 	};
 
-	const processConfigImportMutation = processConfigImport();
+	const processConfigImportMutation = useProcessConfigImport();
 
 	const handleProcessConfigImport = () => {
 		if (config) {
@@ -249,11 +267,10 @@ export default function IntegrationDetails() {
 	const details = data as GetProcessByIdQuery | undefined;
 
 	useEffect(() => {
-		const typedData = details as GetProcessByIdQuery;
-		if (typedData?.processById) {
+		if (details?.processById) {
 			if (breadcrumbs.length === 2) {
 				const newCrumbs: Crumb[] = structuredClone(breadcrumbs);
-				newCrumbs.push({ name: typedData.processById.name as string });
+				newCrumbs.push({ name: details.processById.name as string });
 				setBreadcrumbs(newCrumbs);
 			}
 		}
@@ -398,7 +415,6 @@ export default function IntegrationDetails() {
 					<IntegrationView
 						canEdit
 						key={viewRefreshKey}
-						//data={(data as GetProcessByIdQuery)?.processById as Process}
 						config={
 							config ||
 							((configFromApi as ConfigurationExportQuery)

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

@@ -5,7 +5,7 @@ import type {
 	FilterQueryInput,
 	GetProcessTemplatesQuery,
 } from "@evenicanpm/admin-core/api/e4/graphqlRequestSdk";
-import { processConfigMerge } from "@evenicanpm/admin-integrate/api/process-config/mutation";
+import { useProcessConfigMerge } from "@evenicanpm/admin-integrate/api/process-config/mutation";
 import { getProcessTemplates } from "@evenicanpm/admin-integrate/api/templates/queries";
 import type { Head } from "@evenicanpm/admin-integrate/components/data-table/table-header";
 import { Wizard } from "@evenicanpm/admin-integrate/components/templatesV2";
@@ -37,7 +37,7 @@ export default function AddTask(props: Readonly<Props>) {
 	const t = useTranslations("Integrate");
 	const theme = useTheme();
 
-	const processConfigMergeMutation = processConfigMerge();
+	const processConfigMergeMutation = useProcessConfigMerge();
 
 	const heading: Head[] = [
 		{
@@ -55,13 +55,13 @@ export default function AddTask(props: Readonly<Props>) {
 		},
 	];
 
-	const [processConfigMergeInput, setProcessConfigMergeInput] =
+	const [useProcessConfigMergeInput, setProcessConfigMergeInput] =
 		useState<ProcessConfigMerge | null>(null);
 
 	useEffect(() => {
-		if (processConfigMergeInput) {
+		if (useProcessConfigMergeInput) {
 			const input =
-				removeTemplateConfig(processConfigMergeInput?.input) ||
+				removeTemplateConfig(useProcessConfigMergeInput?.input) ||
 				({} as ConfigurationMergeMutationVariables);
 			processConfigMergeMutation.mutate(
 				{
@@ -90,7 +90,7 @@ export default function AddTask(props: Readonly<Props>) {
 				},
 			);
 		}
-	}, [processConfigMergeInput]);
+	}, [useProcessConfigMergeInput]);
 
 	const [processTemplateId, setProcessTemplateId] = useState<string | null>(
 		null,
@@ -163,7 +163,7 @@ export default function AddTask(props: Readonly<Props>) {
 				/>
 			)}
 			{props.taskState.step === 2 && (
-				<Typography>{JSON.stringify(processConfigMerge)}</Typography>
+				<Typography>{JSON.stringify(useProcessConfigMerge)}</Typography>
 			)}
 		</>
 	);

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

@@ -3,7 +3,7 @@ import type {
 	ConfigurationMergeMutation,
 	ConfigurationMergeMutationVariables,
 } from "@evenicanpm/admin-core/api/e4/graphqlRequestSdk";
-import { processConfigMerge } from "@evenicanpm/admin-integrate/api/process-config/mutation";
+import { useProcessConfigMerge } from "@evenicanpm/admin-integrate/api/process-config/mutation";
 import { TitleEdit } from "@evenicanpm/admin-integrate/components/core";
 import { Wizard } from "@evenicanpm/admin-integrate/components/templatesV2";
 import type {
@@ -31,15 +31,15 @@ interface Props {
 	dispatch: React.Dispatch<TaskAction>;
 	handleUpdateConfig: (newConfig: ConfigExport) => void;
 	editable?: boolean;
-	templateConfigInput?: unknown | null;
+	templateConfigInput?: unknown;
 }
 
 export default function EditTask(props: Readonly<Props>) {
 	const theme = useTheme();
 
-	const processConfigMergeMutation = processConfigMerge();
+	const processConfigMergeMutation = useProcessConfigMerge();
 
-	const [processConfigMergeInput, setProcessConfigMergeInput] =
+	const [useProcessConfigMergeInput, setProcessConfigMergeInput] =
 		useState<ProcessConfigMerge | null>(null);
 
 	const handleFinish = () => {
@@ -51,7 +51,7 @@ export default function EditTask(props: Readonly<Props>) {
 		props.dispatch(action);
 	};
 
-	const [_name, setName] = useState<string>("");
+	const [, setName] = useState<string>("");
 	const [sharedCount, setSharedCount] = useState<number>();
 
 	const handleNameEdit = (input: string) => {
@@ -62,9 +62,9 @@ export default function EditTask(props: Readonly<Props>) {
 	};
 
 	useEffect(() => {
-		if (processConfigMergeInput) {
+		if (useProcessConfigMergeInput) {
 			const input =
-				removeTemplateConfig(processConfigMergeInput?.input) ||
+				removeTemplateConfig(useProcessConfigMergeInput?.input) ||
 				({} as ConfigurationMergeMutationVariables);
 			processConfigMergeMutation.mutate(
 				{
@@ -80,7 +80,7 @@ export default function EditTask(props: Readonly<Props>) {
 				},
 			);
 		}
-	}, [processConfigMergeInput]);
+	}, [useProcessConfigMergeInput]);
 
 	return (
 		<>
@@ -153,7 +153,7 @@ export default function EditTask(props: Readonly<Props>) {
 					/>
 				)}
 			{props.taskState.step === 1 && (
-				// <Typography>{JSON.stringify(processConfigMergeInput)}</Typography>
+				// <Typography>{JSON.stringify(useProcessConfigMergeInput)}</Typography>
 				<CircularProgress sx={{ margin: theme.spacing(10, 0) }} />
 			)}
 		</>

package/src/pages/scheduler/schedules-list/schedules-list-row.tsx

@@ -52,7 +52,7 @@ const SchedulesListRow: React.FC<Props> = (props: Props) => {
 		null,
 	);
 	const modifiedOpen = Boolean(modifiedAnchorEl);
-	const [startDateAnchorEl, setStartDateAnchorlEl] =
+	const [startDateAnchorEl, setStartDateAnchorEl] =
 		useState<HTMLElement | null>(null);
 	const startDateOpen = Boolean(startDateAnchorEl);
 
@@ -61,13 +61,13 @@ const SchedulesListRow: React.FC<Props> = (props: Props) => {
 		if (classList.contains("scheduled-process-modified")) {
 			setModifiedAnchorEl(event.currentTarget);
 		} else if (classList.contains("scheduled-process-start-date")) {
-			setStartDateAnchorlEl(event.currentTarget);
+			setStartDateAnchorEl(event.currentTarget);
 		}
 	};
 
 	const handlePopoverClose = () => {
 		setModifiedAnchorEl(null);
-		setStartDateAnchorlEl(null);
+		setStartDateAnchorEl(null);
 	};
 
 	const handleMenuOpen = () => {

package/src/components/integration-view/types.ts

@@ -1,14 +0,0 @@
-/*
-type ElkOptions = {};
-
-type ElkPosition = {};
-
-interface ElkItem {
-	id: string;
-	type: "input";
-	data: { label: string };
-	x: number;
-	y: number;
-	layoutOptions: ElkOptions;
-}
-*/