refactor(17040): apply changes to openAPI to codegen stubs

- remove exclude from the subscription UI for remote
hivemq · Oct 12, 2023 · 7bb30c4 · 7bb30c4
1 parent c5c960e
commit 7bb30c4
Show file tree

Hide file tree

Showing 15 changed files with 148 additions and 58 deletions.
diff --git a/hivemq-edge/src/frontend/src/api/__generated__/index.ts b/hivemq-edge/src/frontend/src/api/__generated__/index.ts
diff --git a/hivemq-edge/src/frontend/src/api/__generated__/models/Bridge.ts b/hivemq-edge/src/frontend/src/api/__generated__/models/Bridge.ts
diff --git a/hivemq-edge/src/frontend/src/api/__generated__/models/BridgeSubscription.ts b/hivemq-edge/src/frontend/src/api/__generated__/models/BridgeSubscription.ts
diff --git a/hivemq-edge/src/frontend/src/api/__generated__/models/LocalBridgeSubscription.ts b/hivemq-edge/src/frontend/src/api/__generated__/models/LocalBridgeSubscription.ts
diff --git a/hivemq-edge/src/frontend/src/api/__generated__/schemas/$Bridge.ts b/hivemq-edge/src/frontend/src/api/__generated__/schemas/$Bridge.ts
diff --git a/hivemq-edge/src/frontend/src/api/__generated__/schemas/$BridgeSubscription.ts b/hivemq-edge/src/frontend/src/api/__generated__/schemas/$BridgeSubscription.ts
diff --git a/hivemq-edge/src/frontend/src/api/__generated__/schemas/$LocalBridgeSubscription.ts b/hivemq-edge/src/frontend/src/api/__generated__/schemas/$LocalBridgeSubscription.ts
diff --git a/hivemq-edge/src/frontend/src/api/__generated__/services/BridgesService.ts b/hivemq-edge/src/frontend/src/api/__generated__/services/BridgesService.ts
diff --git a/hivemq-edge/src/frontend/src/api/__generated__/services/ProtocolAdaptersService.ts b/hivemq-edge/src/frontend/src/api/__generated__/services/ProtocolAdaptersService.ts
diff --git a/hivemq-edge/src/frontend/src/api/hooks/useConnection/useGetAdaptersStatus.tsx b/hivemq-edge/src/frontend/src/api/hooks/useConnection/useGetAdaptersStatus.tsx
@@ -9,7 +9,7 @@ export const useGetAdaptersStatus = () => {
   return useQuery(
     [QUERY_KEYS.ADAPTERS, QUERY_KEYS.CONNECTION_STATUS],
     async () => {
-      const item = await appClient.protocolAdapters.status1()
+      const item = await appClient.protocolAdapters.getAdaptersStatus()
       return item
     },
     {

diff --git a/hivemq-edge/src/frontend/src/api/hooks/useConnection/useGetBridgesStatus.tsx b/hivemq-edge/src/frontend/src/api/hooks/useConnection/useGetBridgesStatus.tsx
@@ -9,7 +9,7 @@ export const useGetBridgesStatus = () => {
   return useQuery(
     [QUERY_KEYS.BRIDGES, QUERY_KEYS.CONNECTION_STATUS],
     async () => {
-      const item = await appClient.bridges.status()
+      const item = await appClient.bridges.getBridgesStatus()
       return item
     },
     {

diff --git a/hivemq-edge/src/frontend/src/api/hooks/useGetBridges/useGetBridgeConnectionStatus.tsx b/hivemq-edge/src/frontend/src/api/hooks/useGetBridges/useGetBridgeConnectionStatus.tsx
@@ -13,7 +13,7 @@ export const useGetBridgeConnectionStatus = (name: string | undefined) => {
   return useQuery(
     [QUERY_KEYS.BRIDGES, name, QUERY_KEYS.CONNECTION_STATUS],
     async () => {
-      const item = await appClient.bridges.getStatus(name as string)
+      const item = await appClient.bridges.getBridgeStatus(name as string)
       return item
     },
     {

diff --git a/hivemq-edge/src/frontend/src/api/hooks/useGetBridges/useSetConnectionStatus.tsx b/hivemq-edge/src/frontend/src/api/hooks/useGetBridges/useSetConnectionStatus.tsx
@@ -14,7 +14,7 @@ export const useSetConnectionStatus = () => {
   const queryClient = useQueryClient()
 
   const setConnectionStatus = ({ name, requestBody }: SetConnectionStatusProps) => {
-    return appClient.bridges.changeStatus(name, requestBody)
+    return appClient.bridges.transitionBridgeStatus(name, requestBody)
   }
 
   return useMutation<StatusTransitionResult, ApiError, SetConnectionStatusProps>(setConnectionStatus, {

diff --git a/hivemq-edge/src/frontend/src/api/hooks/useProtocolAdapters/useSetConnectionStatus.tsx b/hivemq-edge/src/frontend/src/api/hooks/useProtocolAdapters/useSetConnectionStatus.tsx
@@ -14,7 +14,7 @@ export const useSetConnectionStatus = () => {
   const queryClient = useQueryClient()
 
   const changeStatus = ({ adapterId, requestBody }: SetConnectionStatusProps) => {
-    return appClient.protocolAdapters.changeStatus1(adapterId, requestBody)
+    return appClient.protocolAdapters.transitionAdapterStatus(adapterId, requestBody)
   }
 
   return useMutation<StatusTransitionResult, ApiError, SetConnectionStatusProps>(changeStatus, {

diff --git a/hivemq-edge/src/frontend/src/modules/Bridges/components/panels/SubscriptionsPanel.tsx b/hivemq-edge/src/frontend/src/modules/Bridges/components/panels/SubscriptionsPanel.tsx
@@ -174,34 +174,38 @@ const SubscriptionsPanel: FC<BridgeSubscriptionsProps> = ({ form, type }) => {
                         />
                       </FormControl>
 
-                      <FormControl>
-                        <FormLabel htmlFor={`${type}.${index}.excludes`}>{t('bridge.subscription.excludes')}</FormLabel>
-                        <Controller
-                          name={`${type}.${index}.excludes`}
-                          render={({ field }) => {
-                            const { value, onChange, ...rest } = field
-                            const formatValue = value?.map((e) => ({ value: e, label: e }))
-                            return (
-                              <CreatableSelect
-                                {...rest}
-                                value={formatValue}
-                                onChange={(values) => onChange(values.map((item) => item.value))}
-                                inputId={`${type}.${index}.excludes`}
-                                // options={[{ value: 'ddfd', label: 'fgg' }]}
-                                // menuIsOpen={false}
-                                isClearable={true}
-                                placeholder={'add topic'}
-                                isMulti={true}
-                                components={{
-                                  DropdownIndicator: null,
-                                }}
-                              />
-                            )
-                          }}
-                          control={form.control}
-                        />
-                        <FormErrorMessage>{errors[type]?.[index]?.filters?.message}</FormErrorMessage>
-                      </FormControl>
+                      {type === 'localSubscriptions' && (
+                        <FormControl>
+                          <FormLabel htmlFor={`${type}.${index}.excludes`}>
+                            {t('bridge.subscription.excludes')}
+                          </FormLabel>
+                          <Controller
+                            name={`${type}.${index}.excludes`}
+                            render={({ field }) => {
+                              const { value, onChange, ...rest } = field
+                              const formatValue = value?.map((e) => ({ value: e, label: e }))
+                              return (
+                                <CreatableSelect
+                                  {...rest}
+                                  value={formatValue}
+                                  onChange={(values) => onChange(values.map((item) => item.value))}
+                                  inputId={`${type}.${index}.excludes`}
+                                  // options={[{ value: 'ddfd', label: 'fgg' }]}
+                                  // menuIsOpen={false}
+                                  isClearable={true}
+                                  placeholder={'add topic'}
+                                  isMulti={true}
+                                  components={{
+                                    DropdownIndicator: null,
+                                  }}
+                                />
+                              )
+                            }}
+                            control={form.control}
+                          />
+                          <FormErrorMessage>{errors[type]?.[index]?.filters?.message}</FormErrorMessage>
+                        </FormControl>
+                      )}
 
                       <FormControl>
                         <FormLabel htmlFor={`${type}.${index}.preserveRetain`}>