Workspace trust (#12)

Add untrustedWorkspaces support
TranquilMarmot · Jun 13, 2021 · 995bd42 · 995bd42
1 parent e715fb3
commit 995bd42
Show file tree

Hide file tree

Showing 10 changed files with 10,571 additions and 11,325 deletions.
diff --git a/loom-editor/package-lock.json b/loom-editor/package-lock.json
diff --git a/loom-editor/package.json b/loom-editor/package.json
@@ -3,13 +3,13 @@
   "version": "1.0.3",
   "private": true,
   "dependencies": {
-    "@emotion/babel-plugin": "^11.1.2",
-    "@emotion/react": "^11.1.4",
+    "@emotion/babel-plugin": "^11.3.0",
+    "@emotion/react": "^11.4.0",
     "d3": "^5.16.0",
     "loom-common": "file:../loom-common/out",
     "react-d3-graph": "^2.6.0",
-    "react-hotkeys-hook": "^3.0.3",
-    "react-scripts": "4.0.1",
+    "react-hotkeys-hook": "^3.3.1",
+    "react-scripts": "^4.0.3",
     "typesafe-actions": "^5.1.0"
   },
   "scripts": {

diff --git a/loom-editor/src/components/NodeGraph.tsx b/loom-editor/src/components/NodeGraph.tsx
@@ -71,7 +71,7 @@ const graphConfig: Partial<GraphConfiguration<GraphNode, GraphLink>> = {
     mouseCursor: "grab",
     symbolType: "square",
     viewGenerator: (node) => (
-      <NodeGraphView node={(node as unknown) as YarnGraphNode} />
+      <NodeGraphView node={node as unknown as YarnGraphNode} />
     ),
     strokeWidth: 3.0,
   },

diff --git a/loom-editor/src/components/NodeGraphView/NodeColorChooser.tsx b/loom-editor/src/components/NodeGraphView/NodeColorChooser.tsx
@@ -42,37 +42,35 @@ interface NodeGraphViewColorChooserProps {
   nodeTitle: string;
 }
 
-const NodeGraphViewColorChooser: FunctionComponent<NodeGraphViewColorChooserProps> = ({
-  onClose,
-  nodeTitle,
-}) => {
-  const onChooseColor = (colorIndex: number) => {
-    window.vsCodeApi.postMessage(setNodeColor(nodeTitle, colorIndex));
-    onClose();
-  };
+const NodeGraphViewColorChooser: FunctionComponent<NodeGraphViewColorChooserProps> =
+  ({ onClose, nodeTitle }) => {
+    const onChooseColor = (colorIndex: number) => {
+      window.vsCodeApi.postMessage(setNodeColor(nodeTitle, colorIndex));
+      onClose();
+    };
 
-  return (
-    <div css={containerStyle} data-testid="node-title-color-chooser">
-      <div css={buttonContainerStyle}>
-        {nodeColors.map((color, index) => (
-          <button
-            onClick={() => onChooseColor(index)}
-            key={color}
-            aria-label={`Choose color ${index}`}
-            css={css`
-              ${buttonStyle}
-              background-color: ${color};
-            `}
-          >
-            {" "}
-          </button>
-        ))}
+    return (
+      <div css={containerStyle} data-testid="node-title-color-chooser">
+        <div css={buttonContainerStyle}>
+          {nodeColors.map((color, index) => (
+            <button
+              onClick={() => onChooseColor(index)}
+              key={color}
+              aria-label={`Choose color ${index}`}
+              css={css`
+                ${buttonStyle}
+                background-color: ${color};
+              `}
+            >
+              {" "}
+            </button>
+          ))}
+        </div>
+        <button css={cancelButtonStyle} onClick={onClose}>
+          Cancel
+        </button>
       </div>
-      <button css={cancelButtonStyle} onClick={onClose}>
-        Cancel
-      </button>
-    </div>
-  );
-};
+    );
+  };
 
 export default NodeGraphViewColorChooser;
diff --git a/loom-extension/package.json b/loom-extension/package.json
@@ -93,6 +93,11 @@
       }
     ]
   },
