Просмотр исходного кода

Remove search filter as the server side is already getting userId and action group

arvid-e 5 месяцев назад
Родитель
Сommit
105c19dbce
2 измененных файлов с 2 добавлено и 17 удалено
  1. 0 11
      apps/app/src/interfaces/activity.ts
  2. 2 6
      apps/app/src/stores/recent-activity.ts

+ 0 - 11
apps/app/src/interfaces/activity.ts

@@ -684,17 +684,6 @@ export type ISearchFilter = {
 type SupportedRecentActivityAction =
 type SupportedRecentActivityAction =
   (typeof ActivityLogActions)[keyof typeof ActivityLogActions];
   (typeof ActivityLogActions)[keyof typeof ActivityLogActions];
 
 
-export type IRecentActivitySearchFilter = {
-  actions?: SupportedRecentActivityAction[];
-  usernames?: string[];
-  userIds?: string[];
-  dates?: {
-    startDate?: string;
-    endDate?: string;
-  };
-
-  targetModels?: string[];
-};
 
 
 export interface UserActivitiesResult {
 export interface UserActivitiesResult {
   serializedPaginationResult: PaginateResult<IActivityHasId>;
   serializedPaginationResult: PaginateResult<IActivityHasId>;

+ 2 - 6
apps/app/src/stores/recent-activity.ts

@@ -2,19 +2,15 @@ import type { SWRResponse } from 'swr';
 import useSWRImmutable from 'swr/immutable';
 import useSWRImmutable from 'swr/immutable';
 
 
 import { apiv3Get } from '~/client/util/apiv3-client';
 import { apiv3Get } from '~/client/util/apiv3-client';
-import type { UserActivitiesResult, IActivityHasId, IRecentActivitySearchFilter } from '~/interfaces/activity';
+import type { UserActivitiesResult, IActivityHasId } from '~/interfaces/activity';
 import type { PaginateResult } from '~/interfaces/mongoose-utils';
 import type { PaginateResult } from '~/interfaces/mongoose-utils';
 
 
 export const useSWRxRecentActivity = (
 export const useSWRxRecentActivity = (
     limit?: number,
     limit?: number,
     offset?: number,
     offset?: number,
-    searchFilter?: IRecentActivitySearchFilter,
-
 ): SWRResponse<PaginateResult<IActivityHasId>, Error> => {
 ): SWRResponse<PaginateResult<IActivityHasId>, Error> => {
 
 
-  const stringifiedSearchFilter = JSON.stringify(searchFilter);
-
-  const key = ['/user-activities', limit, offset, stringifiedSearchFilter];
+  const key = ['/user-activities', limit, offset];
 
 
   const fetcher = ([
   const fetcher = ([
     endpoint,
     endpoint,