(fix) fix error messages on backend, remove search, add title on open…

… api spec
metlo-labs · Sep 6, 2022 · 6a10a79 · 6a10a79
1 parent 3cab5e0
commit 6a10a79
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 41 deletions.
diff --git a/backend/src/services/spec/index.ts b/backend/src/services/spec/index.ts
@@ -32,6 +32,7 @@ import {
 } from "./utils"
 import { AlertService } from "services/alert"
 import { DatabaseService } from "services/database"
+import Error404NotFound from "errors/error-404-not-found"
 
 export class SpecService {
   static async getSpec(specName: string): Promise<OpenApiSpecResponse> {
@@ -85,12 +86,12 @@ export class SpecService {
       name: fileName,
     })
     if (!openApiSpec) {
-      throw new Error400BadRequest(
+      throw new Error404NotFound(
         "No spec file with the provided name exists.",
       )
     }
     if (openApiSpec.isAutoGenerated) {
-      throw new Error400BadRequest("Can't delete auto generated spec.")
+      throw new Error409Conflict("Can't delete auto generated spec.")
     }
     for (let i = 0; i < specEndpoints.length; i++) {
       const endpoint = specEndpoints[i]

diff --git a/frontend/src/components/Endpoint/SpecComponent.tsx b/frontend/src/components/Endpoint/SpecComponent.tsx
@@ -3,21 +3,17 @@ import {
   Box,
   useColorModeValue,
   HStack,
-  InputGroup,
-  InputLeftElement,
-  Input,
+  Heading,
   Tag,
   IconButton,
   Select,
 } from "@chakra-ui/react"
-import debounce from "lodash/debounce"
 import { saveAs } from "file-saver"
 import YAML from "yaml"
 import JsYaml from "js-yaml"
 import Highlight, { defaultProps } from "prism-react-renderer"
 import darkTheme from "prism-react-renderer/themes/duotoneDark"
 import lightTheme from "prism-react-renderer/themes/github"
-import { GoSearch } from "@react-icons/all-files/go/GoSearch"
 import { FiDownload } from "@react-icons/all-files/fi/FiDownload"
 import { ApiEndpointDetailed } from "@common/types"
 import { SpecExtension } from "@common/enums"
@@ -39,7 +35,6 @@ const SpecComponent: React.FC<SpecComponentProps> = ({ endpoint }) => {
   const [currExtension, setCurrExtension] = useState<SpecExtension>(
     endpoint.openapiSpec.extension,
   )
-  const [searchQuery, setSearchQuery] = useState<string>("")
 
   const blob = new Blob([specString], {
     type: EXTENSION_TO_TYPE[currExtension],
@@ -67,8 +62,6 @@ const SpecComponent: React.FC<SpecComponentProps> = ({ endpoint }) => {
     saveAs(blob, `${endpoint?.openapiSpec?.name}.${currExtension}`)
   }
 
-  const debounceSearch = debounce(setSearchQuery, 500)
-
   return (
     <Box w={{ base: "full", lg: "50%" }} h="full">
       <HStack
@@ -79,20 +72,9 @@ const SpecComponent: React.FC<SpecComponentProps> = ({ endpoint }) => {
         justifyContent="space-between"
       >
         <HStack spacing="4">
-          <InputGroup
-            w={{ base: "150px", sm: "200px", lg: "150px", xl: "250px" }}
-          >
-            <InputLeftElement pointerEvents="none">
-              <GoSearch />
-            </InputLeftElement>
-            <Input
-              onChange={e => debounceSearch(e.target.value)}
-              type="text"
-              placeholder="Search"
-            />
-          </InputGroup>
+          <Heading size="md">{endpoint?.openapiSpec?.name}</Heading>
           {endpoint?.openapiSpec?.isAutoGenerated && (
-            <Tag rounded="3xl" size="lg" colorScheme="orange">
+            <Tag rounded="3xl" size="md" colorScheme="blue">
               Generated
             </Tag>
           )}
@@ -155,24 +137,9 @@ const SpecComponent: React.FC<SpecComponentProps> = ({ endpoint }) => {
                     {i + 1}
                   </span>
                   <span style={{ display: "table-cell" }}>
-                    {line.map((token, key) => {
-                      const matchedString =
-                        searchQuery && token.content.includes(searchQuery)
-                      const color = matchedString
-                        ? "var(--chakra-colors-orange-100)"
-                        : "transparent"
-                      return (
-                        <div
-                          key={key}
-                          style={{
-                            display: "inline-block",
-                            backgroundColor: color,
-                          }}
-                        >
-                          <span {...getTokenProps({ token, key })} />
-                        </div>
-                      )
-                    })}
+                    {line.map((token, key) => (
+                      <span {...getTokenProps({ token, key })} />
+                    ))}
                   </span>
                 </pre>
               ))}