+  "capabilities": {
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+  },
   "scripts": {
     "vscode:prepublish": "npm run build",
     "build": "rm -rf out && npm run compile && cd ../loom-editor && cp -r ./build ../loom-extension/out",

diff --git a/loom-extension/src/LoomEditorProvider.test.ts b/loom-extension/src/LoomEditorProvider.test.ts
@@ -7,9 +7,9 @@ import { parseYarnFile } from "loom-common/YarnParser";
 const vscodeMock = require("../__mocks__/vscode");
 
 describe("LoomEditorProvider", () => {
-  const mockContext: vscode.ExtensionContext = ({
+  const mockContext: vscode.ExtensionContext = {
     extensionPath: "some-extension-path",
-  } as unknown) as vscode.ExtensionContext;
+  } as unknown as vscode.ExtensionContext;
 
   const exampleYarnFile = `title: Start
 tags: 
@@ -49,16 +49,16 @@ A: HAHAHA
   beforeEach(() => {
     provider = new LoomEditorProvider(mockContext);
 
-    provider.document = ({
+    provider.document = {
       getText: () => exampleYarnFile,
       uri: "some-document-uri",
-    } as unknown) as vscode.TextDocument;
+    } as unknown as vscode.TextDocument;
 
-    provider.webviewPanel = ({
+    provider.webviewPanel = {
       webview: {
         postMessage: jest.fn(),
       } as any,
-    } as unknown) as vscode.WebviewPanel;
+    } as unknown as vscode.WebviewPanel;
 
     provider.nodes = parseYarnFile(exampleYarnFile);
   });

diff --git a/loom-extension/src/LoomMessageListener.test.ts b/loom-extension/src/LoomMessageListener.test.ts
@@ -34,15 +34,15 @@ describe("LoomMessageListener", () => {
 
   beforeEach(() => {
     // we re-create this before each test since the tests can end up mutating it
-    mockEditor = ({
+    mockEditor = {
       nodes: mockNodes,
       webviewPanel: {}, // needs to be defined or errors are thrown
       updateNode: jest.fn(),
       deleteNode: jest.fn(),
       addNewNode: jest.fn(),
       renameNode: jest.fn(),
       addTagsToNode: jest.fn(),
-    } as unknown) as LoomEditorProvider;
+    } as unknown as LoomEditorProvider;
   });
 
   afterEach(() => {
@@ -108,9 +108,8 @@ describe("LoomMessageListener", () => {
   describe("confirmAndDeleteNode", () => {
     it("deletes if the value chosen is Yes", () => {
       // this will mock the information response immediately returning "Yes"
-      const mockedSetInformationMessage = vscodeMock.__setInformationMessageResponse(
-        "Yes"
-      );
+      const mockedSetInformationMessage =
+        vscodeMock.__setInformationMessageResponse("Yes");
 
       LoomMessageListener.confirmAndDeleteNode(mockNodeTitle, mockEditor);
 
@@ -123,9 +122,8 @@ describe("LoomMessageListener", () => {
 
     it("does not delete if the value chosen is not Yes", () => {
       // this will mock the information response immediately returning "No"
-      const mockedSetInformationMessage = vscodeMock.__setInformationMessageResponse(
-        "No"
-      );
+      const mockedSetInformationMessage =
+        vscodeMock.__setInformationMessageResponse("No");
 
       LoomMessageListener.confirmAndDeleteNode(mockNodeTitle, mockEditor);
 
@@ -140,9 +138,8 @@ describe("LoomMessageListener", () => {
     it("adds a new node", () => {
       const newNodeName = "New Node";
 
-      const mockedInputBoxResponse = vscodeMock.__setInputBoxResponse(
-        newNodeName
-      );
+      const mockedInputBoxResponse =
+        vscodeMock.__setInputBoxResponse(newNodeName);
 
       LoomMessageListener.askForNameAndAddNewNode(mockEditor);
 
@@ -164,9 +161,8 @@ describe("LoomMessageListener", () => {
         },
       ];
 
-      const mockedInputBoxResponse = vscodeMock.__setInputBoxResponse(
-        existingNodeName
-      );
+      const mockedInputBoxResponse =
+        vscodeMock.__setInputBoxResponse(existingNodeName);
 
       LoomMessageListener.askForNameAndAddNewNode(mockEditor);
 
@@ -186,9 +182,8 @@ describe("LoomMessageListener", () => {
     it("renames nodes", () => {
       const newNodeName = "New Node Name";
 
-      const mockedInputBoxResponse = vscodeMock.__setInputBoxResponse(
-        newNodeName
-      );
+      const mockedInputBoxResponse =
+        vscodeMock.__setInputBoxResponse(newNodeName);
 
       LoomMessageListener.askForNameAndRenameNode(mockEditor, mockNodeTitle);
 
@@ -219,9 +214,8 @@ describe("LoomMessageListener", () => {
       ];
 
       // trying to rename mockNodeTitle -> existingNodeName
-      const mockedInputBoxResponse = vscodeMock.__setInputBoxResponse(
-        existingNodeName
-      );
+      const mockedInputBoxResponse =
+        vscodeMock.__setInputBoxResponse(existingNodeName);
 
       LoomMessageListener.askForNameAndRenameNode(mockEditor, mockNodeTitle);
 
@@ -263,13 +257,13 @@ describe("LoomMessageListener", () => {
      * on to the function passed in to it by `listenForMessages`.
      */
     const createMockWebviewWithMessage = (message: EditorActions) => {
-      const mockWebviewPanel: WebviewPanel = ({
+      const mockWebviewPanel: WebviewPanel = {
         webview: {
           onDidReceiveMessage: (fn: (message: EditorActions) => void) => {
             fn(message);
           },
         } as any,
-      } as unknown) as WebviewPanel;
+      } as unknown as WebviewPanel;
 
       return mockWebviewPanel;
     };

diff --git a/loom-extension/src/TemporaryFiles.test.ts b/loom-extension/src/TemporaryFiles.test.ts
@@ -31,9 +31,9 @@ describe("TemporaryFiles", () => {
   const mockOpenYarnFileHash = "33bde1ae455211803e3b3ed8996e7dea";
 
   // mock VSCode TextDocument
-  const mockTextDocument: vscode.TextDocument = ({
+  const mockTextDocument: vscode.TextDocument = {
     uri: vscode.Uri.file(mockOpenYarnFileName),
-  } as unknown) as vscode.TextDocument;
+  } as unknown as vscode.TextDocument;
 
   describe("getTemporaryFolderPath", () => {
     it("generates a path with the workspace name if a workspace is open", () => {
@@ -68,9 +68,9 @@ describe("TemporaryFiles", () => {
       tags: "",
     };
 
-    const mockEditor: LoomEditorProvider = ({
+    const mockEditor: LoomEditorProvider = {
       document: mockTextDocument,
-    } as unknown) as LoomEditorProvider;
+    } as unknown as LoomEditorProvider;
 
     it("creates temporary documents", () => {
       const expectedMockFilePath = join(
@@ -145,9 +145,9 @@ describe("TemporaryFiles", () => {
     });
 
     it("does not un-watch files belonging to a different document", () => {
-      const otherMockTextDocument: vscode.TextDocument = ({
+      const otherMockTextDocument: vscode.TextDocument = {
         uri: vscode.Uri.file("/some-other-file.yarn"),
-      } as unknown) as vscode.TextDocument;
+      } as unknown as vscode.TextDocument;
 
       const mockTemporaryFiles: TemporaryFile[] = [
         {