Fix error when adding collaborator on Search, Report and Sigma (#23796)

Author: ousmaneo

graylog2-web-interface/src/components/permissions/EntityCreateShareFormGroup.test.tsx

@@ -73,12 +73,7 @@ describe('EntityCreateShareFormGroup', () => {
     render(<SUT />);
 
     await waitFor(() => {
-      expect(EntityShareActions.prepare).toHaveBeenCalledWith(
-        mockEntity.entityType,
-        '',
-        mockEntity.entityId,
-        undefined,
-      );
+      expect(EntityShareActions.prepare).toHaveBeenCalledWith(mockEntity.entityType, '', mockEntity.entityId, {});
     });
   });
 

graylog2-web-interface/src/components/permissions/EntityCreateShareFormGroup.tsx

@@ -81,11 +81,15 @@ const EntityCreateShareFormGroup = ({
   const defaultShareSelection = { granteeId: null, capabilityId: 'view' };
   const [disableSubmit, setDisableSubmit] = useState(entityShareState?.validationResults?.failed);
   const [shareSelection, setShareSelection] = useState<SelectionRequest>(defaultShareSelection);
-  const [entityShare, setEntityShare] = useState<Omit<EntitySharePayload, 'prepare_request'>>(null);
+  const [entityShare, setEntityShare] = useState<Omit<EntitySharePayload, 'prepare_request'>>(
+    defaultSharePayload ?? null,
+  );
   const PluggableEntityShareFormGroup = usePluggableEntityShareFormGroup();
 
   useEffect(() => {
-    EntityShareDomain.prepare(entityType, entityTitle, entityGRN, defaultSharePayload);
+    const { selected_collections: _, ...rest } = defaultSharePayload ?? {};
+
+    EntityShareDomain.prepare(entityType, entityTitle, entityGRN, rest);
   }, [entityType, entityTitle, entityGRN, defaultSharePayload]);
 
   const resetSelection = () => {
@@ -108,7 +112,6 @@ const EntityCreateShareFormGroup = ({
     return EntityShareDomain.prepare(entityType, entityTitle, entityGRN, payload).then((response) => {
       onSetEntityShare({ ...entityShare, selected_grantee_capabilities: newSelectedCapabilities });
       resetSelection();
-      setDisableSubmit(false);
 
       return response;
     });
@@ -195,7 +198,11 @@ const EntityCreateShareFormGroup = ({
             availableGrantees={entityShareState.availableGrantees}
           />
           {PluggableEntityShareFormGroup && (
-            <PluggableEntityShareFormGroup entityType={entityType} onChange={handleAdditionalFormChange} />
+            <PluggableEntityShareFormGroup
+              entityType={entityType}
+              onChange={handleAdditionalFormChange}
+              value={defaultSharePayload?.selected_collections || []}
+            />
           )}
         </>
       ) : (

graylog2-web-interface/src/views/components/searchbar/saved-search/SavedSearchForm.tsx

@@ -82,14 +82,16 @@ const SavedSearchForm = ({
           {pluggableSaveViewControls?.map(
             ({ component: Component, id }) => Component && <Component key={id} disabledViewCreation={disableSaveAs} />,
           )}
-          <EntityCreateShareFormGroup
-            description="Search for a User or Team to add as collaborator on this search."
-            entityType="search"
-            entityTitle=""
-            entityId={isCreateNew ? null : viewId}
-            dependenciesGRN={selectedStreamGRN}
-            onSetEntityShare={(payload) => setSharePayload(payload)}
-          />
+          {!disableSaveAs && (
+            <EntityCreateShareFormGroup
+              description="Search for a User or Team to add as collaborator on this search."
+              entityType="search"
+              entityTitle=""
+              entityId={isCreateNew ? null : viewId}
+              dependenciesGRN={selectedStreamGRN}
+              onSetEntityShare={(payload) => setSharePayload(payload)}
+            />
+          )}
           <ButtonToolbar>
             {!isCreateNew && (
               <Button