[frontend/backend] edit input updated (#10383)

Author: ValentinBouzinFiligran

opencti-platform/opencti-front/src/components/saved_filters/SavedFilterButton.tsx

@@ -11,8 +11,8 @@ import { type SavedFiltersSelectionData } from 'src/components/saved_filters/Sav
 import Badge from '@mui/material/Badge';
 
 const savedFilterButtonEditMutation = graphql`
-  mutation SavedFilterButtonEditMutation($id: ID!, $filters: String!) {
-    savedFilterFieldPatch(id: $id, filters: $filters) {
+  mutation SavedFilterButtonEditMutation($id: ID!, $input: [EditInput!]!) {
+    savedFilterFieldPatch(id: $id, input: $input) {
       id
       name
       filters
@@ -50,10 +50,14 @@ const SavedFilterButton = ({ currentSavedFilter, setCurrentSavedFilter }: SavedF
 
   const handleEditSavedFilter = () => {
     if (!currentSavedFilter) return;
+    const input = {
+      key: 'filters',
+      value: [JSON.stringify(filters)],
+    };
     commit({
       variables: {
         id: currentSavedFilter.id,
-        filters: JSON.stringify(filters),
+        input,
       },
       onCompleted: () => {
         const newValue = {

opencti-platform/opencti-front/src/schema/relay.schema.graphql

@@ -9083,7 +9083,7 @@ type Mutation {
   disseminationListSend(id: ID!, input: DisseminationListSendInput!): Boolean
   savedFilterAdd(input: SavedFilterAddInput!): SavedFilter
   savedFilterDelete(id: ID!): ID
-  savedFilterFieldPatch(id: ID!, filters: String!): SavedFilter
+  savedFilterFieldPatch(id: ID!, input: [EditInput!]): SavedFilter
   requestAccessAdd(input: RequestAccessAddInput!): ID
   requestAccessConfigure(input: RequestAccessConfigureInput!): RequestAccessConfiguration
 }

opencti-platform/opencti-graphql/src/generated/graphql.ts

@@ -15535,8 +15535,8 @@ export type MutationSavedFilterDeleteArgs = {
 
 
 export type MutationSavedFilterFieldPatchArgs = {
-  filters: Scalars['String']['input'];
   id: Scalars['ID']['input'];
+  input?: InputMaybe<Array<EditInput>>;
 };
 
 
@@ -38059,7 +38059,7 @@ export type MutationResolvers<ContextType = any, ParentType extends ResolversPar
   ruleSetActivation?: Resolver<ResolversTypes['Rule'], ParentType, ContextType, RequireFields<MutationRuleSetActivationArgs, 'enable' | 'id'>>;
   savedFilterAdd?: Resolver<Maybe<ResolversTypes['SavedFilter']>, ParentType, ContextType, RequireFields<MutationSavedFilterAddArgs, 'input'>>;
   savedFilterDelete?: Resolver<Maybe<ResolversTypes['ID']>, ParentType, ContextType, RequireFields<MutationSavedFilterDeleteArgs, 'id'>>;
-  savedFilterFieldPatch?: Resolver<Maybe<ResolversTypes['SavedFilter']>, ParentType, ContextType, RequireFields<MutationSavedFilterFieldPatchArgs, 'filters' | 'id'>>;
+  savedFilterFieldPatch?: Resolver<Maybe<ResolversTypes['SavedFilter']>, ParentType, ContextType, RequireFields<MutationSavedFilterFieldPatchArgs, 'id'>>;
   sectorAdd?: Resolver<Maybe<ResolversTypes['Sector']>, ParentType, ContextType, RequireFields<MutationSectorAddArgs, 'input'>>;
   sectorEdit?: Resolver<Maybe<ResolversTypes['SectorEditMutations']>, ParentType, ContextType, RequireFields<MutationSectorEditArgs, 'id'>>;
   sessionKill?: Resolver<Maybe<ResolversTypes['ID']>, ParentType, ContextType, RequireFields<MutationSessionKillArgs, 'id'>>;

opencti-platform/opencti-graphql/src/modules/savedFilter/savedFilter-domain.ts

@@ -28,20 +28,19 @@ export const deleteSavedFilter = (context: AuthContext, user: AuthUser, savedFil
 };
 
 export const fieldPatchSavedFilter = async (context: AuthContext, user: AuthUser, args: MutationSavedFilterFieldPatchArgs) => {
-  const { id, filters } = args;
+  const { id, input } = args;
   const savedFilter = await findById(context, user, id);
   if (!savedFilter) throw FunctionalError('Saved filter cannot be found', { id });
 
-  const fullInput = [{ key: 'filters', value: [filters] }];
-  const { element } = await updateAttribute(context, user, id, ENTITY_TYPE_SAVED_FILTER, fullInput);
+  const { element } = await updateAttribute(context, user, id, ENTITY_TYPE_SAVED_FILTER, input);
 
   await publishUserAction({
     user,
     event_type: 'mutation',
     event_scope: 'update',
     event_access: 'administration',
     message: `updates \`filters\` for saved filters \`${element.name}\``,
-    context_data: { id, entity_type: ENTITY_TYPE_SAVED_FILTER, input: filters }
+    context_data: { id, entity_type: ENTITY_TYPE_SAVED_FILTER, input }
   });
 
   return element;

