merge conflict again

hivemq · Sep 13, 2023 · 488f04e · 488f04e
1 parent 1c2eeaf
commit 488f04e
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/hivemq-edge/src/frontend/src/modules/ProtocolAdapters/hooks/useGetUISchema.ts b/hivemq-edge/src/frontend/src/modules/ProtocolAdapters/hooks/useGetUISchema.ts
@@ -1,45 +1,45 @@
-import { UIGroup } from '@/modules/ProtocolAdapters/types.ts'
+import { UITab } from '@/modules/ProtocolAdapters/types.ts'
 import { useTranslation } from 'react-i18next'
 import { UiSchema } from '@rjsf/utils'
 
 const useGetUiSchema = (isNewAdapter = true) => {
   const { t } = useTranslation()
 
-  const groups: UIGroup[] = [
+  const tabs: UITab[] = [
     {
       id: 'coreFields',
       title: t('protocolAdapter.uiSchema.groups.coreFields'),
-      children: ['id', 'port', 'host', 'uri', 'url', 'pollingIntervalMillis','controllerType','remoteRack','remoteSlot'],
+      properties: ['id', 'port', 'host', 'uri', 'url', 'pollingIntervalMillis','controllerType','remoteRack','remoteSlot'],
     },
     {
       id: 'subFields',
       title: 'Subscription',
-      children: ['subscriptions'],
+      properties: ['subscriptions'],
     },
     {
       id: 'security',
       title: t('protocolAdapter.uiSchema.groups.security'),
-      children: ['security', 'tls'],
+      properties: ['security', 'tls'],
     },
     {
       id: 'publishing',
       title: t('protocolAdapter.uiSchema.groups.publishing'),
-      children: ['maxPollingErrorsBeforeRemoval', 'publishChangedDataOnly', 'publishingInterval', 'destination', 'qos'],
+      properties: ['maxPollingErrorsBeforeRemoval', 'publishChangedDataOnly', 'publishingInterval', 'destination', 'qos'],
     },
     {
       id: 'authentication',
       title: t('protocolAdapter.uiSchema.groups.authentication'),
-      children: ['auth'],
+      properties: ['auth'],
     },
     {
       id: 's7advanced',
       title: t('protocolAdapter.uiSchema.groups.s7advanced'),
-      children: ['ping','pingTime', 'maxAmqCaller', 'maxAmqCallee', 'remoteTsap', 'remoteRack2', 'remoteSlot2', 'pduSize', 'retryTime', 'retryTimeout', 'retryTime', 'retryTime'],
+      properties: ['ping','pingTime', 'maxAmqCaller', 'maxAmqCallee', 'remoteTsap', 'remoteRack2', 'remoteSlot2', 'pduSize', 'retryTime', 'retryTimeout', 'retryTime', 'retryTime'],
     },
     {
       id: 'http',
       title: t('protocolAdapter.uiSchema.groups.http'),
-      children: [
+      properties: [
         'httpRequestMethod',
         'httpRequestBodyContentType',
         'httpRequestBody',
@@ -51,7 +51,7 @@ const useGetUiSchema = (isNewAdapter = true) => {
   ]
 
   const uiSchema: UiSchema = {
-    'ui:groups': groups,
+    'ui:tabs': tabs,
 
     'ui:submitButtonOptions': {
       norender: true,