@orchestrator-ui/orchestrator-ui-components 3.0.0 → 3.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@orchestrator-ui/orchestrator-ui-components",
-    "version": "3.0.0",
+    "version": "3.0.2",
     "license": "Apache-2.0",
     "description": "Library of UI Components used to display the workflow orchestrator frontend",
     "author": {

package/src/components/WfoForms/UserInputForm.tsx

@@ -18,6 +18,7 @@ import React, { useContext, useState } from 'react';
 
 import invariant from 'invariant';
 import { JSONSchema6 } from 'json-schema';
+import { isObject } from 'lodash';
 import cloneDeep from 'lodash/cloneDeep';
 import get from 'lodash/get';
 import { useTranslations } from 'next-intl';
@@ -393,17 +394,29 @@ function fillPreselection(form: JSONSchema6, router: NextRouter) {
         // ipvany preselect
         if (queryParams.prefix && queryParams.prefixlen) {
             if (form && form.properties.ip_prefix) {
-                const ipPrefixInput = form.properties
-                    .ip_prefix as UniformJSONSchemaProperty;
+                const ipPrefix = isObject(form.properties.ip_prefix)
+                    ? form.properties.ip_prefix
+                    : {};
+                const ipPrefixInput = {
+                    ...ipPrefix,
+                    uniforms: { prefixMin: 0 },
+                    default: {},
+                } as UniformJSONSchemaProperty;
                 if (!ipPrefixInput.uniforms) {
-                    ipPrefixInput.uniforms = {};
+                    ipPrefixInput.uniforms = { prefixMin: 0 };
                 }
                 ipPrefixInput.default = `${queryParams.prefix}/${queryParams.prefixlen}`;
                 ipPrefixInput.uniforms.prefixMin = parseInt(
-                    (queryParams.prefix_min as string) ??
-                        (queryParams.prefixlen as string),
+                    queryParams.prefixlen as string,
                     10,
                 );
+                return {
+                    ...form,
+                    properties: {
+                        ...form.properties,
+                        ip_prefix: ipPrefixInput,
+                    },
+                };
             }
         }
     }

package/src/configuration/version.ts

@@ -1 +1 @@
-export const ORCHESTRATOR_UI_LIBRARY_VERSION = '3.0.0';
+export const ORCHESTRATOR_UI_LIBRARY_VERSION = '3.0.2';

package/src/pages/processes/WfoStartProcessPage.tsx

@@ -35,9 +35,15 @@ import { FormNotCompleteResponse } from '@/types/forms';
 
 import { WfoProcessDetail } from './WfoProcessDetail';
 
+type PreselectedInput = {
+    prefix?: string;
+    prefixlen?: string;
+};
+
 type StartCreateWorkflowPayload = {
     product: string;
-};
+} & PreselectedInput;
+
 type StartModifyWorkflowPayload = {
     subscription_id: string;
 };
@@ -46,10 +52,10 @@ type StartWorkflowPayload =
     | StartCreateWorkflowPayload
     | StartModifyWorkflowPayload;
 
-interface StartProcessPageQuery {
+type StartProcessPageQuery = {
     productId?: string;
     subscriptionId?: string;
-}
+} & PreselectedInput;
 
 interface WfoStartProcessPageProps {
     processName: string;
@@ -65,15 +71,14 @@ const getInitialProcessPayload = ({
     productId,
     subscriptionId,
 }: StartProcessPageQuery): StartWorkflowPayload | undefined => {
-    if (productId) {
-        return {
-            product: productId,
-        };
-    }
     if (subscriptionId) {
         return {
             subscription_id: subscriptionId,
         };
+    } else if (productId) {
+        return {
+            product: productId,
+        };
     }
     return undefined;
 };
@@ -108,8 +113,11 @@ export const WfoStartProcessPage = ({
     const [startProcess] = useStartProcessMutation();
 
     const startProcessPayload = useMemo(
-        () => getInitialProcessPayload({ productId, subscriptionId }),
-        [productId, subscriptionId],
+        () =>
+            getInitialProcessPayload({
+                productId,
+            }),
+        [productId],
     );
 
     const { stepUserInput, hasNext } = form;

package/src/rtk/endpoints/streamMessages.ts

@@ -2,11 +2,8 @@ import { debounce } from 'lodash';
 import { getSession } from 'next-auth/react';
 
 import type { WfoSession } from '@/hooks';
-import { addToastMessage } from '@/rtk/slices/toastMessages';
 import type { RootState } from '@/rtk/store';
-import { ToastTypes } from '@/types';
 import { CacheTag, CacheTagType } from '@/types';
-import { getToastMessage } from '@/utils/getToastMessage';
 
 import { orchestratorApi } from '../api';
 
@@ -66,12 +63,6 @@ const streamMessagesApi = orchestratorApi.injectEndpoints({
                 },
             ) {
                 const cleanUp = () => {
-                    const message = getToastMessage(
-                        ToastTypes.ERROR,
-                        'Connection to the server was lost. Please click the websocket icon or refresh the page to reconnect.',
-                        'WebSocket closed',
-                    );
-                    dispatch(addToastMessage(message));
                     clearInterval(pingInterval);
                     updateCachedData(() => false);
                 };