Skip to content

Commit

Permalink
move status sorting to a hidden field (#90447)
Browse files Browse the repository at this point in the history
  • Loading branch information
Addison-Stavlo authored and pull[bot] committed Aug 6, 2024
1 parent 3529ae0 commit 686fc13
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
5 changes: 4 additions & 1 deletion client/sites-dashboard-v2/sites-dashboard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ const SitesDashboardV2 = ( {
addDummyDataViewPrefix( 'site' ),
addDummyDataViewPrefix( 'last-publish' ),
addDummyDataViewPrefix( 'last-interacted' ),
addDummyDataViewPrefix( 'status' ),
],
filters:
status === 'all'
Expand Down Expand Up @@ -155,7 +156,9 @@ const SitesDashboardV2 = ( {

// Get the status group slug.
const statusSlug = useMemo( () => {
const statusFilter = dataViewsState.filters.find( ( filter ) => filter.field === 'status' );
const statusFilter = dataViewsState.filters.find(
( filter ) => filter.field === addDummyDataViewPrefix( 'status' )
);
const statusNumber = statusFilter?.value || 1;
return ( siteStatusGroups.find( ( status ) => status.value === statusNumber )?.slug ||
'all' ) as GroupableSiteLaunchStatuses;
Expand Down
17 changes: 12 additions & 5 deletions client/sites-dashboard-v2/sites-dataviews/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,6 @@ const DotcomSitesDataViews = ( {
id: 'status',
header: __( 'Status' ),
render: ( { item }: { item: SiteInfo } ) => <SiteStatus site={ item } />,
type: 'enumeration',
elements: siteStatusGroups,
filterBy: {
operators: [ 'in' ],
},
enableHiding: false,
enableSorting: false,
},
Expand Down Expand Up @@ -199,6 +194,18 @@ const DotcomSitesDataViews = ( {
enableHiding: false,
enableSorting: true,
},
{
id: addDummyDataViewPrefix( 'status' ),
header: __( 'Status' ),
render: () => null,
type: 'enumeration',
elements: siteStatusGroups,
filterBy: {
operators: [ 'in' ],
},
enableHiding: false,
enableSorting: false,
},
],
[ __, openSitePreviewPane, userId, dataViewsState, setDataViewsState, enableSorting ]
);
Expand Down

0 comments on commit 686fc13

Please sign in to comment.