opencti-platform/opencti-graphql/src/modules/savedFilter/savedFilter.graphql

@@ -45,5 +45,5 @@ type Query {
 type Mutation {
     savedFilterAdd(input: SavedFilterAddInput!): SavedFilter @auth
     savedFilterDelete(id: ID!): ID @auth
-    savedFilterFieldPatch(id: ID!, filters: String!): SavedFilter @auth
+    savedFilterFieldPatch(id: ID!, input: [EditInput!]): SavedFilter @auth
 }

opencti-platform/opencti-graphql/tests/02-integration/02-resolvers/savedFilterResolver-test.ts

@@ -48,6 +48,17 @@ const DELETE_SAVED_FILTER_MUTATION = gql`
   }
 `;
 
+const EDIT_SAVED_FILTER_MUTATION = gql`
+  mutation savedFilterEdit($id: ID!, $input: [EditInput!]!) {
+    savedFilterFieldPatch(id: $id, input: $input) {
+      id
+      name
+      filters
+      scope
+    }
+  }
+`;
+
 describe('Saved Filter Resolver', () => {
   let createdFilterId: string = '';
   const newFilter = {
@@ -56,7 +67,7 @@ describe('Saved Filter Resolver', () => {
     filterGroups: [],
   };
 
-  describe('addSavedFilter', () => {
+  describe('savedFilterAdd', () => {
     describe('If I use the addSavedFilter mutation', () => {
       it('should create a filter', async () => {
         const input = {
@@ -104,7 +115,32 @@ describe('Saved Filter Resolver', () => {
     });
   });
 
-  describe('deleteSavedFilter', () => {
+  describe('savedFilterEdit', () => {
+    describe('If I edit the filter of a saved Filter', async () => {
+      const editedFilters = {
+        ...newFilter,
+        filters: [{ key: 'entity_type', operator: 'eq', mode: 'or', values: ['Task'] }]
+      };
+      const input = {
+        key: 'filters',
+        value: [JSON.stringify(editedFilters)],
+      };
+
+      it('should have a filter different than the initial value', async () => {
+        const result = await queryAsAdminWithSuccess({
+          query: EDIT_SAVED_FILTER_MUTATION,
+          variables: {
+            id: createdFilterId,
+            input,
+          },
+        });
+
+        expect(result?.data?.savedFilterFieldPatch?.filters).not.equal(JSON.stringify(newFilter));
+      });
+    });
+  });
+
+  describe('savedFilterDelete', () => {
     describe('If I take the last created filter', () => {
       it('should have found the filter', async () => {
         const savedFilter = await elLoadById(testContext, ADMIN_USER, createdFilterId);