2282 Rename components to use the new naming convention part 2 (#2295)
renaming part 2
This commit is contained in:
@ -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>
|
||||
);
|
||||
};
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -3,7 +3,7 @@ import { produce } from 'immer';
|
||||
import { useRecoilCallback } from 'recoil';
|
||||
|
||||
import { useFindOneMetadataObject } from '@/metadata/hooks/useFindOneMetadataObject';
|
||||
import { Filter } from '@/ui/object/filter/types/Filter';
|
||||
import { Filter } from '@/ui/object/object-filter-dropdown/types/Filter';
|
||||
import { currentViewFiltersScopedFamilyState } from '@/views/states/currentViewFiltersScopedFamilyState';
|
||||
import { currentViewIdScopedState } from '@/views/states/currentViewIdScopedState';
|
||||
import { onViewFiltersChangeScopedState } from '@/views/states/onViewFiltersChangeScopedState';
|
||||
|
||||
@ -3,7 +3,7 @@ import { produce } from 'immer';
|
||||
import { useRecoilCallback } from 'recoil';
|
||||
|
||||
import { useFindOneMetadataObject } from '@/metadata/hooks/useFindOneMetadataObject';
|
||||
import { Sort } from '@/ui/object/sort/types/Sort';
|
||||
import { Sort } from '@/ui/object/object-sort-dropdown/types/Sort';
|
||||
import { currentViewIdScopedState } from '@/views/states/currentViewIdScopedState';
|
||||
import { currentViewSortsScopedFamilyState } from '@/views/states/currentViewSortsScopedFamilyState';
|
||||
import { onViewSortsChangeScopedState } from '@/views/states/onViewSortsChangeScopedState';
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
import { ReactNode } from 'react';
|
||||
|
||||
import { Filter } from '@/ui/object/filter/types/Filter';
|
||||
import { Sort } from '@/ui/object/sort/types/Sort';
|
||||
import { Filter } from '@/ui/object/object-filter-dropdown/types/Filter';
|
||||
import { Sort } from '@/ui/object/object-sort-dropdown/types/Sort';
|
||||
|
||||
import { ViewField } from '../types/ViewField';
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
import { useEffect } from 'react';
|
||||
|
||||
import { Filter } from '@/ui/object/filter/types/Filter';
|
||||
import { Sort } from '@/ui/object/sort/types/Sort';
|
||||
import { Filter } from '@/ui/object/object-filter-dropdown/types/Filter';
|
||||
import { Sort } from '@/ui/object/object-sort-dropdown/types/Sort';
|
||||
import { useView } from '@/views/hooks/useView';
|
||||
import { ViewField } from '@/views/types/ViewField';
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { FilterDefinition } from '@/ui/object/filter/types/FilterDefinition';
|
||||
import { FilterDefinition } from '@/ui/object/object-filter-dropdown/types/FilterDefinition';
|
||||
import { createScopedState } from '@/ui/utilities/recoil-scope/utils/createScopedState';
|
||||
|
||||
export const availableFilterDefinitionsScopedState = createScopedState<
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { SortDefinition } from '@/ui/object/sort/types/SortDefinition';
|
||||
import { SortDefinition } from '@/ui/object/object-sort-dropdown/types/SortDefinition';
|
||||
import { createScopedState } from '@/ui/utilities/recoil-scope/utils/createScopedState';
|
||||
|
||||
export const availableSortDefinitionsScopedState = createScopedState<
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { Filter } from '@/ui/object/filter/types/Filter';
|
||||
import { Filter } from '@/ui/object/object-filter-dropdown/types/Filter';
|
||||
import { createScopedState } from '@/ui/utilities/recoil-scope/utils/createScopedState';
|
||||
|
||||
export const onViewFiltersChangeScopedState = createScopedState<
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { Sort } from '@/ui/object/sort/types/Sort';
|
||||
import { Sort } from '@/ui/object/object-sort-dropdown/types/Sort';
|
||||
import { createScopedState } from '@/ui/utilities/recoil-scope/utils/createScopedState';
|
||||
|
||||
export const onViewSortsChangeScopedState = createScopedState<
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { FilterDefinition } from '@/ui/object/filter/types/FilterDefinition';
|
||||
import { FilterDefinition } from '@/ui/object/object-filter-dropdown/types/FilterDefinition';
|
||||
|
||||
import { ViewFilterOperand } from './ViewFilterOperand';
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { SortDefinition } from '@/ui/object/sort/types/SortDefinition';
|
||||
import { SortDirection } from '@/ui/object/sort/types/SortDirection';
|
||||
import { SortDefinition } from '@/ui/object/object-sort-dropdown/types/SortDefinition';
|
||||
import { SortDirection } from '@/ui/object/object-sort-dropdown/types/SortDirection';
|
||||
|
||||
export type ViewSort = {
|
||||
id?: string;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { Filter } from '@/ui/object/filter/types/Filter';
|
||||
import { Filter } from '@/ui/object/object-filter-dropdown/types/Filter';
|
||||
|
||||
import { ViewFilter } from '../types/ViewFilter';
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { Sort } from '@/ui/object/sort/types/Sort';
|
||||
import { Sort } from '@/ui/object/object-sort-dropdown/types/Sort';
|
||||
|
||||
import { ViewSort } from '../types/ViewSort';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user