Merge pull request #77 from SquirrelCorporation/fix-protected-directory

[BUG] Fix protected directory
SquirrelCorporation · Jul 3, 2024 · 3dcdef5 · 3dcdef5
2 parents 9fb0092 + 8af79de
commit 3dcdef5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/client/src/pages/Playbooks/components/DirectoryTreeView.tsx b/client/src/pages/Playbooks/components/DirectoryTreeView.tsx
@@ -106,6 +106,7 @@ const DirectoryTreeView: React.FC<DirectoryTreeViewProps> = (props) => {
                 }}
                 callbacks={props.callbacks}
                 remoteRootNode={node.remoteRootNode}
+                cannotDelete={!node.custom || node.rootNode}
               >
                 <Typography.Text
                   style={{ maxWidth: 150 - 10 * node.depth }}

diff --git a/client/src/pages/Playbooks/components/PlaybookDropdownMenu.tsx b/client/src/pages/Playbooks/components/PlaybookDropdownMenu.tsx
@@ -25,7 +25,7 @@ type PlaybookDropdownMenuType = {
 };
 
 type PlaybookDrownMenuItemType = {
-  fileType: DirectoryTree.CONSTANTS | 'any';
+  fileType: DirectoryTree.CONSTANTS | 'any' | 'deletable';
   playbookQuickRef?: string;
   icon?: React.JSX.Element;
   label: string;
@@ -49,7 +49,7 @@ const menuItems: PlaybookDrownMenuItemType[] = [
     label: 'Delete',
     icon: <DeleteOutlined />,
     key: '3',
-    fileType: 'any',
+    fileType: 'deletable',
   },
 ];
 
@@ -73,7 +73,7 @@ const PlaybookDropdownMenu: React.FC<PlaybookDropdownMenuType> = (props) => {
   const items = menuItems
     .filter(
       (e) =>
-        (e.fileType === 'any' && !props.cannotDelete) ||
+        (e.fileType === 'deletable' && !props.cannotDelete) ||
         e.fileType === props.type,
     )
     .map((e) => {

diff --git a/client/src/pages/Playbooks/components/TreeComponent.tsx b/client/src/pages/Playbooks/components/TreeComponent.tsx
@@ -2,15 +2,13 @@ import {
   SimpleIconsGit,
   StreamlineLocalStorageFolderSolid,
 } from '@/components/Icons/CustomIcons';
-import { Typography } from 'antd';
 import React, { ReactNode } from 'react';
 import {
   API,
   DirectoryTree,
   DirectoryTree as DT,
   Playbooks,
 } from 'ssm-shared-lib';
-import PlaybookDropdownMenu from './PlaybookDropdownMenu';
 
 export type ClientPlaybooksTrees = {
   isLeaf?: boolean;
@@ -83,11 +81,21 @@ export function recursiveTreeTransform(
           key: child.path,
           _name: child.name,
           nodeType: child.type,
+          rootNode: false,
           playbookRepository: {
             basePath: playbookRepository.basePath,
             name: playbookRepository.name,
             uuid: playbookRepository.uuid,
           },
+          // TODO ugly fix to prevent user breaking the system
+          custom:
+            (child as DirectoryTree.ExtendedTreeNode).custom === undefined &&
+            !child.path.includes(
+              '/server/src/ansible/00000000-0000-0000-0000-000000000000/agent',
+            ) &&
+            !child.path.includes(
+              '/server/src/ansible/00000000-0000-0000-0000-000000000000/device',
+            ),
           depth: depth,
           selectable: false,
           children: recursiveTreeTransform(
@@ -102,6 +110,7 @@ export function recursiveTreeTransform(
             key: child.path,
             _name: child.name,
             nodeType: DirectoryTree.CONSTANTS.FILE,
+            rootNode: false,
             playbookRepository: {
               basePath: playbookRepository.basePath,
               name: playbookRepository.name,
@@ -120,6 +129,7 @@ export function recursiveTreeTransform(
     newTree.push({
       key: node.path,
       _name: node.name,
+      rootNode: false,
       nodeType: DirectoryTree.CONSTANTS.FILE,
       playbookRepository: {
         basePath: playbookRepository.basePath,