Merge pull request #80 from opencaesar/fix/53-webview-crash-context-menu

Fix/53-webview-crash-context-menu
opencaesar · May 15, 2024 · 97fd2e7 · 97fd2e7
2 parents af9cb54 + 5b046be
commit 97fd2e7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/build_deploy_vsix.yml b/.github/workflows/build_deploy_vsix.yml
@@ -10,8 +10,8 @@ jobs:
   build_vsix_file:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: '18.x'
       - name: Build VSIX File
@@ -27,8 +27,8 @@ jobs:
     needs: build_vsix_file
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: '18.x'
       - uses: actions/download-artifact@v3

diff --git a/.github/workflows/run_controller_test.yml b/.github/workflows/run_controller_test.yml
@@ -17,8 +17,8 @@ jobs:
   backend_tests:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: '18.x'
       - name: Run backend tests

diff --git a/view/src/components/Diagram/Diagram.tsx b/view/src/components/Diagram/Diagram.tsx
@@ -607,7 +607,8 @@ function Diagram({
         />
         <Background gap={12} size={1} />
       </ReactFlow>
-      {rightClick && (
+      {/* Check if rightClick and if layout.contextMenu exists */}
+      {rightClick && layout.contextMenu &&(
         <ContextMenu
           selectedElements={iriArray}
           top={coordinates.y}

diff --git a/view/src/components/Table/Table.tsx b/view/src/components/Table/Table.tsx
@@ -619,7 +619,7 @@ function Table({
           )}
         </tbody>
       </table>
-      {rightClick && (
+      {rightClick && layout.contextMenu && (
         <ContextMenu
           selectedElements={iriArray}
           top={coordinates.y}

diff --git a/view/src/components/Tree/Tree.tsx b/view/src/components/Tree/Tree.tsx
@@ -298,7 +298,7 @@ function Tree({
           </ArboristTree>
         )}
       </FillFlexParent>
-      {rightClick && (
+      {rightClick && layout.contextMenu && (
         <ContextMenu
           selectedElements={iriArray}
           top={coordinates.y}