@zeniai/client-epic-state 5.0.85-betaJK5 → 5.0.85-betaJK7

package/lib/esm/view/companyTaskManagerView/epics/fetchCompanyTaskManagerViewEpic.js

@@ -14,6 +14,7 @@ export const fetchCompanyTaskManagerViewEpic = (actions$, _state$, zeniAPI) => a
         global_search: searchString ?? '',
         sort_by: toSortKeyPayload(sortKey),
         sort_order: getSortOrder(sortOrder),
+        filter_join: filters?.categoryCombinationOperator === 'AND' ? 'and' : 'or',
         ...(filters?.categories != null && filters.categories.length > 0
             ? { filter_by: toFilterByPayload(filters) }
             : {}),
@@ -68,6 +69,5 @@ const toFilterByPayload = (filters) => {
         operator: category.matchingOperator === 'equal' ? 'is' : 'is_not',
         values: category.values.map((v) => String(v)),
         join: category.valuesCombinationOperator === 'ALL' ? 'and' : 'or',
-        filter_join: category.valuesCombinationOperator === 'ALL' ? 'and' : 'or',
     }));
 };

package/lib/view/companyTaskManagerView/epics/fetchCompanyTaskManagerViewEpic.js

@@ -17,6 +17,7 @@ const fetchCompanyTaskManagerViewEpic = (actions$, _state$, zeniAPI) => actions$
         global_search: searchString ?? '',
         sort_by: toSortKeyPayload(sortKey),
         sort_order: (0, sortOrderPayload_1.getSortOrder)(sortOrder),
+        filter_join: filters?.categoryCombinationOperator === 'AND' ? 'and' : 'or',
         ...(filters?.categories != null && filters.categories.length > 0
             ? { filter_by: toFilterByPayload(filters) }
             : {}),
@@ -72,6 +73,5 @@ const toFilterByPayload = (filters) => {
         operator: category.matchingOperator === 'equal' ? 'is' : 'is_not',
         values: category.values.map((v) => String(v)),
         join: category.valuesCombinationOperator === 'ALL' ? 'and' : 'or',
-        filter_join: category.valuesCombinationOperator === 'ALL' ? 'and' : 'or',
     }));
 };

package/lib/view/companyView/types/cockpitTypes.d.ts

@@ -18,7 +18,7 @@ export type ManagementViewFilterCategoryField = 'controllerUserIds' | 'customerS
 export type SubscriptionViewFilterCategoryField = 'controllerUserIds' | 'statusCode' | 'recommendedActionCode' | 'subscriptionPlans' | 'subscriptionAddOns' | 'avg2MonthExpenses' | 'slabLowerLimit' | 'slabUpperLimit' | 'monthlyRecurringRevenue';
 export type PortfolioViewFilterCategoryField = 'netBurnOrIncome' | 'cashPosition' | 'income' | 'expenses' | 'runway';
 export type HealthMonitorViewFilterCategoryField = 'verticalProductServices' | 'runway' | 'netPromoterScore' | 'customerSatisfactionScore' | 'churnProbabilityPercentage' | 'controller' | 'customerSuccessManager' | 'lastReportSent' | 'subscriptionStartDate' | 'subscriptionRenewalDate' | 'externalProductServiceExposure' | 'companyEngagementMetricsUpdatedAt' | 'companyGroupId' | 'monthlyRecurringRevenue';
-export type TaskManagerViewFilterCategoryField = 'assignee' | 'creationDate' | 'dueDate' | 'priority' | 'status' | 'company' | 'tag';
+export type TaskManagerViewFilterCategoryField = 'assignee' | 'creationDate' | 'dueDate' | 'priority' | 'status' | 'company_id' | 'tag';
 export interface CockpitFilterCategory {
     matchingOperator: 'equal' | 'not_equal';
     values: FilterCategoryValueType[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.0.85-betaJK5",
+  "version": "5.0.85-betaJK7",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",