feat: generate redux store for express-openapi-validator changes (#676)

ferruhcihan · web-flow · commit 5dbddd466f21 · 2025-11-10T09:40:21.000+01:00
diff --git a/src/components/App.tsx b/src/components/App.tsx
@@ -12,7 +12,7 @@ import React, { useEffect, useState } from 'react'
 import Helmet from 'react-helmet'
 import { useTranslation } from 'react-i18next'
 import { useLocation } from 'react-router-dom'
-import { GetAppApiResponse } from 'redux/otomiApi'
+import { GetTeamAppApiResponse } from 'redux/otomiApi'
 import { makeStyles } from 'tss-react/mui'
 import { cleanLink, getAppData } from 'utils/data'
 import { extract, getAppSchemaName, isOf } from 'utils/schema'
@@ -167,7 +167,7 @@ export const getAppUiSchema = (appsEnabled: Record<string, any>, appId: string,
   return uiSchema
 }
 
-interface Props extends CrudProps, GetAppApiResponse {
+interface Props extends CrudProps, GetTeamAppApiResponse {
   teamId: string
   setAppState: CallableFunction
   managed?: boolean
diff --git a/src/components/AppButtons.tsx b/src/components/AppButtons.tsx
@@ -2,10 +2,10 @@ import { ButtonGroup, IconButton } from '@mui/material'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { Link as RLink } from 'react-router-dom'
-import { GetAppApiResponse } from 'redux/otomiApi'
+import { GetTeamAppApiResponse } from 'redux/otomiApi'
 import Iconify from './Iconify'
 
-interface Props extends GetAppApiResponse {
+interface Props extends GetTeamAppApiResponse {
   teamId: string
   toggleApp?: any
   externalUrl?: string
diff --git a/src/pages/App.tsx b/src/pages/App.tsx
@@ -5,7 +5,7 @@ import PaperLayout from 'layouts/Paper'
 import React, { useEffect } from 'react'
 import { RouteComponentProps } from 'react-router-dom'
 import { useAppSelector } from 'redux/hooks'
-import { useEditAppMutation, useGetAppQuery, useToggleAppsMutation } from 'redux/otomiApi'
+import { useEditAppMutation, useGetTeamAppQuery, useToggleAppsMutation } from 'redux/otomiApi'
 
 interface Params {
   teamId: string
@@ -20,7 +20,7 @@ export default function ({
   const { refetchAppsEnabled } = useAuthzSession(teamId)
   const [edit, { isLoading: isLoadingUpdate }] = useEditAppMutation()
   const [toggle, { isLoading: isLoadingToggle }] = useToggleAppsMutation()
-  const { data, isLoading, isFetching, isError, refetch } = useGetAppQuery(
+  const { data, isLoading, isFetching, isError, refetch } = useGetTeamAppQuery(
     { teamId, appId },
     { skip: teamId !== 'admin' },
   )
diff --git a/src/pages/code-repositories/create-edit/CodeRepositoriesCreateEditPage.tsx b/src/pages/code-repositories/create-edit/CodeRepositoriesCreateEditPage.tsx
@@ -15,9 +15,9 @@ import {
   useEditCodeRepoMutation,
   useGetCodeRepoQuery,
   useGetInternalRepoUrlsQuery,
-  useGetSealedSecretsQuery,
   useGetTeamCodeReposQuery,
-  useGetTestRepoConnectQuery,
+  useGetTeamSealedSecretsQuery,
+  useTestRepoConnectQuery,
 } from 'redux/otomiApi'
 import { useTranslation } from 'react-i18next'
 import FormRow from 'components/forms/FormRow'
@@ -96,7 +96,7 @@ export default function CodeRepositoriesCreateEditPage({
     isFetching: isFetchingTeamSecrets,
     isError: isErrorTeamSecrets,
     refetch: refetchTeamSecrets,
-  } = useGetSealedSecretsQuery({ teamId }, { skip: !teamId })
+  } = useGetTeamSealedSecretsQuery({ teamId }, { skip: !teamId })
   const teamSecrets =
     teamSealedSecrets?.filter(
       (secret) => secret?.type === 'kubernetes.io/basic-auth' || secret?.type === 'kubernetes.io/ssh-auth',
@@ -108,7 +108,7 @@ export default function CodeRepositoriesCreateEditPage({
     isError: isErrorRepoUrls,
     refetch: refetchRepoUrls,
   } = useGetInternalRepoUrlsQuery({ teamId }, { skip: !gitProvider })
-  const { data: testRepoConnect, isFetching: isFetchingTestRepoConnect } = useGetTestRepoConnectQuery(
+  const { data: testRepoConnect, isFetching: isFetchingTestRepoConnect } = useTestRepoConnectQuery(
     { url: testConnectUrl, teamId, secret: secretName },
     { skip: !testConnectUrl },
   )
diff --git a/src/pages/network-policies/create-edit/NetworkPoliciesIngressCreateEditPage.tsx b/src/pages/network-policies/create-edit/NetworkPoliciesIngressCreateEditPage.tsx
@@ -7,7 +7,7 @@ import {
   useCreateNetpolMutation,
   useDeleteNetpolMutation,
   useEditNetpolMutation,
-  useGetAllAplWorkloadNamesQuery,
+  useGetAllWorkloadNamesQuery,
   useGetNetpolQuery,
 } from 'redux/otomiApi'
 import { FormProvider, Resolver, useFieldArray, useForm } from 'react-hook-form'
@@ -79,7 +79,7 @@ export default function NetworkPoliciesIngressCreateEditPage({
     { teamId, netpolName: networkPolicyName },
     { skip: !networkPolicyName },
   )
-  const { data: aplWorkloads, isLoading: isLoadingAplWorkloads } = useGetAllAplWorkloadNamesQuery()
+  const { data: aplWorkloads, isLoading: isLoadingAplWorkloads } = useGetAllWorkloadNamesQuery()
 
   // When editing, reset form with fetched data
   useEffect(() => {
diff --git a/src/pages/network-policies/create-edit/NetworkPolicyPodLabelMatchHelper.ts b/src/pages/network-policies/create-edit/NetworkPolicyPodLabelMatchHelper.ts
@@ -1,4 +1,4 @@
-import { GetAllAplWorkloadNamesApiResponse } from 'redux/otomiApi'
+import { GetAllWorkloadNamesApiResponse } from 'redux/otomiApi'
 
 export interface PodLabelMatch {
   name: string
@@ -55,7 +55,7 @@ function normalizeRabbitMQLabel(labelValue: string): string {
 export function getInitialActiveWorkloadRow(
   labelValue: string,
   namespaceValue: string,
-  workloads: GetAllAplWorkloadNamesApiResponse,
+  workloads: GetAllWorkloadNamesApiResponse,
 ): WorkloadOption {
   if (!labelValue || !workloads || !Array.isArray(workloads)) return { name: 'unknown', namespace: '' }
 
@@ -71,10 +71,7 @@ export function getInitialActiveWorkloadRow(
   return { name: matches[0].metadata.name, namespace: matches[0].metadata.namespace }
 }
 
-export function getInitialActiveWorkloadTarget(
-  labelValue: string,
-  workloads: GetAllAplWorkloadNamesApiResponse,
-): string {
+export function getInitialActiveWorkloadTarget(labelValue: string, workloads: GetAllWorkloadNamesApiResponse): string {
   if (!labelValue || !workloads || !Array.isArray(workloads)) return 'unknown'
 
   const normalizedLabel = normalizeRabbitMQLabel(labelValue)
diff --git a/src/pages/network-policies/create-edit/NetworkPolicyPodLabelRow.tsx b/src/pages/network-policies/create-edit/NetworkPolicyPodLabelRow.tsx
@@ -2,11 +2,11 @@ import { FieldPath, useController, useFormContext } from 'react-hook-form'
 import { Autocomplete } from 'components/forms/Autocomplete'
 import FormRow from 'components/forms/FormRow'
 import { useEffect, useMemo, useState } from 'react'
-import { GetAllAplWorkloadNamesApiResponse, useGetK8SWorkloadPodLabelsQuery } from 'redux/otomiApi'
+import { GetAllWorkloadNamesApiResponse, useGetK8SPodLabelsForWorkloadQuery } from 'redux/otomiApi'
 import { getDefaultPodLabel, getInitialActiveWorkloadRow } from './NetworkPolicyPodLabelMatchHelper'
 
 interface Props {
-  aplWorkloads: GetAllAplWorkloadNamesApiResponse
+  aplWorkloads: GetAllWorkloadNamesApiResponse
   teamId: string
   fieldArrayName: FieldPath<FormValues>
   rowIndex?: number
@@ -61,7 +61,7 @@ export default function NetworkPolicyPodLabelRow({
   )
 
   // fetch pod‐labels & pod-names
-  const { data: podLabels } = useGetK8SWorkloadPodLabelsQuery(
+  const { data: podLabels } = useGetK8SPodLabelsForWorkloadQuery(
     {
       teamId,
       workloadName: activeWorkload?.name ?? '',
diff --git a/src/pages/network-policies/create-edit/NetworkPolicyTargetPodLabelRow.tsx b/src/pages/network-policies/create-edit/NetworkPolicyTargetPodLabelRow.tsx
@@ -2,11 +2,11 @@ import { Autocomplete } from 'components/forms/Autocomplete'
 import FormRow from 'components/forms/FormRow'
 import { useEffect, useMemo, useState } from 'react'
 import { useFormContext } from 'react-hook-form'
-import { GetAllAplWorkloadNamesApiResponse, useGetK8SWorkloadPodLabelsQuery } from 'redux/otomiApi'
+import { GetAllWorkloadNamesApiResponse, useGetK8SPodLabelsForWorkloadQuery } from 'redux/otomiApi'
 import { getDefaultPodLabel, getInitialActiveWorkloadTarget } from './NetworkPolicyPodLabelMatchHelper'
 
 interface Props {
-  aplWorkloads: GetAllAplWorkloadNamesApiResponse
+  aplWorkloads: GetAllWorkloadNamesApiResponse
   teamId: string
   prefixName: string
   showBanner?: () => void
@@ -60,7 +60,7 @@ export default function NetworkPolicyTargetLabelRow({
   const selectedWorkloadOption = workloadOptions?.find((o) => o.name === activeWorkload) || null
 
   // fetch the label→value map for that pod spec
-  const { data: podLabels } = useGetK8SWorkloadPodLabelsQuery(
+  const { data: podLabels } = useGetK8SPodLabelsForWorkloadQuery(
     { teamId, workloadName: activeWorkload, namespace: `team-${teamId}` },
     { skip: !activeWorkload },
   )
diff --git a/src/pages/secrets/overview/SecretOverviewPage.tsx b/src/pages/secrets/overview/SecretOverviewPage.tsx
@@ -11,7 +11,7 @@ import { getStatus } from 'components/Workloads'
 import InformationBanner from 'components/InformationBanner'
 import { skipToken } from '@reduxjs/toolkit/dist/query'
 import { RouteComponentProps } from 'react-router-dom'
-import { useGetAllSealedSecretsQuery, useGetSealedSecretsQuery } from 'redux/otomiApi'
+import { useGetAllSealedSecretsQuery, useGetTeamSealedSecretsQuery } from 'redux/otomiApi'
 import { useAppSelector } from 'redux/hooks'
 import { useSocket } from 'providers/Socket'
 
@@ -51,7 +51,7 @@ export default function SecretOverviewPage({
     isLoading: isLoadingTeamSealedSecrets,
     isFetching: isFetchingTeamSealedSecrets,
     refetch: refetchTeamSealedSecrets,
-  } = useGetSealedSecretsQuery({ teamId }, { skip: !teamId })
+  } = useGetTeamSealedSecretsQuery({ teamId }, { skip: !teamId })
 
   const isDirty = useAppSelector(({ global: { isDirty } }) => isDirty)
   useEffect(() => {
diff --git a/src/pages/services/create-edit/ServicesCreateEditPage.tsx b/src/pages/services/create-edit/ServicesCreateEditPage.tsx
@@ -12,9 +12,9 @@ import {
   useDeleteAplServiceMutation,
   useEditAplServiceMutation,
   useGetAplServiceQuery,
-  useGetSealedSecretsQuery,
+  useGetK8SServicesQuery,
   useGetSettingsInfoQuery,
-  useGetTeamK8SServicesQuery,
+  useGetTeamSealedSecretsQuery,
 } from 'redux/otomiApi'
 import { useTranslation } from 'react-i18next'
 import { useAppSelector } from 'redux/hooks'
@@ -92,15 +92,15 @@ export default function ServicesCreateEditPage({
     isFetching: isFetchingK8sServices,
     isError: isErrorK8sServices,
     refetch: refetchK8sServices,
-  } = useGetTeamK8SServicesQuery({ teamId })
+  } = useGetK8SServicesQuery({ teamId })
 
   const {
     data: teamSealedSecrets,
     isLoading: isLoadingTeamSecrets,
     isFetching: isFetchingTeamSecrets,
     isError: isErrorTeamSecrets,
     refetch: refetchTeamSecrets,
-  } = useGetSealedSecretsQuery({ teamId }, { skip: !teamId })
+  } = useGetTeamSealedSecretsQuery({ teamId }, { skip: !teamId })
   const {
     data: settingsInfo,
     isLoading: isLoadingSettingsInfo,
diff --git a/src/pages/workloads/catalog/WorkloadCatalogsPage.tsx b/src/pages/workloads/catalog/WorkloadCatalogsPage.tsx
@@ -3,7 +3,7 @@ import PaperLayout from 'layouts/Paper'
 import { useSession } from 'providers/Session'
 import React, { useEffect, useState } from 'react'
 import { RouteComponentProps } from 'react-router-dom'
-import { useWorkloadCatalogMutation } from 'redux/otomiApi'
+import { useGetWorkloadCatalogMutation } from 'redux/otomiApi'
 
 interface Params {
   teamId?: string
@@ -15,7 +15,7 @@ export default function WorkloadCatalogsPage({
   },
 }: RouteComponentProps<Params>): React.ReactElement {
   const { user } = useSession()
-  const [getWorkloadCatalog, { isLoading }] = useWorkloadCatalogMutation()
+  const [getWorkloadCatalog, { isLoading }] = useGetWorkloadCatalogMutation()
   const [catalogs, setCatalogs] = useState<any[]>([])
 
   const fetchCatalog = () => {
diff --git a/src/pages/workloads/create-edit/WorkloadsCreateEditPage.tsx b/src/pages/workloads/create-edit/WorkloadsCreateEditPage.tsx
@@ -9,9 +9,9 @@ import {
   useCreateAplWorkloadMutation,
   useDeleteAplWorkloadMutation,
   useEditAplWorkloadMutation,
+  useGetWorkloadCatalogMutation,
   useGetWorkloadQuery,
   useGetWorkloadValuesQuery,
-  useWorkloadCatalogMutation,
 } from 'redux/otomiApi'
 
 interface Params {
@@ -48,7 +48,7 @@ export default function WorkloadsCreateEditPage({
     refetch: refetchValues,
   } = useGetWorkloadValuesQuery({ teamId, workloadName }, { skip: !workloadName })
 
-  const [getWorkloadCatalog, { isLoading: isLoadingCatalog }] = useWorkloadCatalogMutation()
+  const [getWorkloadCatalog, { isLoading: isLoadingCatalog }] = useGetWorkloadCatalogMutation()
   const [catalogItem, setCatalogItem] = useState<any>({})
 
   const isDirty = useAppSelector(({ global: { isDirty } }) => isDirty)
diff --git a/src/providers/Session.tsx b/src/providers/Session.tsx
@@ -11,10 +11,10 @@ import { useAppSelector } from 'redux/hooks'
 import {
   GetSessionApiResponse,
   GetSettingsInfoApiResponse,
+  useGetApiDocQuery,
   useGetAppsQuery,
   useGetSessionQuery,
   useGetSettingsInfoQuery,
-  useV1ApiDocsQuery,
 } from 'redux/otomiApi'
 import {
   ApiErrorGatewayTimeout,
@@ -86,7 +86,7 @@ export default function SessionProvider({ children }: Props): React.ReactElement
     isLoading: isLoadingApps,
     refetch: refetchAppsEnabled,
   } = useGetAppsQuery({ teamId: oboTeamId, picks: ['id', 'enabled'] }, { skip: !oboTeamId })
-  const { data: apiDocs, isLoading: isLoadingApiDocs } = useV1ApiDocsQuery(skipFetch && skipToken)
+  const { data: apiDocs, isLoading: isLoadingApiDocs } = useGetApiDocQuery(skipFetch && skipToken)
   const appsEnabled = (apps || []).reduce((memo, a) => {
     memo[a.id] = !!a.enabled
     return memo
diff --git a/src/redux/otomiApi.ts b/src/redux/otomiApi.ts
