From 9169fd1293713668e53723fa65f6b1009aeb3b10 Mon Sep 17 00:00:00 2001 From: Thomas Camlong <49837342+ajnart@users.noreply.github.com> Date: Sun, 22 Jan 2023 23:20:48 +0900 Subject: [PATCH] =?UTF-8?q?Revert=20"=F0=9F=90=9B=20rename=20okStatus=20to?= =?UTF-8?q?=20statusCodes"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 41da97feaf352081ccb980f82881190e24c3fe48. --- .../Modals/EditAppModal/Tabs/NetworkTab/NetworkTab.tsx | 2 +- .../Components/Overview/AvailableElementsOverview.tsx | 2 +- src/components/Dashboard/Tiles/Apps/AppPing.tsx | 2 +- src/modules/Docker/ContainerActionBar.tsx | 2 +- src/tools/config/migrateConfig.ts | 2 +- src/types/app.ts | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/Dashboard/Modals/EditAppModal/Tabs/NetworkTab/NetworkTab.tsx b/src/components/Dashboard/Modals/EditAppModal/Tabs/NetworkTab/NetworkTab.tsx index 4d735a19f..7845c77d7 100644 --- a/src/components/Dashboard/Modals/EditAppModal/Tabs/NetworkTab/NetworkTab.tsx +++ b/src/components/Dashboard/Modals/EditAppModal/Tabs/NetworkTab/NetworkTab.tsx @@ -27,7 +27,7 @@ export const NetworkTab = ({ form }: NetworkTabProps) => { data={StatusCodes} clearable searchable - defaultValue={form.values.network.statusCodes} + defaultValue={form.values.network.okStatus} variant="default" {...form.getInputProps('network.statusCodes')} /> diff --git a/src/components/Dashboard/Modals/SelectElement/Components/Overview/AvailableElementsOverview.tsx b/src/components/Dashboard/Modals/SelectElement/Components/Overview/AvailableElementsOverview.tsx index 664d0a019..edb689821 100644 --- a/src/components/Dashboard/Modals/SelectElement/Components/Overview/AvailableElementsOverview.tsx +++ b/src/components/Dashboard/Modals/SelectElement/Components/Overview/AvailableElementsOverview.tsx @@ -95,7 +95,7 @@ export const AvailableElementTypes = ({ }, network: { enabledStatusChecker: true, - statusCodes: [200], + okStatus: [200], }, behaviour: { isOpeningNewTab: true, diff --git a/src/components/Dashboard/Tiles/Apps/AppPing.tsx b/src/components/Dashboard/Tiles/Apps/AppPing.tsx index 27052b398..3f2a8c925 100644 --- a/src/components/Dashboard/Tiles/Apps/AppPing.tsx +++ b/src/components/Dashboard/Tiles/Apps/AppPing.tsx @@ -19,7 +19,7 @@ export const AppPing = ({ app }: AppPingProps) => { queryKey: [`ping/${app.id}`], queryFn: async () => { const response = await fetch(`/api/modules/ping?url=${encodeURI(app.url)}`); - const isOk = app.network.statusCodes.includes(response.status); + const isOk = app.network.okStatus.includes(response.status); return { status: response.status, state: isOk ? 'online' : 'down', diff --git a/src/modules/Docker/ContainerActionBar.tsx b/src/modules/Docker/ContainerActionBar.tsx index cceb72bb9..6d1000025 100644 --- a/src/modules/Docker/ContainerActionBar.tsx +++ b/src/modules/Docker/ContainerActionBar.tsx @@ -178,7 +178,7 @@ export default function ContainerActionBar({ selected, reload }: ContainerAction }, network: { enabledStatusChecker: true, - statusCodes: [200], + okStatus: [200], }, behaviour: { isOpeningNewTab: true, diff --git a/src/tools/config/migrateConfig.ts b/src/tools/config/migrateConfig.ts index 0654918b1..4ef212c05 100644 --- a/src/tools/config/migrateConfig.ts +++ b/src/tools/config/migrateConfig.ts @@ -159,7 +159,7 @@ const migrateService = (oldService: serviceItem, areaType: AreaType): ConfigAppT }, network: { enabledStatusChecker: oldService.ping ?? true, - statusCodes: oldService.status?.map((str) => parseInt(str, 10)) ?? [200], + okStatus: oldService.status?.map((str) => parseInt(str, 10)) ?? [200], }, appearance: { iconUrl: migrateIcon(oldService.icon), diff --git a/src/types/app.ts b/src/types/app.ts index f3e865a3a..7edeadee9 100644 --- a/src/types/app.ts +++ b/src/types/app.ts @@ -22,7 +22,7 @@ interface AppBehaviourType { interface AppNetworkType { enabledStatusChecker: boolean; - statusCodes: number[]; + okStatus: number[]; } interface AppAppearanceType {