Merge branch 'master' into reset-error

libs/remix-ui/workspace/src/lib/actions/workspace.ts

@@ -4,9 +4,11 @@ import axios, { AxiosResponse } from 'axios'
 import { addInputFieldSuccess, createWorkspaceError, createWorkspaceRequest, createWorkspaceSuccess, displayNotification, fetchWorkspaceDirectoryError, fetchWorkspaceDirectoryRequest, fetchWorkspaceDirectorySuccess, hideNotification, setCurrentWorkspace, setDeleteWorkspace, setMode, setReadOnlyMode, setRenameWorkspace } from './payload'
 import { checkSlash, checkSpecialChars } from '@remix-ui/helper'
 
+import { JSONStandardInput } from '../types'
 import { examples } from '../templates/examples'
 import { QueryParams } from '@remix-project/remix-lib'
 
+
 const LOCALHOST = ' - connect to localhost - '
 const NO_WORKSPACE = ' - none - '
 const queryParams = new QueryParams()
@@ -90,14 +92,24 @@ export const loadWorkspacePreset = async (template: 'gist-template' | 'code-temp
 
         path = 'contract-' + hash.replace('0x', '').substring(0, 10) + '.sol'
         content = atob(params.code)
-          await workspaceProvider.set(path, content)
+        workspaceProvider.set(path, content)
       }
       if (params.url) {
         const data = await plugin.call('contentImport', 'resolve', params.url)
 
         path = data.cleanUrl
         content = data.content
-          await workspaceProvider.set(path, content)
+        if (content && typeof content === 'object') {
+          const standardInput = content as JSONStandardInput
+          if (standardInput.language && standardInput.language === "Solidity" && standardInput.sources) {
+            for (const [fname, source] of Object.entries(standardInput.sources)) {
+              await workspaceProvider.set(fname, source.content)
+            }
+          }
+          return Object.keys(standardInput.sources)[0]
+        } else {
+          workspaceProvider.set(path, content)
+        }
       }
       return path
     } catch (e) {

libs/remix-ui/workspace/src/lib/types/index.ts

@@ -2,7 +2,16 @@ import React from 'react'
 import { customAction } from '@remixproject/plugin-api/lib/file-system/file-panel'
 
 export type action = { name: string, type?: Array<'folder' | 'gist' | 'file'>, path?: string[], extension?: string[], pattern?: string[], id: string, multiselect: boolean, label: string, sticky?: boolean }
-
+export interface JSONStandardInput {
+  language: "Solidity";
+  settings?: any,
+  sources: {
+    [globalName: string]: {
+      keccak256?: string;
+      content: string;
+    },
+  };
+}
 export type MenuItems = action[]
 export interface WorkspaceProps {
   plugin: {