🐛 Fixed bug

graphql-editor · Sep 28, 2023 · a0c56f7 · a0c56f7
1 parent 66bb7a4
commit a0c56f7
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 32 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/editor-worker/package.json b/packages/editor-worker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "graphql-editor-worker",
-  "version": "6.9.6",
+  "version": "6.9.7",
   "private": false,
   "license": "MIT",
   "description": "Visual node editor for GraphQL",

diff --git a/packages/editor-worker/src/validation.ts b/packages/editor-worker/src/validation.ts
@@ -50,6 +50,11 @@ const moveErrorsByLibraryPadding = (libraries: string) => {
 const allowMultipleDirectivesAtLocation = (s: string) => {
   return !s.match(new RegExp(/directive(.*)can only be used once/));
 };
+
+const allowNoSchemaDefinition = (s: string) => {
+  return !s.includes("Query root type must be provided");
+};
+
 export const catchSchemaErrors = (
   schema: string,
   libraries = ""
@@ -72,19 +77,23 @@ export const catchSchemaErrors = (
     if (errors.length > 0) {
       return errors
         .filter((e) => allowMultipleDirectivesAtLocation(e.message))
+        .filter((e) => allowNoSchemaDefinition(e.message))
         .map((e) => {
           return paddingFunction({
             __typename: "local",
             error: e,
           });
         });
     }
-    return validateTypes(code).map((e) => {
-      return paddingFunction({
-        __typename: "local",
-        error: e,
+    return validateTypes(code)
+      .filter((e) => allowMultipleDirectivesAtLocation(e.message))
+      .filter((e) => allowNoSchemaDefinition(e.message))
+      .map((e) => {
+        return paddingFunction({
+          __typename: "local",
+          error: e,
+        });
       });
-    });
   } catch (error) {
     if (
       typeof error === "object" &&

diff --git a/packages/editor/package.json b/packages/editor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "graphql-editor",
-  "version": "6.9.6",
+  "version": "6.9.7",
   "private": false,
   "license": "MIT",
   "description": "Visual node editor for GraphQL",
@@ -45,7 +45,7 @@
     "file-saver": "^2.0.5",
     "framer-motion": "^10.12.16",
     "fuzzyjs": "^5.0.1",
-    "graphql-editor-worker": "^6.9.6",
+    "graphql-editor-worker": "^6.9.7",
     "graphql-js-tree": "^1.0.5",
     "graphql-language-service": "3.1.4",
     "html-to-image": "^1.10.8",

diff --git a/packages/editor/src/shared/errors/ErrorItem.tsx b/packages/editor/src/shared/errors/ErrorItem.tsx
@@ -10,7 +10,7 @@ type ErrorItemProps = {
 };
 
 const Main = styled(Stack)`
-  color: ${({ theme }) => theme.error.light};
+  color: ${({ theme }) => theme.text.default};
   font-size: 0.75rem;
 `;
 

diff --git a/packages/editor/src/shared/errors/ErrorsList.tsx b/packages/editor/src/shared/errors/ErrorsList.tsx
@@ -1,7 +1,12 @@
-import React from "react";
+import React, { useState } from "react";
 import { fontFamilySans } from "@/vars";
 import styled from "@emotion/styled";
-import { Stack, Typography } from "@aexol-studio/styling-system";
+import {
+  ChevronDownDouble,
+  ChevronUpDouble,
+  Stack,
+  Typography,
+} from "@aexol-studio/styling-system";
 
 export const ErrorWrapper = styled(Stack)`
   font-family: ${fontFamilySans};
@@ -29,10 +34,15 @@ const List = styled(Stack)`
   padding: 0.5rem;
 `;
 const SmallLabel = styled(Typography)``;
+const IconBox = styled(Stack)`
+  cursor: pointer;
+  color: ${(p) => p.theme.text.default};
+`;
 
 export const ErrorsList: React.FC<{
   children?: React.ReactNode;
 }> = ({ children }) => {
+  const [shrink, setShrink] = useState(false);
   return (
     <ErrorWrapper
       direction="column"
@@ -41,16 +51,24 @@ export const ErrorsList: React.FC<{
       onClick={(e) => e.stopPropagation()}
     >
       <Errors gap="0.5rem" direction="column">
-        <SmallLabel
-          variant="caption"
-          textTransform="uppercase"
-          fontWeight={700}
-        >
-          problems
-        </SmallLabel>
-        <List gap="0.25rem" direction="column">
-          {children}
-        </List>
+        <Stack justify="between">
+          <SmallLabel
+            variant="caption"
+            textTransform="uppercase"
+            fontWeight={700}
+          >
+            problems
+          </SmallLabel>
+          <IconBox align="center" onClick={() => setShrink(!shrink)}>
+            {!shrink && <ChevronDownDouble />}
+            {shrink && <ChevronUpDouble />}
+          </IconBox>
+        </Stack>
+        {!shrink && (
+          <List gap="0.25rem" direction="column">
+            {children}
+          </List>
+        )}
       </Errors>
     </ErrorWrapper>
   );

diff --git a/packages/sandbox/package.json b/packages/sandbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sandbox",
-  "version": "6.9.6",
+  "version": "6.9.7",
   "private": false,
   "license": "MIT",
   "description": "Visual node editor for GraphQL",
@@ -48,7 +48,7 @@
     "@aexol-studio/styling-system": "^0.0.8",
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",
-    "graphql-editor": "^6.9.6",
+    "graphql-editor": "^6.9.7",
     "graphql-js-tree": "^0.1.6",
     "socket.io-client": "^4.7.2"
   },

diff --git a/packages/socket-live-test/package.json b/packages/socket-live-test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "socket-live-test",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "testing editor live",
   "main": "index.js",
   "type": "module",

diff --git a/packages/svg-ts-sync/package.json b/packages/svg-ts-sync/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svg-ts-sync",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "private": false,
   "license": "MIT",
   "description": "Sync folders with svg's to react typescript components",