Merge branch 'master' into feat/v3-support

asyncapi · Aug 7, 2023 · b988777 · b988777
2 parents 64832de + ea2b1e4
commit b988777
Show file tree

Hide file tree

Showing 4 changed files with 220 additions and 141 deletions.
diff --git a/apps/studio/package.json b/apps/studio/package.json
@@ -75,12 +75,12 @@
   },
   "devDependencies": {
     "@asyncapi/dotnet-nats-template": "^0.11.0",
-    "@asyncapi/go-watermill-template": "^0.2.34",
+    "@asyncapi/go-watermill-template": "^0.2.35",
     "@asyncapi/html-template": "^0.28.3",
     "@asyncapi/java-spring-cloud-stream-template": "^0.13.4",
     "@asyncapi/java-spring-template": "^0.29.0",
     "@asyncapi/java-template": "^0.2.1",
-    "@asyncapi/markdown-template": "^1.2.2",
+    "@asyncapi/markdown-template": "^1.3.2",
     "@asyncapi/nodejs-template": "^0.13.1",
     "@asyncapi/nodejs-ws-template": "^0.9.33",
     "@asyncapi/python-paho-template": "^0.2.13",

diff --git a/apps/studio/src/components/Editor/EditorDropdown.tsx b/apps/studio/src/components/Editor/EditorDropdown.tsx
@@ -39,6 +39,7 @@ export const EditorDropdown: React.FunctionComponent<EditorDropdownProps> = () =
     >
       <input
         type="file"
+        accept='.yaml, .yml, .json'
         style={{ position: 'fixed', top: '-100em' }}
         onChange={event => {
           toast.promise(editorSvc.importFile(event.target.files), {
@@ -53,7 +54,7 @@ export const EditorDropdown: React.FunctionComponent<EditorDropdownProps> = () =
             error: (
               <div>
                 <span className="block text-bold text-red-400">
-                Failed to import document.
+                Failed to import document. Maybe the file type is invalid.
                 </span>
               </div>
             ),

diff --git a/apps/studio/src/services/editor.service.tsx b/apps/studio/src/services/editor.service.tsx
@@ -131,6 +131,15 @@ export class EditorService extends AbstractService {
     if (!file) {
       return;
     }
+
+    // Check if file is valid (only JSON and YAML are allowed currently) ----Change afterwards as per the requirement
+    if (
+      file.type !== 'application/json' &&
+      file.type !== 'application/x-yaml' &&
+      file.type !== 'application/yaml'
+    ) {
+      throw new Error('Invalid file type');
+    }
 
     const fileReader = new FileReader();
     fileReader.onload = fileLoadedEvent => {