Config/user roles parameter template, userInfo updates and refactoring

src/management-system-v2/app/(dashboard)/[environmentId]/machine-config/[configId]/aas-config-content.tsx

@@ -11,7 +11,7 @@ import { useRouter } from 'next/navigation';
 import { useCallback, useMemo, useRef, useState } from 'react';
 import { Col, Row, Space, Tag, Table, Modal } from 'antd';
 import { updateParameter } from '@/lib/data/db/machine-config';
-import { buildLinkedInputParametersFromIds } from '../configuration-helper';
+import { buildLinkedInputParametersFromIds } from '../helpers/configuration-helper';
 import AddButton from './add-button';
 import AasCreateParameterModal, {
   CreateParameterModalReturnType,

src/management-system-v2/app/(dashboard)/[environmentId]/machine-config/[configId]/aas-config-editor.tsx

@@ -68,7 +68,7 @@ import { getSpaceSettingsValues } from '@/lib/data/space-settings';
 import { MqttPublishButton } from './mqtt-publish-button';
 import AasContent from './aas-config-content';
 import Image from 'next/image';
-import { configToAasFormat, findParameter } from '../configuration-helper';
+import { findParameter } from '../helpers/configuration-helper';
 import { generateMachineDatasetNames, useParameterActions } from './shared-parameter-utils';
 import AasCreateParameterModal, {
   CreateParameterModalReturnType,
@@ -93,6 +93,7 @@ import { useCollapseItems } from './aas-config-editor-collapse';
 import LanguageDropdown from './language-dropdown';
 import { Localization } from '@/lib/data/locale';
 import PreviewFeatureModal from '../preview-feature-modal';
+import { configToAasFormat } from '../helpers/aas-configuration-helpers';
 const { Text } = Typography;
 
 type MachineDataViewProps = {

src/management-system-v2/app/(dashboard)/[environmentId]/machine-config/[configId]/aas-config-page-content.tsx

@@ -27,7 +27,7 @@ import { FaFolderTree } from 'react-icons/fa6';
 import AasConfigEditor from './aas-config-editor';
 import AasConfigurationTreeView from './aas-config-tree-view';
 import { nestedParametersFromStorage, updateConfigMetadata } from '@/lib/data/db/machine-config';
-import { findParameter } from '../configuration-helper';
+import { findParameter } from '../helpers/configuration-helper';
 import ConfigModal from '@/components/config-modal';
 import { useRouter } from 'next/navigation';
 import { useConfigEditStore } from './store/useConfigEditStore';

src/management-system-v2/app/(dashboard)/[environmentId]/machine-config/[configId]/aas-config-tree-view.tsx

@@ -5,7 +5,7 @@ import { Dropdown, MenuProps, Modal, Tree, Button, TreeDataNode, App } from 'ant
 import { EventDataNode } from 'antd/es/tree';
 import { useRouter } from 'next/navigation';
 import { Key, useEffect, useMemo, useState } from 'react';
-import { buildLinkedInputParametersFromIds, findParameter } from '../configuration-helper';
+import { buildLinkedInputParametersFromIds, findParameter } from '../helpers/configuration-helper';
 import ConfigModal from '@/components/config-modal';
 import AasCreateParameterModal, {
   CreateParameterModalReturnType,
@@ -73,7 +73,12 @@ const AasConfigurationTreeView: React.FC<ConfigurationTreeViewProps> = ({
     description: '',
   });
 
-  const { setCurrentParameter, addParameter: baseAddParameter } = useParameterActions({
+  const {
+    setCurrentParameter,
+    addParameter: baseAddParameter,
+    createFieldOpen,
+    setCreateFieldOpen,
+  } = useParameterActions({
     parentConfig,
     onRefresh: () => router.refresh(),
     currentLanguage,
@@ -157,8 +162,6 @@ const AasConfigurationTreeView: React.FC<ConfigurationTreeViewProps> = ({
 
   const handleCreateParameterOk = async (values: CreateParameterModalReturnType[]) => {
     await addParameter(values);
-    closeModal();
-    setCurrentParameter(undefined);
   };
 
   // const handleCreateMetadataOk = async (values: CreateParameterModalReturnType[]) => {
@@ -369,6 +372,7 @@ const AasConfigurationTreeView: React.FC<ConfigurationTreeViewProps> = ({
           onClick: () => {
             setCurrentParameter(currentParameter as Parameter);
             setOpenModal('parameter');
+            setCreateFieldOpen(true);
           },
           disabled: !editMode,
         },
@@ -436,8 +440,11 @@ const AasConfigurationTreeView: React.FC<ConfigurationTreeViewProps> = ({
 
       <AasCreateParameterModal
         title="Create Parameter"
-        open={openModal === 'parameter'}
-        onCancel={closeModal}
+        open={createFieldOpen}
+        onCancel={() => {
+          closeModal();
+          setCreateFieldOpen(false);
+        }}
         onSubmit={handleCreateParameterOk}
         okText="Create"
         showKey

src/management-system-v2/app/(dashboard)/[environmentId]/machine-config/[configId]/aas-create-parameter-modal.tsx

@@ -29,7 +29,7 @@ import {
   LinkedParameter,
   LocalizedText,
 } from '@/lib/data/machine-config-schema';
-import { buildLinkedInputParametersFromIds } from '../configuration-helper';
+import { buildLinkedInputParametersFromIds } from '../helpers/configuration-helper';
 import { getConfigurationCategories } from '@/lib/data/db/machine-config';
 import { useEnvironment } from '../../../../../components/auth-can';
 import { QuestionCircleOutlined } from '@ant-design/icons';
@@ -178,19 +178,7 @@ const AasCreateParameterModal = <T extends CreateParameterModalReturnType>({
 
       // Let the parent of this modal handle the submission.
       setSubmitting(true);
-      try {
-        const res = await onSubmit(mergedValues);
-        if (res?.error) {
-          message.open({ type: 'error', content: res.error.message });
-        }
-      } catch (e) {
-        setError(e);
-
-        message.open({
-          type: 'error',
-          content: 'Something went wrong while submitting the data',
-        });
-      }
+      await onSubmit(mergedValues);
       setSubmitting(false);
     } catch (info) {
       // Validate Failed

src/management-system-v2/app/(dashboard)/[environmentId]/machine-config/[configId]/aas-parameter-links.tsx

@@ -11,7 +11,7 @@ import {
   buildLinkedInputParametersFromIds,
   findParameter,
   getAllParameters,
-} from '../configuration-helper';
+} from '../helpers/configuration-helper';
 import { useMemo } from 'react';
 import { updateParameter } from '@/lib/data/db/machine-config';
 import { useRouter } from 'next/navigation';

src/management-system-v2/app/(dashboard)/[environmentId]/machine-config/[configId]/shared-parameter-utils.tsx

@@ -21,12 +21,14 @@ import {
   defaultMetaParameter,
   buildLinkedInputParametersFromIds,
   findParameter,
-} from '../configuration-helper';
+} from '../helpers/configuration-helper';
 import { CreateParameterModalReturnType } from './aas-create-parameter-modal';
 import { updateConfigMetadata } from '@/lib/data/db/machine-config';
 import { Modal } from 'antd';
 import Tree from 'antd/es/tree/Tree';
 import { Localization } from '@/lib/data/locale';
+import { wrapServerCall } from '@/lib/wrap-server-call';
+import useApp from 'antd/es/app/useApp';
 export const getInitialTransformationData = (param: Parameter | MetaParameter) => {
   const paramWithTransformation = param as Parameter & {
     transformation?: {
@@ -249,26 +251,27 @@ export const editParameter = async (
 
     if (shouldBeVirtual) {
       // converting regular to virtual
-      newParam = defaultMetaParameter(
-        valuesFromModal.name,
-        newDisplayName,
-        newDescription,
-        advancedSettingsUpdate.parameterType || 'none',
-        valuesFromModal.valueTemplateSource as unknown as MetaParameter['valueTemplateSource'],
-        currentParameter.valueType,
-        valuesFromModal.unit,
-      );
+      newParam = defaultMetaParameter({
+        name: valuesFromModal.name,
+        displayName: newDisplayName,
+        description: newDescription,
+        parameterType: advancedSettingsUpdate.parameterType || 'none',
+        valueTemplateSource:
+          valuesFromModal.valueTemplateSource as unknown as MetaParameter['valueTemplateSource'],
+        valueType: currentParameter.valueType,
+        unitRef: valuesFromModal.unit,
+      });
     } else {
       // Converting virtual to regular
-      newParam = defaultParameter(
-        valuesFromModal.name,
-        newDisplayName,
-        newDescription,
-        advancedSettingsUpdate.parameterType || 'none',
-        valuesFromModal.value,
-        currentParameter.valueType,
-        valuesFromModal.unit,
-      );
+      newParam = defaultParameter({
+        name: valuesFromModal.name,
+        displayName: newDisplayName,
+        description: newDescription,
+        parameterType: advancedSettingsUpdate.parameterType || 'none',
+        value: valuesFromModal.value,
+        valueType: currentParameter.valueType,
+        unitRef: valuesFromModal.unit,
+      });
 
       // apply transformation for regular parameter
       if (transformationUpdate.transformation) {
@@ -479,11 +482,18 @@ export const useParameterActions = ({
   currentLanguage,
 }: UseParameterActionsParams) => {
   const router = useRouter();
+  const app = useApp();
   const [currentParameter, setCurrentParameter] = useState<Parameter | MetaParameter>();
   const [createFieldOpen, setCreateFieldOpen] = useState<boolean>(false);
   const [editFieldOpen, setEditFieldOpen] = useState<boolean>(false);
   const [deleteModalOpen, setDeleteModalOpen] = useState<boolean>(false);
 
+  const onSubmitSuccess = () => {
+    setCreateFieldOpen(false);
+    router.refresh();
+    setCurrentParameter(undefined);
+  };
+
   const addParameter = async (
     values: CreateParameterModalReturnType[],
     parent?: Parameter | MetaParameter,
@@ -493,33 +503,34 @@ export const useParameterActions = ({
     const displayName = valuesFromModal.displayName || [];
     const description = valuesFromModal.description || [];
     // get parameterType from advanced settings or default to 'none'
-    const parameterType = valuesFromModal.parameterType || 'none';
+    const parameterType = (valuesFromModal.parameterType || 'none') as 'meta' | 'content' | 'none';
 
     let newParameter: Parameter | MetaParameter;
 
     const shouldBeVirtual =
       valuesFromModal.valueTemplateSource && valuesFromModal.valueTemplateSource !== 'none';
 
     if (shouldBeVirtual) {
-      newParameter = defaultMetaParameter(
-        valuesFromModal.name,
+      newParameter = defaultMetaParameter({
+        name: valuesFromModal.name,
         displayName,
         description,
-        parameterType as 'meta' | 'content' | 'none',
-        valuesFromModal.valueTemplateSource as unknown as MetaParameter['valueTemplateSource'],
-        'xs:string',
-        valuesFromModal.unit,
-      );
+        parameterType,
+        valueTemplateSource:
+          valuesFromModal.valueTemplateSource as unknown as MetaParameter['valueTemplateSource'],
+        valueType: 'xs:string',
+        unitRef: valuesFromModal.unit,
+      });
     } else {
-      newParameter = defaultParameter(
-        valuesFromModal.name,
+      newParameter = defaultParameter({
+        name: valuesFromModal.name,
         displayName,
         description,
-        parameterType as 'meta' | 'content' | 'none',
-        valuesFromModal.value,
-        'xs:string',
-        valuesFromModal.unit,
-      );
+        parameterType,
+        value: valuesFromModal.value,
+        valueType: 'xs:string',
+        unitRef: valuesFromModal.unit,
+      });
     }
 
     // apply advanced settings
@@ -553,14 +564,22 @@ export const useParameterActions = ({
     // use parent parameter if provided, otherwise use currentParameter, otherwise add to root
     const targetParent = parent || currentParameter;
     if (targetParent) {
-      await backendAddParameter(targetParent.id, 'parameter', newParameter, parentConfig.id);
+      wrapServerCall({
+        fn: () => backendAddParameter(targetParent.id, 'parameter', newParameter, parentConfig.id),
+        onSuccess: () => {
+          app.message.success('Parameter successfully created.');
+          onSubmitSuccess();
+        },
+      });
     } else {
-      await backendAddParameter(parentConfig.id, 'config', newParameter, parentConfig.id);
+      wrapServerCall({
+        fn: () => backendAddParameter(parentConfig.id, 'config', newParameter, parentConfig.id),
+        onSuccess: () => {
+          app.message.success('Parameter successfully created.');
+          onSubmitSuccess();
+        },
+      });
     }
-
-    setCreateFieldOpen(false);
-    router.refresh();
-    setCurrentParameter(undefined);
   };
 
   const handleEditParameter = async (values: CreateParameterModalReturnType[]) => {