From b2f51495274d27da44394de4e829619cfac512ff Mon Sep 17 00:00:00 2001 From: ajnart Date: Thu, 1 Dec 2022 01:35:17 +0900 Subject: [PATCH] Ping module overall Removed useless code leftover --- .../en/layout/add-service-app-shelf.json | 6 ---- src/components/AppShelf/AddAppShelfItem.tsx | 34 ++----------------- src/modules/ping/PingModule.tsx | 4 +-- src/tools/types.ts | 22 ------------ 4 files changed, 4 insertions(+), 62 deletions(-) diff --git a/public/locales/en/layout/add-service-app-shelf.json b/public/locales/en/layout/add-service-app-shelf.json index 735110906..ee5d2676e 100644 --- a/public/locales/en/layout/add-service-app-shelf.json +++ b/public/locales/en/layout/add-service-app-shelf.json @@ -113,12 +113,6 @@ "advancedOptions": { "title": "Advanced options", "form": { - "httpStatusCodes": { - "label": "HTTP Status Codes", - "placeholder": "Select valid status codes", - "clearButtonLabel": "Clear selection", - "nothingFound": "Nothing found" - }, "openServiceInNewTab": { "label": "Open service in new tab" }, diff --git a/src/components/AppShelf/AddAppShelfItem.tsx b/src/components/AppShelf/AddAppShelfItem.tsx index 01dd3da81..3b89d1c85 100644 --- a/src/components/AppShelf/AddAppShelfItem.tsx +++ b/src/components/AppShelf/AddAppShelfItem.tsx @@ -7,7 +7,6 @@ import { Image, LoadingOverlay, Modal, - MultiSelect, PasswordInput, Select, Space, @@ -25,7 +24,7 @@ import { useTranslation } from 'next-i18next'; import { useEffect, useState } from 'react'; import { v4 as uuidv4 } from 'uuid'; import { useConfig } from '../../tools/state'; -import { tryMatchPort, ServiceTypeList, StatusCodes, Config } from '../../tools/types'; +import { tryMatchPort, ServiceTypeList, Config } from '../../tools/types'; import apiKeyPaths from './apiKeyPaths.json'; import Tip from '../layout/Tip'; @@ -121,7 +120,6 @@ export function AddAppShelfItemForm(props: AddAppShelfItemFormProps) { password: props.password ?? undefined, openedUrl: props.openedUrl ?? undefined, ping: props.ping ?? true, - status: props.status ?? ['200'], newTab: props.newTab ?? true, }, validate: { @@ -139,12 +137,6 @@ export function AddAppShelfItemForm(props: AddAppShelfItemFormProps) { } return null; }, - status: (value: string[]) => { - if (!value.length) { - return t('modal.form.validation.noStatusCodeSelected'); - } - return null; - }, }, }); @@ -190,12 +182,6 @@ export function AddAppShelfItemForm(props: AddAppShelfItemFormProps) { if (newForm.openedUrl === '') newForm.openedUrl = undefined; if (newForm.category === null) newForm.category = undefined; if (newForm.ping === true) newForm.ping = undefined; - if ( - (newForm.status.length === 1 && newForm.status[0] === '200') || - newForm.ping === false - ) { - delete newForm.status; - } // If service already exists, update it. if (config.services && config.services.find((s) => s.id === newForm.id)) { setConfig({ @@ -451,26 +437,10 @@ export function AddAppShelfItemForm(props: AddAppShelfItemFormProps) { - {form.values.ping && ( - - )} @@ -78,7 +78,7 @@ export default function PingComponent(props: any) { } > {null} diff --git a/src/tools/types.ts b/src/tools/types.ts index 68d8d75e7..83f5b24de 100644 --- a/src/tools/types.ts +++ b/src/tools/types.ts @@ -35,28 +35,6 @@ interface ConfigModule { }; } -export const StatusCodes = [ - { value: '200', label: '200 - OK', group: 'Sucessful responses' }, - { value: '204', label: '204 - No Content', group: 'Sucessful responses' }, - { value: '301', label: '301 - Moved Permanently', group: 'Redirection responses' }, - { value: '302', label: '302 - Found / Moved Temporarily', group: 'Redirection responses' }, - { value: '304', label: '304 - Not Modified', group: 'Redirection responses' }, - { value: '307', label: '307 - Temporary Redirect', group: 'Redirection responses' }, - { value: '308', label: '308 - Permanent Redirect', group: 'Redirection responses' }, - { value: '400', label: '400 - Bad Request', group: 'Client error responses' }, - { value: '401', label: '401 - Unauthorized', group: 'Client error responses' }, - { value: '403', label: '403 - Forbidden', group: 'Client error responses' }, - { value: '404', label: '404 - Not Found', group: 'Client error responses' }, - { value: '405', label: '405 - Method Not Allowed', group: 'Client error responses' }, - { value: '408', label: '408 - Request Timeout', group: 'Client error responses' }, - { value: '410', label: '410 - Gone', group: 'Client error responses' }, - { value: '429', label: '429 - Too Many Requests', group: 'Client error responses' }, - { value: '500', label: '500 - Internal Server Error', group: 'Server error responses' }, - { value: '502', label: '502 - Bad Gateway', group: 'Server error responses' }, - { value: '503', label: '503 - Service Unavailable', group: 'Server error responses' }, - { value: '054', label: '504 - Gateway Timeout Error', group: 'Server error responses' }, -]; - export const Targets = [ { value: '_blank', label: 'New Tab' }, { value: '_top', label: 'Same Window' },