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

2282 Rename components to use the new naming convention part 2 (#2295)

Browse Source 
renaming part 2
This commit is contained in:
bosiraphael
2023-10-31 12:32:16 +01:00
committed by GitHub
parent b319ba66ac
commit adeaa35e8d
109 changed files with 435 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
front/src/modules/views/components/ViewBar.tsx
View File

@ -2,11 +2,11 @@ import { ReactNode } from 'react';
import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
import { TopBar } from '@/ui/layout/top-bar/TopBar';
import { FilterDropdownButton } from '@/ui/object/filter/components/FilterDropdownButton';
import { FilterScope } from '@/ui/object/filter/scopes/FilterScope';
import { FiltersHotkeyScope } from '@/ui/object/filter/types/FiltersHotkeyScope';
import { SortDropdownButton } from '@/ui/object/sort/components/SortDropdownButton';
import { SortScope } from '@/ui/object/sort/scopes/SortScope';
import { ObjectFilterDropdownButton } from '@/ui/object/object-filter-dropdown/components/ObjectFilterDropdownButton';
import { ObjectFilterDropdownScope } from '@/ui/object/object-filter-dropdown/scopes/ObjectFilterDropdownScope';
import { FiltersHotkeyScope } from '@/ui/object/object-filter-dropdown/types/FiltersHotkeyScope';
import { ObjectSortDropdownButton } from '@/ui/object/object-sort-dropdown/components/ObjectSortDropdownButton';
import { ObjectSortDropdownScope } from '@/ui/object/object-sort-dropdown/scopes/ObjectSortDropdownScope';
import { useView } from '../hooks/useView';
import { useViewGetStates } from '../hooks/useViewGetStates';
@ -36,12 +36,12 @@ export const ViewBar = ({
useViewGetStates();
return (
<FilterScope
<ObjectFilterDropdownScope
filterScopeId="view-filter"
availableFilterDefinitions={availableFilterDefinitions}
onFilterSelect={upsertViewFilter}
>
<SortScope
<ObjectSortDropdownScope
sortScopeId="view-sort"
availableSortDefinitions={availableSortDefinitions}
onSortSelect={upsertViewSort}
@ -59,11 +59,15 @@ export const ViewBar = ({
displayBottomBorder={false}
rightComponent={
<>
<FilterDropdownButton
hotkeyScope={{ scope: FiltersHotkeyScope.FilterDropdownButton }}
<ObjectFilterDropdownButton
hotkeyScope={{
scope: FiltersHotkeyScope.ObjectFilterDropdownButton,
}}
/>
<SortDropdownButton
hotkeyScope={{ scope: FiltersHotkeyScope.SortDropdownButton }}
<ObjectSortDropdownButton
hotkeyScope={{
scope: FiltersHotkeyScope.ObjectSortDropdownButton,
}}
isPrimaryButton
/>
{optionsDropdownButton}
@ -81,7 +85,7 @@ export const ViewBar = ({
/>
}
/>
</SortScope>
</FilterScope>
</ObjectSortDropdownScope>
</ObjectFilterDropdownScope>
);
};

6
front/src/modules/views/components/ViewBarDetails.tsx
View File

@ -2,8 +2,8 @@ import { ReactNode } from 'react';
import styled from '@emotion/styled';
import { IconArrowDown, IconArrowUp } from '@/ui/display/icon/index';
import { AddFilterFromDropdownButton } from '@/ui/object/filter/components/AddFilterFromDetailsButton';
import { getOperandLabelShort } from '@/ui/object/filter/utils/getOperandLabel';
import { AddObjectFilterFromDetailsButton } from '@/ui/object/object-filter-dropdown/components/AddObjectFilterFromDetailsButton';
import { getOperandLabelShort } from '@/ui/object/object-filter-dropdown/utils/getOperandLabel';
import { useView } from '../hooks/useView';
import { useViewGetStates } from '../hooks/useViewGetStates';
@ -152,7 +152,7 @@ export const ViewBarDetails = ({
</StyledChipcontainer>
{hasFilterButton && (
<StyledAddFilterContainer>
<AddFilterFromDropdownButton />
<AddObjectFilterFromDetailsButton />
</StyledAddFilterContainer>
)}
</StyledFilterContainer>