@evenicanpm/admin-integrate 2.0.0 → 2.0.1

package/src/components/templatesV2/inputs/utils/arrangeInputs.ts

@@ -12,8 +12,9 @@ export function arrangeInputs(inputs: ProcessTemplateInput[]): InputRow[] {
 	const isTableOrHidden = (inp: ProcessTemplateInput) =>
 		inp.inputType === InputType.INPUT_TABLE || isHiddenInputType(inp.inputType);
 
-	const isPairable = (inp?: ProcessTemplateInput) =>
-		!!inp && !isTableOrHidden(inp);
+	const isPairable = (
+		inp: ProcessTemplateInput | undefined,
+	): inp is ProcessTemplateInput => !!inp && !isTableOrHidden(inp);
 
 	const areConsecutiveSorts = (
 		a?: ProcessTemplateInput,
@@ -39,7 +40,7 @@ export function arrangeInputs(inputs: ProcessTemplateInput[]): InputRow[] {
 
 		const next = ordered[i + 1];
 		if (isPairable(next) && areConsecutiveSorts(curr, next)) {
-			rows.push({ type: "pair", items: [curr, next!] });
+			rows.push({ type: "pair", items: [curr, next] });
 			i += 2;
 		} else {
 			rows.push({ type: "full", item: curr });

package/src/components/templatesV2/pageForm.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { Formik } from "formik";
+import { Formik, type FormikProps } from "formik";
 import React, { useEffect } from "react";
 import { FormikPageBody } from "./inputs";
 import type { FlatPage, FormState } from "./types";
@@ -51,7 +51,7 @@ export default function PageForm({
 	const pageKeys = React.useMemo(
 		() =>
 			(page.inputs ?? []).map(
-				(inp) => templateId + "::" + (inp?.fieldName ?? ""),
+				(inp) => `${templateId}::${inp?.fieldName ?? ""}`,
 			),
 		[page.inputs, templateId],
 	);
@@ -59,7 +59,7 @@ export default function PageForm({
 
 	const stepKey = `${templateId}:${page._flatIndex ?? ""}`;
 
-	const formikRef = React.useRef<any>(null);
+	const formikRef = React.useRef<FormikProps<FormState> | null>(null);
 
 	const submit = React.useCallback(async () => {
 		const formikHelpers = formikRef.current;
@@ -69,11 +69,13 @@ export default function PageForm({
 		const hasErrors = pageKeys.some(
 			(k) =>
 				Boolean(errors[k]) ||
-				errorKeys.some((ek) => ek === k || ek.startsWith(k + ".")),
+				errorKeys.some((ek) => ek === k || ek.startsWith(`${k}.`)),
 		);
 		if (hasErrors) {
 			const touched: Record<string, boolean> = {};
-			pageKeys.forEach((k) => (touched[k] = true));
+			pageKeys.forEach((k) => {
+				touched[k] = true;
+			});
 			formikHelpers.setTouched(touched);
 			return false;
 		}
@@ -94,7 +96,7 @@ export default function PageForm({
 			onSubmit={(values) => {
 				// Only pass the keys for this page back to the parent.
 				const pageKeys = (page.inputs ?? []).map(
-					(inp) => templateId + "::" + (inp?.fieldName ?? ""),
+					(inp) => `${templateId}::${inp?.fieldName ?? ""}`,
 				);
 				const filtered: FormState = {};
 				for (const k of pageKeys) {
@@ -103,7 +105,7 @@ export default function PageForm({
 						values !== null &&
 						Object.hasOwn(values as object, k)
 					) {
-						filtered[k] = (values as Record<string, any>)[k];
+						filtered[k] = (values as FormState)[k];
 					}
 				}
 				onPageSubmit(filtered);

package/src/components/templatesV2/validation/buildZodSchema.ts

@@ -108,10 +108,6 @@ function buildFieldSchema(
 		case InputType.MULTI_TEXT_SEARCH:
 			schema = z.union([z.array(z.string()), z.undefined(), z.null()]);
 			break;
-		case InputType.TEXT:
-		case InputType.SELECTOR:
-		case InputType.TEXT_UNIQUE_IDENTIFIER:
-		case InputType.TEXT_SEARCH:
 		default:
 			schema = z.union([z.string(), z.undefined(), z.null()]);
 			break;

package/src/components/templatesV2/wizard.tsx

@@ -198,17 +198,19 @@ function buildProcessConfigMerge(
 	return { input: { config } };
 }
 
-export function removeTemplateConfig(input: any): any {
+export function removeTemplateConfig(input: unknown): unknown {
 	if (Array.isArray(input)) {
 		return input.map(removeTemplateConfig);
 	}
 	if (input == null || typeof input !== "object") {
 		return input;
 	}
-	const newObj: any = {};
+	const newObj: Record<string, unknown> = {};
 	for (const key in input) {
 		if (key !== "templateConfig") {
-			newObj[key] = removeTemplateConfig(input[key]);
+			newObj[key] = removeTemplateConfig(
+				(input as Record<string, unknown>)[key],
+			);
 		}
 	}
 	return newObj;

package/src/pages/dashboard/dashboard-link-cards.tsx

@@ -9,7 +9,6 @@ import {
 // MUI
 import { Box, Grid2 as Grid, type Theme, useTheme } from "@mui/material";
 import { useTranslations } from "next-intl";
-import React from "react";
 
 const breakpoints = {
 	xs: 6,

package/src/pages/dashboard/dashboard-list-sections.tsx

@@ -11,7 +11,7 @@ import SnackbarAlert, {
 import { getProcessExecutions } from "@evenicanpm/admin-integrate/api/dashboard/queries";
 import DashboardList from "@evenicanpm/admin-integrate/components/dashboard-list";
 import { useTranslations } from "next-intl";
-import React, { useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 
 const defaultInput: ProcessExecutionInput = {
 	sort: "startDate",

package/src/pages/dashboard/dashboard.tsx

@@ -1,7 +1,6 @@
 // Local page components
 import DashboardLinkCards from "@evenicanpm/admin-integrate/pages/dashboard/dashboard-link-cards";
 import DashboardListSections from "@evenicanpm/admin-integrate/pages/dashboard/dashboard-list-sections";
-import React from "react";
 
 export default function IntegrateDashboard() {
 	return (

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

@@ -6,7 +6,6 @@ import { TableHeader } from "@evenicanpm/admin-integrate/components/data-table";
 import type { Head } from "@evenicanpm/admin-integrate/components/data-table/table-header";
 // MUI
 import { type SxProps, Table, TableBody, TableContainer } from "@mui/material";
-import React from "react";
 import type { Item } from "./executions-list";
 
 // Local components

package/src/pages/executions/executions.tsx

@@ -15,7 +15,7 @@ import type { Head } from "@evenicanpm/admin-integrate/components/data-table/tab
 // MUI
 import { Box } from "@mui/material";
 import { useTranslations } from "next-intl";
-import React, { useState } from "react";
+import { useState } from "react";
 // Local components
 import ExecutionsList from "./executions-list";
 

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

@@ -1,5 +1,6 @@
 import type {
 	ConfigExport,
+	ConfigImport,
 	ConfigurationMergeMutationVariables,
 } from "@evenicanpm/admin-core/api/e4/graphqlRequestSdk";
 import {
@@ -11,13 +12,14 @@ import {
 	IntegrateBreadcrumbs,
 } from "@evenicanpm/admin-integrate/components/breadcrumbs";
 import { IntegrationDetailsHeader } from "@evenicanpm/admin-integrate/components/header";
+import type { ProcessConfigMerge } from "@evenicanpm/admin-integrate/components/templatesV2/types";
 import { removeTemplateConfig } from "@evenicanpm/admin-integrate/components/templatesV2/wizard";
 import { slugify } from "@evenicanpm/admin-integrate/utils/slugify";
 import { Clear, SaveOutlined } from "@mui/icons-material";
 import { Box, Button, type Theme, useTheme } from "@mui/material";
 import { usePathname, useRouter, useSearchParams } from "next/navigation";
 import { useTranslations } from "next-intl";
-import { useEffect, useState } from "react";
+import { type SetStateAction, useEffect, useState } from "react";
 import { INTEGRATION_CREATE_STEPS } from "./integration-create-steps";
 import PreCreationStep from "./pre-creation-step";
 import SelectStep from "./select-step";
@@ -53,7 +55,7 @@ export default function IntegrationCreate() {
 
 	const [name, setName] = useState<string>("");
 	const [step, setStep] = useState<number>(INTEGRATION_CREATE_STEPS.select);
-	const [processConfig, setProcessConfig] = useState<any | null>(null);
+	const [processConfig, setProcessConfig] = useState<ConfigExport | null>(null);
 	const [dualSourceThenTarget, setDualSourceThenTarget] = useState(false);
 
 	useEffect(() => {
@@ -80,7 +82,10 @@ export default function IntegrationCreate() {
 		}
 	};
 
-	const handleProcessConfigMerge = (configMergeInput: any) => {
+	const handleProcessConfigMerge = (
+		configMergeInput: SetStateAction<ProcessConfigMerge | null>,
+	) => {
+		if (!configMergeInput || typeof configMergeInput === "function") return;
 		const newProcessConfigMerge = { ...configMergeInput };
 		const code = slugify(name);
 		for (const c of newProcessConfigMerge.input.config) {
@@ -91,12 +96,12 @@ export default function IntegrationCreate() {
 		console.log("configMergeInput", configMergeInput);
 
 		const sourceName = configMergeInput?.input?.config?.find(
-			(item: any) => (item?.source as string)?.toLowerCase() === "source",
+			(item) => (item?.source as string)?.toLowerCase() === "source",
 		)?.uniqueIdentifier;
 
 		if (sourceName) {
-			configMergeInput.input.config = configMergeInput.input!.config!.map(
-				(item: any) => {
+			configMergeInput.input.config = configMergeInput.input.config.map(
+				(item) => {
 					if (item?.queues) {
 						return {
 							...item,
@@ -118,10 +123,7 @@ export default function IntegrationCreate() {
 			{
 				onSuccess: ({ configurationMerge }) => {
 					console.log("configurationMerge", configurationMerge);
-					setProcessConfig({
-						...configurationMerge,
-						CreateIntegrationProc: true,
-					});
+					setProcessConfig(configurationMerge ?? null);
 				},
 				onError: (error) => {
 					console.error("Update failed:", error);
@@ -131,9 +133,10 @@ export default function IntegrationCreate() {
 	};
 
 	const handleProcessConfigImport = () => {
+		if (!processConfig) return;
 		processConfigImportMutation.mutate(
 			{
-				config: processConfig,
+				config: processConfig as unknown as ConfigImport,
 				reRoutedFromMerge: true,
 			},
 			{
@@ -150,11 +153,14 @@ export default function IntegrationCreate() {
 	useEffect(() => {
 		// Case when name of process is edited after config merge has been called (ie on pre-creation step), when sending config to import.
 		// If name is changed during wizard step, name is already updated in payload to config merge.
-		if (processConfig?.Processes) {
+		if (processConfig?.Processes?.[0]) {
 			const newConfig = { ...processConfig };
 			const code = slugify(name);
-			newConfig.Processes[0].Name = name;
-			newConfig.Processes[0].Process = code;
+			const firstProcess = newConfig.Processes?.[0];
+			if (firstProcess) {
+				firstProcess.Name = name;
+				firstProcess.Process = code;
+			}
 		}
 	}, [name]);
 

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

@@ -2,7 +2,7 @@ import { Box, useTheme } from "@mui/material";
 import { useReducer } from "react";
 import type {
 	ConfigExport,
-	EndpointExport,
+	ProcessTask,
 } from "../../../../admin-core/src/api/e4/graphqlRequestSdk";
 import { IntegrationView } from "../../components/integration-view";
 import {
@@ -13,7 +13,7 @@ import {
 } from "../integration-details/task-drawer/task-reducer";
 
 interface Props {
-	processConfig: any | null;
+	processConfig: ConfigExport | null;
 }
 
 export default function PreCreationStep(props: Readonly<Props>) {
@@ -44,20 +44,20 @@ export default function PreCreationStep(props: Readonly<Props>) {
 				canEdit={false}
 				//key={viewRefreshKey}
 				//data={(data as GetProcessByIdQuery)?.processById as Process}
-				config={props.processConfig as ConfigExport}
+				config={props.processConfig ?? undefined}
 				variant="process"
 				drawerOpen={false}
 				processTaskId={undefined}
-				onTaskClick={(processTask: any) => {
-					const endpoint = props.processConfig?.Endpoints.find(
-						(ep: EndpointExport) => ep.Name === processTask.endpoint,
+				onTaskClick={(processTask: ProcessTask) => {
+					const endpoint = (props.processConfig?.Endpoints ?? []).find(
+						(ep) => ep?.Name === processTask.endpoint,
 					);
 
-					let templateConfig: any;
+					let templateConfig: string | undefined;
 
-					if (typeof endpoint.TemplateConfig === "string") {
+					if (typeof endpoint?.TemplateConfig === "string") {
 						templateConfig = endpoint.TemplateConfig;
-					} else if (typeof endpoint.TemplateConfig === "object") {
+					} else if (typeof endpoint?.TemplateConfig === "object") {
 						templateConfig = JSON.stringify(endpoint.TemplateConfig);
 					}
 

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

@@ -185,9 +185,7 @@ export default function CopyTasksList(props: Readonly<Props>) {
 													toggleChecked={toggleChecked}
 													alert={props.importState.alert}
 												/>
-											) : (
-												<></>
-											),
+											) : null,
 										)}
 									</TableBody>
 								</Table>

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

@@ -434,7 +434,7 @@ export default function IntegrationDetails() {
 					onClose={() => dispatchTaskState({ type: TaskActionType.CLOSE })}
 					anchor="right"
 					taskState={taskState}
-					renderKey={taskState.processTaskId}
+					renderKey={taskState.processTaskId ?? 0}
 					dispatch={dispatchTaskState}
 					handleUpdateConfig={handleUpdateConfig}
 					config={config ?? (configFromApi as any)?.configurationExport}

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

@@ -31,7 +31,7 @@ interface Props {
 	dispatch: React.Dispatch<TaskAction>;
 	handleUpdateConfig: (newConfig: ConfigExport) => void;
 	editable?: boolean;
-	templateConfigInput?: any | null;
+	templateConfigInput?: unknown | null;
 }
 
 export default function EditTask(props: Readonly<Props>) {
@@ -136,7 +136,7 @@ export default function EditTask(props: Readonly<Props>) {
 									.parallelProcessingGroup as number,
 								sort: props.taskState.sort as number,
 								processTaskId: props?.taskState?.processTaskId
-									? Number.parseInt(props.taskState.processTaskId)
+									? Number.parseInt(props.taskState.processTaskId, 10)
 									: null,
 							} as Metadata
 						}

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

@@ -24,10 +24,10 @@ import {
 
 interface Props extends DrawerProps {
 	taskState: TaskState;
-	renderKey: any;
+	renderKey: string | number;
 	dispatch: React.Dispatch<TaskAction>;
 	handleUpdateConfig?: (newConfig: ConfigExport) => void;
-	templateConfigInput?: any | null;
+	templateConfigInput?: unknown;
 	config: ConfigExport;
 }