admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix see versions and runs hooks (#9244)

Browse Source 
<img width="871" alt="Capture d’écran 2024-12-26 à 15 04 27"
src="https://github.com/user-attachments/assets/40a37230-59be-4d9b-ae43-cebbf94e1b47"
/>

Filters had been broken by this PR
86d74724fb (diff-eb3ca3591567c47e75165b8279bd2a51f8dd77810a643cba0d9c317d2f77107eR19)
This commit is contained in:
Thomas Trompette
2024-12-26 15:40:31 +01:00
committed by GitHub
parent 522c6c2a8c
commit fdfa0935a1
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-actions/hooks/useSeeRunsWorkflowSingleRecordAction.ts
View File

@ -1,6 +1,5 @@
import { SingleRecordActionHookWithoutObjectMetadataItem } from '@/action-menu/actions/types/SingleRecordActionHook'; import { SingleRecordActionHookWithoutObjectMetadataItem } from '@/action-menu/actions/types/SingleRecordActionHook';
import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural'; import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural';
import { FilterQueryParams } from '@/views/hooks/internal/useViewFromQueryParams';
import { ViewFilterOperand } from '@/views/types/ViewFilterOperand'; import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion'; import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';
import qs from 'qs'; import qs from 'qs';
@ -20,10 +19,12 @@ export const useSeeRunsWorkflowSingleRecordAction: SingleRecordActionHookWithout
return; return;
} }
const filterQueryParams: FilterQueryParams = { const filterQueryParams = {
filter: { filter: {
workflow: { workflow: {
[ViewFilterOperand.Is]: [workflowWithCurrentVersion.id], [ViewFilterOperand.Is]: {
selectedRecordIds: [workflowWithCurrentVersion.id],
},
}, },
}, },
}; };

7
packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-actions/hooks/useSeeVersionsWorkflowSingleRecordAction.ts
View File

@ -1,6 +1,5 @@
import { SingleRecordActionHookWithoutObjectMetadataItem } from '@/action-menu/actions/types/SingleRecordActionHook'; import { SingleRecordActionHookWithoutObjectMetadataItem } from '@/action-menu/actions/types/SingleRecordActionHook';
import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural'; import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural';
import { FilterQueryParams } from '@/views/hooks/internal/useViewFromQueryParams';
import { ViewFilterOperand } from '@/views/types/ViewFilterOperand'; import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion'; import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';
import qs from 'qs'; import qs from 'qs';
@ -20,10 +19,12 @@ export const useSeeVersionsWorkflowSingleRecordAction: SingleRecordActionHookWit
return; return;
} }
const filterQueryParams: FilterQueryParams = { const filterQueryParams = {
filter: { filter: {
workflow: { workflow: {
[ViewFilterOperand.Is]: [workflowWithCurrentVersion.id], [ViewFilterOperand.Is]: {
selectedRecordIds: [workflowWithCurrentVersion.id],
},
}, },
}, },
}; };

11
packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/hooks/useSeeRunsWorkflowVersionSingleRecordAction.ts
View File

@ -1,7 +1,6 @@
import { SingleRecordActionHookWithoutObjectMetadataItem } from '@/action-menu/actions/types/SingleRecordActionHook'; import { SingleRecordActionHookWithoutObjectMetadataItem } from '@/action-menu/actions/types/SingleRecordActionHook';
import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural'; import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural';
import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState'; import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
import { FilterQueryParams } from '@/views/hooks/internal/useViewFromQueryParams';
import { ViewFilterOperand } from '@/views/types/ViewFilterOperand'; import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion'; import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';
import qs from 'qs'; import qs from 'qs';
@ -24,13 +23,17 @@ export const useSeeRunsWorkflowVersionSingleRecordAction: SingleRecordActionHook
const onClick = () => { const onClick = () => {
if (!shouldBeRegistered) return; if (!shouldBeRegistered) return;
const filterQueryParams: FilterQueryParams = { const filterQueryParams = {
filter: { filter: {
workflow: { workflow: {
[ViewFilterOperand.Is]: [workflowWithCurrentVersion.id], [ViewFilterOperand.Is]: {
selectedRecordIds: [workflowWithCurrentVersion.id],
},
}, },
workflowVersion: { workflowVersion: {
[ViewFilterOperand.Is]: [recordId], [ViewFilterOperand.Is]: {
selectedRecordIds: [recordId],
},
}, },
}, },
}; };

7
packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSection.tsx
View File

@ -30,7 +30,6 @@ import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope'; import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope';
import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile'; import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
import { FilterQueryParams } from '@/views/hooks/internal/useViewFromQueryParams';
import { View } from '@/views/types/View'; import { View } from '@/views/types/View';
import { ViewFilterOperand } from '@/views/types/ViewFilterOperand'; import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
import { RelationDefinitionType } from '~/generated-metadata/graphql'; import { RelationDefinitionType } from '~/generated-metadata/graphql';
@ -129,10 +128,12 @@ export const RecordDetailRelationSection = ({
view.objectMetadataId === relationObjectMetadataItem.id, view.objectMetadataId === relationObjectMetadataItem.id,
); );
const filterQueryParams: FilterQueryParams = { const filterQueryParams = {
filter: { filter: {
[relationFieldMetadataItem?.name || '']: { [relationFieldMetadataItem?.name || '']: {
[ViewFilterOperand.Is]: [recordId], [ViewFilterOperand.Is]: {
selectedRecordIds: [recordId],
},
}, },
}, },
view: indexView?.id, view: indexView?.id,