Skip to content

Commit ca813b4

Browse files
svcAPLBotsvcAPLBot
committed
Merge remote-tracking branch 'origin/main' into dependabot/npm_and_yarn/react-i18next-16.0.0
2 parents bde25e0 + 5dbddd4 commit ca813b4

14 files changed

Lines changed: 89 additions & 92 deletions

File tree

‎src/components/App.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import React, { useEffect, useState } from 'react'
1212
import Helmet from 'react-helmet'
1313
import { useTranslation } from 'react-i18next'
1414
import { useLocation } from 'react-router-dom'
15-
import { GetAppApiResponse } from 'redux/otomiApi'
15+
import { GetTeamAppApiResponse } from 'redux/otomiApi'
1616
import { makeStyles } from 'tss-react/mui'
1717
import { cleanLink, getAppData } from 'utils/data'
1818
import { extract, getAppSchemaName, isOf } from 'utils/schema'
@@ -167,7 +167,7 @@ export const getAppUiSchema = (appsEnabled: Record<string, any>, appId: string,
167167
return uiSchema
168168
}
169169

170-
interface Props extends CrudProps, GetAppApiResponse {
170+
interface Props extends CrudProps, GetTeamAppApiResponse {
171171
teamId: string
172172
setAppState: CallableFunction
173173
managed?: boolean

‎src/components/AppButtons.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import { ButtonGroup, IconButton } from '@mui/material'
22
import React from 'react'
33
import { useTranslation } from 'react-i18next'
44
import { Link as RLink } from 'react-router-dom'
5-
import { GetAppApiResponse } from 'redux/otomiApi'
5+
import { GetTeamAppApiResponse } from 'redux/otomiApi'
66
import Iconify from './Iconify'
77

8-
interface Props extends GetAppApiResponse {
8+
interface Props extends GetTeamAppApiResponse {
99
teamId: string
1010
toggleApp?: any
1111
externalUrl?: string

‎src/pages/App.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import PaperLayout from 'layouts/Paper'
55
import React, { useEffect } from 'react'
66
import { RouteComponentProps } from 'react-router-dom'
77
import { useAppSelector } from 'redux/hooks'
8-
import { useEditAppMutation, useGetAppQuery, useToggleAppsMutation } from 'redux/otomiApi'
8+
import { useEditAppMutation, useGetTeamAppQuery, useToggleAppsMutation } from 'redux/otomiApi'
99

1010
interface Params {
1111
teamId: string
@@ -20,7 +20,7 @@ export default function ({
2020
const { refetchAppsEnabled } = useAuthzSession(teamId)
2121
const [edit, { isLoading: isLoadingUpdate }] = useEditAppMutation()
2222
const [toggle, { isLoading: isLoadingToggle }] = useToggleAppsMutation()
23-
const { data, isLoading, isFetching, isError, refetch } = useGetAppQuery(
23+
const { data, isLoading, isFetching, isError, refetch } = useGetTeamAppQuery(
2424
{ teamId, appId },
2525
{ skip: teamId !== 'admin' },
2626
)

‎src/pages/code-repositories/create-edit/CodeRepositoriesCreateEditPage.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import {
1515
useEditCodeRepoMutation,
1616
useGetCodeRepoQuery,
1717
useGetInternalRepoUrlsQuery,
18-
useGetSealedSecretsQuery,
1918
useGetTeamCodeReposQuery,
20-
useGetTestRepoConnectQuery,
19+
useGetTeamSealedSecretsQuery,
20+
useTestRepoConnectQuery,
2121
} from 'redux/otomiApi'
2222
import { useTranslation } from 'react-i18next'
2323
import FormRow from 'components/forms/FormRow'
@@ -96,7 +96,7 @@ export default function CodeRepositoriesCreateEditPage({
9696
isFetching: isFetchingTeamSecrets,
9797
isError: isErrorTeamSecrets,
9898
refetch: refetchTeamSecrets,
99-
} = useGetSealedSecretsQuery({ teamId }, { skip: !teamId })
99+
} = useGetTeamSealedSecretsQuery({ teamId }, { skip: !teamId })
100100
const teamSecrets =
101101
teamSealedSecrets?.filter(
102102
(secret) => secret?.type === 'kubernetes.io/basic-auth' || secret?.type === 'kubernetes.io/ssh-auth',
@@ -108,7 +108,7 @@ export default function CodeRepositoriesCreateEditPage({
108108
isError: isErrorRepoUrls,
109109
refetch: refetchRepoUrls,
110110
} = useGetInternalRepoUrlsQuery({ teamId }, { skip: !gitProvider })
111-
const { data: testRepoConnect, isFetching: isFetchingTestRepoConnect } = useGetTestRepoConnectQuery(
111+
const { data: testRepoConnect, isFetching: isFetchingTestRepoConnect } = useTestRepoConnectQuery(
112112
{ url: testConnectUrl, teamId, secret: secretName },
113113
{ skip: !testConnectUrl },
114114
)

‎src/pages/network-policies/create-edit/NetworkPoliciesIngressCreateEditPage.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
useCreateNetpolMutation,
88
useDeleteNetpolMutation,
99
useEditNetpolMutation,
10-
useGetAllAplWorkloadNamesQuery,
10+
useGetAllWorkloadNamesQuery,
1111
useGetNetpolQuery,
1212
} from 'redux/otomiApi'
1313
import { FormProvider, Resolver, useFieldArray, useForm } from 'react-hook-form'
@@ -79,7 +79,7 @@ export default function NetworkPoliciesIngressCreateEditPage({
7979
{ teamId, netpolName: networkPolicyName },
8080
{ skip: !networkPolicyName },
8181
)
82-
const { data: aplWorkloads, isLoading: isLoadingAplWorkloads } = useGetAllAplWorkloadNamesQuery()
82+
const { data: aplWorkloads, isLoading: isLoadingAplWorkloads } = useGetAllWorkloadNamesQuery()
8383

8484
// When editing, reset form with fetched data
8585
useEffect(() => {

‎src/pages/network-policies/create-edit/NetworkPolicyPodLabelMatchHelper.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { GetAllAplWorkloadNamesApiResponse } from 'redux/otomiApi'
1+
import { GetAllWorkloadNamesApiResponse } from 'redux/otomiApi'
22

33
export interface PodLabelMatch {
44
name: string
@@ -55,7 +55,7 @@ function normalizeRabbitMQLabel(labelValue: string): string {
5555
export function getInitialActiveWorkloadRow(
5656
labelValue: string,
5757
namespaceValue: string,
58-
workloads: GetAllAplWorkloadNamesApiResponse,
58+
workloads: GetAllWorkloadNamesApiResponse,
5959
): WorkloadOption {
6060
if (!labelValue || !workloads || !Array.isArray(workloads)) return { name: 'unknown', namespace: '' }
6161

@@ -71,10 +71,7 @@ export function getInitialActiveWorkloadRow(
7171
return { name: matches[0].metadata.name, namespace: matches[0].metadata.namespace }
7272
}
7373

74-
export function getInitialActiveWorkloadTarget(
75-
labelValue: string,
76-
workloads: GetAllAplWorkloadNamesApiResponse,
77-
): string {
74+
export function getInitialActiveWorkloadTarget(labelValue: string, workloads: GetAllWorkloadNamesApiResponse): string {
7875
if (!labelValue || !workloads || !Array.isArray(workloads)) return 'unknown'
7976

8077
const normalizedLabel = normalizeRabbitMQLabel(labelValue)

‎src/pages/network-policies/create-edit/NetworkPolicyPodLabelRow.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import { FieldPath, useController, useFormContext } from 'react-hook-form'
22
import { Autocomplete } from 'components/forms/Autocomplete'
33
import FormRow from 'components/forms/FormRow'
44
import { useEffect, useMemo, useState } from 'react'
5-
import { GetAllAplWorkloadNamesApiResponse, useGetK8SWorkloadPodLabelsQuery } from 'redux/otomiApi'
5+
import { GetAllWorkloadNamesApiResponse, useGetK8SPodLabelsForWorkloadQuery } from 'redux/otomiApi'
66
import { getDefaultPodLabel, getInitialActiveWorkloadRow } from './NetworkPolicyPodLabelMatchHelper'
77

88
interface Props {
9-
aplWorkloads: GetAllAplWorkloadNamesApiResponse
9+
aplWorkloads: GetAllWorkloadNamesApiResponse
1010
teamId: string
1111
fieldArrayName: FieldPath<FormValues>
1212
rowIndex?: number
@@ -61,7 +61,7 @@ export default function NetworkPolicyPodLabelRow({
6161
)
6262

6363
// fetch pod‐labels & pod-names
64-
const { data: podLabels } = useGetK8SWorkloadPodLabelsQuery(
64+
const { data: podLabels } = useGetK8SPodLabelsForWorkloadQuery(
6565
{
6666
teamId,
6767
workloadName: activeWorkload?.name ?? '',

‎src/pages/network-policies/create-edit/NetworkPolicyTargetPodLabelRow.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import { Autocomplete } from 'components/forms/Autocomplete'
22
import FormRow from 'components/forms/FormRow'
33
import { useEffect, useMemo, useState } from 'react'
44
import { useFormContext } from 'react-hook-form'
5-
import { GetAllAplWorkloadNamesApiResponse, useGetK8SWorkloadPodLabelsQuery } from 'redux/otomiApi'
5+
import { GetAllWorkloadNamesApiResponse, useGetK8SPodLabelsForWorkloadQuery } from 'redux/otomiApi'
66
import { getDefaultPodLabel, getInitialActiveWorkloadTarget } from './NetworkPolicyPodLabelMatchHelper'
77

88
interface Props {
9-
aplWorkloads: GetAllAplWorkloadNamesApiResponse
9+
aplWorkloads: GetAllWorkloadNamesApiResponse
1010
teamId: string
1111
prefixName: string
1212
showBanner?: () => void
@@ -60,7 +60,7 @@ export default function NetworkPolicyTargetLabelRow({
6060
const selectedWorkloadOption = workloadOptions?.find((o) => o.name === activeWorkload) || null
6161

6262
// fetch the label→value map for that pod spec
63-
const { data: podLabels } = useGetK8SWorkloadPodLabelsQuery(
63+
const { data: podLabels } = useGetK8SPodLabelsForWorkloadQuery(
6464
{ teamId, workloadName: activeWorkload, namespace: `team-${teamId}` },
6565
{ skip: !activeWorkload },
6666
)

‎src/pages/secrets/overview/SecretOverviewPage.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { getStatus } from 'components/Workloads'
1111
import InformationBanner from 'components/InformationBanner'
1212
import { skipToken } from '@reduxjs/toolkit/dist/query'
1313
import { RouteComponentProps } from 'react-router-dom'
14-
import { useGetAllSealedSecretsQuery, useGetSealedSecretsQuery } from 'redux/otomiApi'
14+
import { useGetAllSealedSecretsQuery, useGetTeamSealedSecretsQuery } from 'redux/otomiApi'
1515
import { useAppSelector } from 'redux/hooks'
1616
import { useSocket } from 'providers/Socket'
1717

@@ -51,7 +51,7 @@ export default function SecretOverviewPage({
5151
isLoading: isLoadingTeamSealedSecrets,
5252
isFetching: isFetchingTeamSealedSecrets,
5353
refetch: refetchTeamSealedSecrets,
54-
} = useGetSealedSecretsQuery({ teamId }, { skip: !teamId })
54+
} = useGetTeamSealedSecretsQuery({ teamId }, { skip: !teamId })
5555

5656
const isDirty = useAppSelector(({ global: { isDirty } }) => isDirty)
5757
useEffect(() => {

‎src/pages/services/create-edit/ServicesCreateEditPage.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import {
1212
useDeleteAplServiceMutation,
1313
useEditAplServiceMutation,
1414
useGetAplServiceQuery,
15-
useGetSealedSecretsQuery,
15+
useGetK8SServicesQuery,
1616
useGetSettingsInfoQuery,
17-
useGetTeamK8SServicesQuery,
17+
useGetTeamSealedSecretsQuery,
1818
} from 'redux/otomiApi'
1919
import { useTranslation } from 'react-i18next'
2020
import { useAppSelector } from 'redux/hooks'
@@ -92,15 +92,15 @@ export default function ServicesCreateEditPage({
9292
isFetching: isFetchingK8sServices,
9393
isError: isErrorK8sServices,
9494
refetch: refetchK8sServices,
95-
} = useGetTeamK8SServicesQuery({ teamId })
95+
} = useGetK8SServicesQuery({ teamId })
9696

9797
const {
9898
data: teamSealedSecrets,
9999
isLoading: isLoadingTeamSecrets,
100100
isFetching: isFetchingTeamSecrets,
101101
isError: isErrorTeamSecrets,
102102
refetch: refetchTeamSecrets,
103-
} = useGetSealedSecretsQuery({ teamId }, { skip: !teamId })
103+
} = useGetTeamSealedSecretsQuery({ teamId }, { skip: !teamId })
104104
const {
105105
data: settingsInfo,
106106
isLoading: isLoadingSettingsInfo,

0 commit comments

Comments
 (0)