From fdfa0935a1e47127e39272ef5223b8dd79c78250 Mon Sep 17 00:00:00 2001 From: Thomas Trompette Date: Thu, 26 Dec 2024 15:40:31 +0100 Subject: [PATCH] Fix see versions and runs hooks (#9244) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Capture d’écran 2024-12-26 à 15 04 27 Filters had been broken by this PR https://github.com/twentyhq/twenty/commit/86d74724fb566138305a6c48c990730f0e5f8ee9#diff-eb3ca3591567c47e75165b8279bd2a51f8dd77810a643cba0d9c317d2f77107eR19 --- .../hooks/useSeeRunsWorkflowSingleRecordAction.ts | 7 ++++--- .../hooks/useSeeVersionsWorkflowSingleRecordAction.ts | 7 ++++--- .../useSeeRunsWorkflowVersionSingleRecordAction.ts | 11 +++++++---- .../components/RecordDetailRelationSection.tsx | 7 ++++--- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-actions/hooks/useSeeRunsWorkflowSingleRecordAction.ts b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-actions/hooks/useSeeRunsWorkflowSingleRecordAction.ts index 6eb4bda1e..08e427e61 100644 --- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-actions/hooks/useSeeRunsWorkflowSingleRecordAction.ts +++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-actions/hooks/useSeeRunsWorkflowSingleRecordAction.ts @@ -1,6 +1,5 @@ import { SingleRecordActionHookWithoutObjectMetadataItem } from '@/action-menu/actions/types/SingleRecordActionHook'; import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural'; -import { FilterQueryParams } from '@/views/hooks/internal/useViewFromQueryParams'; import { ViewFilterOperand } from '@/views/types/ViewFilterOperand'; import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion'; import qs from 'qs'; @@ -20,10 +19,12 @@ export const useSeeRunsWorkflowSingleRecordAction: SingleRecordActionHookWithout return; } - const filterQueryParams: FilterQueryParams = { + const filterQueryParams = { filter: { workflow: { - [ViewFilterOperand.Is]: [workflowWithCurrentVersion.id], + [ViewFilterOperand.Is]: { + selectedRecordIds: [workflowWithCurrentVersion.id], + }, }, }, }; diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-actions/hooks/useSeeVersionsWorkflowSingleRecordAction.ts b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-actions/hooks/useSeeVersionsWorkflowSingleRecordAction.ts index f1170edcb..452424804 100644 --- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-actions/hooks/useSeeVersionsWorkflowSingleRecordAction.ts +++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-actions/hooks/useSeeVersionsWorkflowSingleRecordAction.ts @@ -1,6 +1,5 @@ import { SingleRecordActionHookWithoutObjectMetadataItem } from '@/action-menu/actions/types/SingleRecordActionHook'; import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural'; -import { FilterQueryParams } from '@/views/hooks/internal/useViewFromQueryParams'; import { ViewFilterOperand } from '@/views/types/ViewFilterOperand'; import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion'; import qs from 'qs'; @@ -20,10 +19,12 @@ export const useSeeVersionsWorkflowSingleRecordAction: SingleRecordActionHookWit return; } - const filterQueryParams: FilterQueryParams = { + const filterQueryParams = { filter: { workflow: { - [ViewFilterOperand.Is]: [workflowWithCurrentVersion.id], + [ViewFilterOperand.Is]: { + selectedRecordIds: [workflowWithCurrentVersion.id], + }, }, }, }; diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/hooks/useSeeRunsWorkflowVersionSingleRecordAction.ts b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/hooks/useSeeRunsWorkflowVersionSingleRecordAction.ts index 290317ea4..e8c397554 100644 --- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/hooks/useSeeRunsWorkflowVersionSingleRecordAction.ts +++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/hooks/useSeeRunsWorkflowVersionSingleRecordAction.ts @@ -1,7 +1,6 @@ import { SingleRecordActionHookWithoutObjectMetadataItem } from '@/action-menu/actions/types/SingleRecordActionHook'; import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural'; import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState'; -import { FilterQueryParams } from '@/views/hooks/internal/useViewFromQueryParams'; import { ViewFilterOperand } from '@/views/types/ViewFilterOperand'; import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion'; import qs from 'qs'; @@ -24,13 +23,17 @@ export const useSeeRunsWorkflowVersionSingleRecordAction: SingleRecordActionHook const onClick = () => { if (!shouldBeRegistered) return; - const filterQueryParams: FilterQueryParams = { + const filterQueryParams = { filter: { workflow: { - [ViewFilterOperand.Is]: [workflowWithCurrentVersion.id], + [ViewFilterOperand.Is]: { + selectedRecordIds: [workflowWithCurrentVersion.id], + }, }, workflowVersion: { - [ViewFilterOperand.Is]: [recordId], + [ViewFilterOperand.Is]: { + selectedRecordIds: [recordId], + }, }, }, }; diff --git a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSection.tsx b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSection.tsx index 9dfce6d33..47765952c 100644 --- a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSection.tsx +++ b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSection.tsx @@ -30,7 +30,6 @@ import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown'; import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope'; import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile'; -import { FilterQueryParams } from '@/views/hooks/internal/useViewFromQueryParams'; import { View } from '@/views/types/View'; import { ViewFilterOperand } from '@/views/types/ViewFilterOperand'; import { RelationDefinitionType } from '~/generated-metadata/graphql'; @@ -129,10 +128,12 @@ export const RecordDetailRelationSection = ({ view.objectMetadataId === relationObjectMetadataItem.id, ); - const filterQueryParams: FilterQueryParams = { + const filterQueryParams = { filter: { [relationFieldMetadataItem?.name || '']: { - [ViewFilterOperand.Is]: [recordId], + [ViewFilterOperand.Is]: { + selectedRecordIds: [recordId], + }, }, }, view: indexView?.id,