feat: make workspace permission first row deletable for workspace cre…

…ate (#151) (#154) (cherry picked from commit bb2d886) Signed-off-by: Lin Wang <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
ruanyl · Sep 14, 2023 · 5856461 · 5856461
1 parent 0f704e6
commit 5856461
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/plugins/workspace/public/components/workspace_creator/workspace_creator.tsx b/src/plugins/workspace/public/components/workspace_creator/workspace_creator.tsx
@@ -75,6 +75,7 @@ export const WorkspaceCreator = () => {
               application={application}
               onSubmit={handleWorkspaceFormSubmit}
               opType={WORKSPACE_OP_TYPE_CREATE}
+              permissionFirstRowDeletable
             />
           )}
         </EuiPageContent>

diff --git a/src/plugins/workspace/public/components/workspace_creator/workspace_form.tsx b/src/plugins/workspace/public/components/workspace_creator/workspace_form.tsx
@@ -112,13 +112,15 @@ interface WorkspaceFormProps {
   onSubmit?: (formData: WorkspaceFormSubmitData) => void;
   defaultValues?: WorkspaceFormData;
   opType?: string;
+  permissionFirstRowDeletable?: boolean;
 }
 
 export const WorkspaceForm = ({
   application,
   onSubmit,
   defaultValues,
   opType,
+  permissionFirstRowDeletable,
 }: WorkspaceFormProps) => {
   const workspaceId = defaultValues?.id;
   const workspaceNameReadOnly =
@@ -140,7 +142,7 @@ export const WorkspaceForm = ({
   >(
     defaultValues?.permissions && defaultValues.permissions.length > 0
       ? defaultValues.permissions
-      : [{}]
+      : []
   );
 
   const [formErrors, setFormErrors] = useState<WorkspaceFormErrors>({});
@@ -477,6 +479,7 @@ export const WorkspaceForm = ({
           errors={formErrors.permissions}
           value={permissionSettings}
           onChange={setPermissionSettings}
+          firstRowDeletable={permissionFirstRowDeletable}
         />
       </EuiPanel>
       <EuiSpacer />

diff --git a/...gins/workspace/public/components/workspace_creator/workspace_permission_setting_panel.tsx b/...gins/workspace/public/components/workspace_creator/workspace_permission_setting_panel.tsx
@@ -218,12 +218,14 @@ interface WorkspacePermissionSettingPanelProps {
   errors?: string[];
   value?: Array<Partial<WorkspacePermissionSetting>>;
   onChange?: (value: Array<Partial<WorkspacePermissionSetting>>) => void;
+  firstRowDeletable?: boolean;
 }
 
 export const WorkspacePermissionSettingPanel = ({
   errors,
   value,
   onChange,
+  firstRowDeletable,
 }: WorkspacePermissionSettingPanelProps) => {
   const valueRef = useRef(value);
   valueRef.current = value;
@@ -286,7 +288,7 @@ export const WorkspacePermissionSettingPanel = ({
             <WorkspacePermissionSettingInput
               {...item}
               index={index}
-              deletable={index !== 0}
+              deletable={firstRowDeletable || index !== 0}
               onDelete={handleDelete}
               onTypeChange={handleTypeChange}
               onGroupOrUserIdChange={handleGroupOrUserIdChange}