From 052a725b9d763d46e297ca71a2eab5947743480c Mon Sep 17 00:00:00 2001 From: Stephen Smith Date: Thu, 23 Feb 2023 13:18:55 -0500 Subject: [PATCH] 19988: Refactor getOrder into data explorer middleware when no order prefixes are used Arvados-DCO-1.1-Signed-off-by: Stephen Smith --- .../all-processes-panel-middleware-service.ts | 24 ++----------- ...lient-authorizations-middleware-service.ts | 23 ++----------- ...ions-content-address-middleware-service.ts | 25 ++------------ .../data-explorer-middleware-service.ts | 21 +++++++++++- .../link-panel-middleware-service.ts | 23 ++----------- .../project-panel-middleware-service.ts | 2 +- .../shared-with-me-middleware-service.ts | 2 +- .../subprocess-panel-middleware-service.ts | 23 ++----------- .../trash-panel-middleware-service.ts | 34 +++++++++++-------- .../users/user-panel-middleware-service.ts | 2 +- .../workflow-middleware-service.ts | 23 ++----------- src/views/favorite-panel/favorite-panel.tsx | 2 -- .../public-favorites-panel.tsx | 2 -- 13 files changed, 56 insertions(+), 150 deletions(-) diff --git a/src/store/all-processes-panel/all-processes-panel-middleware-service.ts b/src/store/all-processes-panel/all-processes-panel-middleware-service.ts index fe9c8a9d..227d2fa0 100644 --- a/src/store/all-processes-panel/all-processes-panel-middleware-service.ts +++ b/src/store/all-processes-panel/all-processes-panel-middleware-service.ts @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { DataExplorerMiddlewareService, dataExplorerToListParams, getDataExplorerColumnFilters } from "store/data-explorer/data-explorer-middleware-service"; +import { DataExplorerMiddlewareService, dataExplorerToListParams, getDataExplorerColumnFilters, getOrder } from "store/data-explorer/data-explorer-middleware-service"; import { RootState } from "../store"; import { ServiceRepository } from "services/services"; import { FilterBuilder, joinFilters } from "services/api/filter-builder"; @@ -11,7 +11,7 @@ import { Dispatch, MiddlewareAPI } from "redux"; import { resourcesActions } from "store/resources/resources-actions"; import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions'; import { progressIndicatorActions } from 'store/progress-indicator/progress-indicator-actions'; -import { getDataExplorer, DataExplorer, getSortColumn } from "store/data-explorer/data-explorer-reducer"; +import { getDataExplorer, DataExplorer } from "store/data-explorer/data-explorer-reducer"; import { loadMissingProcessesInformation } from "store/project-panel/project-panel-middleware-service"; import { DataColumns } from "components/data-table/data-table"; import { @@ -20,8 +20,6 @@ import { serializeOnlyProcessTypeFilters } from "../resource-type-filters/resource-type-filters"; import { AllProcessesPanelColumnNames } from "views/all-processes-panel/all-processes-panel"; -import { OrderBuilder, OrderDirection } from "services/api/order-builder"; -import { SortDirection } from "components/data-table/data-column"; import { containerRequestFieldsNoMounts, ContainerRequestResource } from "models/container-request"; export class AllProcessesPanelMiddlewareService extends DataExplorerMiddlewareService { @@ -68,7 +66,7 @@ export class AllProcessesPanelMiddlewareService extends DataExplorerMiddlewareSe const getParams = ( dataExplorer: DataExplorer ) => ({ ...dataExplorerToListParams(dataExplorer), - order: getOrder(dataExplorer), + order: getOrder(dataExplorer), filters: getFilters(dataExplorer) }); @@ -90,22 +88,6 @@ const getFilters = ( dataExplorer: DataExplorer ) => { ); }; -const getOrder = (dataExplorer: DataExplorer) => { - const sortColumn = getSortColumn(dataExplorer); - const order = new OrderBuilder(); - if (sortColumn && sortColumn.sort) { - const sortDirection = sortColumn.sort.direction === SortDirection.ASC - ? OrderDirection.ASC - : OrderDirection.DESC; - - return order - .addOrder(sortDirection, sortColumn.sort.field) - .getOrder(); - } else { - return order.getOrder(); - } -}; - const allProcessesPanelDataExplorerIsNotSet = () => snackbarActions.OPEN_SNACKBAR({ message: 'All Processes panel is not ready.', diff --git a/src/store/api-client-authorizations/api-client-authorizations-middleware-service.ts b/src/store/api-client-authorizations/api-client-authorizations-middleware-service.ts index b919bff7..9ab02549 100644 --- a/src/store/api-client-authorizations/api-client-authorizations-middleware-service.ts +++ b/src/store/api-client-authorizations/api-client-authorizations-middleware-service.ts @@ -4,17 +4,14 @@ import { ServiceRepository } from 'services/services'; import { MiddlewareAPI, Dispatch } from 'redux'; -import { DataExplorerMiddlewareService, dataExplorerToListParams, listResultsToDataExplorerItemsMeta } from 'store/data-explorer/data-explorer-middleware-service'; +import { DataExplorerMiddlewareService, dataExplorerToListParams, getOrder, listResultsToDataExplorerItemsMeta } from 'store/data-explorer/data-explorer-middleware-service'; import { RootState } from 'store/store'; import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions'; import { DataExplorer, getDataExplorer } from 'store/data-explorer/data-explorer-reducer'; import { updateResources } from 'store/resources/resources-actions'; -import { getSortColumn } from "store/data-explorer/data-explorer-reducer"; import { apiClientAuthorizationsActions } from 'store/api-client-authorizations/api-client-authorizations-actions'; -import { OrderDirection, OrderBuilder } from 'services/api/order-builder'; import { ListResults } from 'services/common-service/common-service'; import { ApiClientAuthorization } from 'models/api-client-authorization'; -import { SortDirection } from 'components/data-table/data-column'; export class ApiClientAuthorizationMiddlewareService extends DataExplorerMiddlewareService { constructor(private services: ServiceRepository, id: string) { @@ -36,25 +33,9 @@ export class ApiClientAuthorizationMiddlewareService extends DataExplorerMiddlew export const getParams = (dataExplorer: DataExplorer) => ({ ...dataExplorerToListParams(dataExplorer), - order: getOrder(dataExplorer) + order: getOrder(dataExplorer) }); -const getOrder = (dataExplorer: DataExplorer) => { - const sortColumn = getSortColumn(dataExplorer); - const order = new OrderBuilder(); - if (sortColumn && sortColumn.sort) { - const sortDirection = sortColumn.sort.direction === SortDirection.ASC - ? OrderDirection.ASC - : OrderDirection.DESC; - - return order - .addOrder(sortDirection, sortColumn.sort.field) - .getOrder(); - } else { - return order.getOrder(); - } -}; - export const setItems = (listResults: ListResults) => apiClientAuthorizationsActions.SET_ITEMS({ ...listResultsToDataExplorerItemsMeta(listResults), diff --git a/src/store/collections-content-address-panel/collections-content-address-middleware-service.ts b/src/store/collections-content-address-panel/collections-content-address-middleware-service.ts index 390292a9..18023aff 100644 --- a/src/store/collections-content-address-panel/collections-content-address-middleware-service.ts +++ b/src/store/collections-content-address-panel/collections-content-address-middleware-service.ts @@ -4,16 +4,13 @@ import { ServiceRepository } from 'services/services'; import { MiddlewareAPI, Dispatch } from 'redux'; -import { DataExplorerMiddlewareService } from 'store/data-explorer/data-explorer-middleware-service'; +import { DataExplorerMiddlewareService, getOrder } from 'store/data-explorer/data-explorer-middleware-service'; import { RootState } from 'store/store'; import { getUserUuid } from "common/getuser"; import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions'; -import { DataExplorer, getDataExplorer } from 'store/data-explorer/data-explorer-reducer'; +import { getDataExplorer } from 'store/data-explorer/data-explorer-reducer'; import { resourcesActions } from 'store/resources/resources-actions'; import { FilterBuilder } from 'services/api/filter-builder'; -import { SortDirection } from 'components/data-table/data-column'; -import { OrderDirection, OrderBuilder } from 'services/api/order-builder'; -import { getSortColumn } from "store/data-explorer/data-explorer-reducer"; import { progressIndicatorActions } from 'store/progress-indicator/progress-indicator-actions'; import { collectionsContentAddressActions } from './collections-content-address-panel-actions'; import { navigateTo } from 'store/navigation/navigation-action'; @@ -48,7 +45,7 @@ export class CollectionsWithSameContentAddressMiddlewareService extends DataExpl .addILike("name", dataExplorer.searchValue) .getFilters(), includeOldVersions: true, - order: getOrder(dataExplorer) + order: getOrder(dataExplorer) }); const userUuids = response.items.map(it => { if (extractUuidKind(it.ownerUuid) === ResourceKind.USER) { @@ -118,22 +115,6 @@ export class CollectionsWithSameContentAddressMiddlewareService extends DataExpl } } -const getOrder = (dataExplorer: DataExplorer) => { - const sortColumn = getSortColumn(dataExplorer); - const order = new OrderBuilder(); - if (sortColumn && sortColumn.sort) { - const sortDirection = sortColumn.sort.direction === SortDirection.ASC - ? OrderDirection.ASC - : OrderDirection.DESC; - - return order - .addOrder(sortDirection, sortColumn.sort.field) - .getOrder(); - } else { - return order.getOrder(); - } -}; - const collectionPanelDataExplorerIsNotSet = () => snackbarActions.OPEN_SNACKBAR({ message: 'Collection panel is not ready.', diff --git a/src/store/data-explorer/data-explorer-middleware-service.ts b/src/store/data-explorer/data-explorer-middleware-service.ts index 347c7331..01964fa4 100644 --- a/src/store/data-explorer/data-explorer-middleware-service.ts +++ b/src/store/data-explorer/data-explorer-middleware-service.ts @@ -5,10 +5,13 @@ import { Dispatch, MiddlewareAPI } from 'redux'; import { RootState } from '../store'; import { DataColumns } from 'components/data-table/data-table'; -import { DataExplorer } from './data-explorer-reducer'; +import { DataExplorer, getSortColumn } from './data-explorer-reducer'; import { ListResults } from 'services/common-service/common-service'; import { createTree } from 'models/tree'; import { DataTableFilters } from 'components/data-table-filters/data-table-filters-tree'; +import { OrderBuilder, OrderDirection } from 'services/api/order-builder'; +import { SortDirection } from 'components/data-table/data-column'; +import { Resource } from 'models/resource'; export abstract class DataExplorerMiddlewareService { protected readonly id: string; @@ -47,6 +50,22 @@ export const dataExplorerToListParams = (dataExplorer: DataExplorer) => ({ offset: dataExplorer.page * dataExplorer.rowsPerPage, }); +export const getOrder = (dataExplorer: DataExplorer) => { + const sortColumn = getSortColumn(dataExplorer); + const order = new OrderBuilder(); + if (sortColumn && sortColumn.sort) { + const sortDirection = sortColumn.sort.direction === SortDirection.ASC + ? OrderDirection.ASC + : OrderDirection.DESC; + + return order + .addOrder(sortDirection, sortColumn.sort.field) + .getOrder(); + } else { + return order.getOrder(); + } +}; + export const listResultsToDataExplorerItemsMeta = ({ itemsAvailable, offset, diff --git a/src/store/link-panel/link-panel-middleware-service.ts b/src/store/link-panel/link-panel-middleware-service.ts index cce313fb..87bcba0c 100644 --- a/src/store/link-panel/link-panel-middleware-service.ts +++ b/src/store/link-panel/link-panel-middleware-service.ts @@ -4,15 +4,12 @@ import { ServiceRepository } from 'services/services'; import { MiddlewareAPI, Dispatch } from 'redux'; -import { DataExplorerMiddlewareService, dataExplorerToListParams, listResultsToDataExplorerItemsMeta } from 'store/data-explorer/data-explorer-middleware-service'; +import { DataExplorerMiddlewareService, dataExplorerToListParams, getOrder, listResultsToDataExplorerItemsMeta } from 'store/data-explorer/data-explorer-middleware-service'; import { RootState } from 'store/store'; import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions'; import { DataExplorer, getDataExplorer } from 'store/data-explorer/data-explorer-reducer'; import { updateResources } from 'store/resources/resources-actions'; -import { SortDirection } from 'components/data-table/data-column'; -import { OrderDirection, OrderBuilder } from 'services/api/order-builder'; import { ListResults } from 'services/common-service/common-service'; -import { getSortColumn } from "store/data-explorer/data-explorer-reducer"; import { LinkResource } from 'models/link'; import { linkPanelActions } from 'store/link-panel/link-panel-actions'; @@ -36,25 +33,9 @@ export class LinkMiddlewareService extends DataExplorerMiddlewareService { export const getParams = (dataExplorer: DataExplorer) => ({ ...dataExplorerToListParams(dataExplorer), - order: getOrder(dataExplorer) + order: getOrder(dataExplorer) }); -const getOrder = (dataExplorer: DataExplorer) => { - const sortColumn = getSortColumn(dataExplorer); - const order = new OrderBuilder(); - if (sortColumn && sortColumn.sort) { - const sortDirection = sortColumn.sort.direction === SortDirection.ASC - ? OrderDirection.ASC - : OrderDirection.DESC; - - return order - .addOrder(sortDirection, sortColumn.sort.field) - .getOrder(); - } else { - return order.getOrder(); - } -}; - export const setItems = (listResults: ListResults) => linkPanelActions.SET_ITEMS({ ...listResultsToDataExplorerItemsMeta(listResults), diff --git a/src/store/project-panel/project-panel-middleware-service.ts b/src/store/project-panel/project-panel-middleware-service.ts index 72c5f811..cc8511a4 100644 --- a/src/store/project-panel/project-panel-middleware-service.ts +++ b/src/store/project-panel/project-panel-middleware-service.ts @@ -136,7 +136,7 @@ export const getFilters = (dataExplorer: DataExplorer) => { ); }; -export const getOrder = (dataExplorer: DataExplorer) => { +const getOrder = (dataExplorer: DataExplorer) => { const sortColumn = getSortColumn(dataExplorer); const order = new OrderBuilder(); if (sortColumn && sortColumn.sort) { diff --git a/src/store/shared-with-me-panel/shared-with-me-middleware-service.ts b/src/store/shared-with-me-panel/shared-with-me-middleware-service.ts index 2f84fdc8..a4197870 100644 --- a/src/store/shared-with-me-panel/shared-with-me-middleware-service.ts +++ b/src/store/shared-with-me-panel/shared-with-me-middleware-service.ts @@ -57,7 +57,7 @@ export const getParams = (dataExplorer: DataExplorer) => ({ filters: getFilters(dataExplorer), }); -export const getOrder = (dataExplorer: DataExplorer) => { +const getOrder = (dataExplorer: DataExplorer) => { const sortColumn = getSortColumn(dataExplorer); const order = new OrderBuilder(); if (sortColumn && sortColumn.sort) { diff --git a/src/store/subprocess-panel/subprocess-panel-middleware-service.ts b/src/store/subprocess-panel/subprocess-panel-middleware-service.ts index 283f04f8..986c6ebd 100644 --- a/src/store/subprocess-panel/subprocess-panel-middleware-service.ts +++ b/src/store/subprocess-panel/subprocess-panel-middleware-service.ts @@ -5,16 +5,13 @@ import { ServiceRepository } from 'services/services'; import { MiddlewareAPI, Dispatch } from 'redux'; import { - DataExplorerMiddlewareService, dataExplorerToListParams, listResultsToDataExplorerItemsMeta, getDataExplorerColumnFilters + DataExplorerMiddlewareService, dataExplorerToListParams, listResultsToDataExplorerItemsMeta, getDataExplorerColumnFilters, getOrder } from 'store/data-explorer/data-explorer-middleware-service'; import { RootState } from 'store/store'; import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions'; import { DataExplorer, getDataExplorer } from 'store/data-explorer/data-explorer-reducer'; import { updateResources } from 'store/resources/resources-actions'; -import { SortDirection } from 'components/data-table/data-column'; -import { OrderDirection, OrderBuilder } from 'services/api/order-builder'; import { ListResults } from 'services/common-service/common-service'; -import { getSortColumn } from "store/data-explorer/data-explorer-reducer"; import { ProcessResource } from 'models/process'; import { FilterBuilder, joinFilters } from 'services/api/filter-builder'; import { subprocessPanelActions } from './subprocess-panel-actions'; @@ -61,26 +58,10 @@ export const getParams = ( dataExplorer: DataExplorer, parentContainerRequest: ContainerRequestResource) => ({ ...dataExplorerToListParams(dataExplorer), - order: getOrder(dataExplorer), + order: getOrder(dataExplorer), filters: getFilters(dataExplorer, parentContainerRequest) }); -const getOrder = (dataExplorer: DataExplorer) => { - const sortColumn = getSortColumn(dataExplorer); - const order = new OrderBuilder(); - if (sortColumn && sortColumn.sort) { - const sortDirection = sortColumn.sort.direction === SortDirection.ASC - ? OrderDirection.ASC - : OrderDirection.DESC; - - return order - .addOrder(sortDirection, sortColumn.sort.field) - .getOrder(); - } else { - return order.getOrder(); - } -}; - export const getFilters = ( dataExplorer: DataExplorer, parentContainerRequest: ContainerRequestResource) => { diff --git a/src/store/trash-panel/trash-panel-middleware-service.ts b/src/store/trash-panel/trash-panel-middleware-service.ts index 779963af..bed3e628 100644 --- a/src/store/trash-panel/trash-panel-middleware-service.ts +++ b/src/store/trash-panel/trash-panel-middleware-service.ts @@ -22,7 +22,7 @@ import { updatePublicFavorites } from 'store/public-favorites/public-favorites-a import { snackbarActions, SnackbarKind } from "store/snackbar/snackbar-actions"; import { updateResources } from "store/resources/resources-actions"; import { progressIndicatorActions } from "store/progress-indicator/progress-indicator-actions"; -import { getSortColumn } from "store/data-explorer/data-explorer-reducer"; +import { DataExplorer, getSortColumn } from "store/data-explorer/data-explorer-reducer"; import { serializeResourceTypeFilters } from 'store//resource-type-filters/resource-type-filters'; import { getDataExplorerColumnFilters } from 'store/data-explorer/data-explorer-middleware-service'; import { joinFilters } from 'services/api/filter-builder'; @@ -36,7 +36,6 @@ export class TrashPanelMiddlewareService extends DataExplorerMiddlewareService { async requestItems(api: MiddlewareAPI) { const dataExplorer = api.getState().dataExplorer[this.getId()]; const columns = dataExplorer.columns as DataColumns; - const sortColumn = getSortColumn(dataExplorer); const typeFilters = serializeResourceTypeFilters(getDataExplorerColumnFilters(columns, ProjectPanelColumnNames.TYPE)); @@ -52,18 +51,6 @@ export class TrashPanelMiddlewareService extends DataExplorerMiddlewareService { otherFilters, ); - const order = new OrderBuilder(); - - if (sortColumn && sortColumn.sort) { - const sortDirection = sortColumn.sort.direction === SortDirection.ASC - ? OrderDirection.ASC - : OrderDirection.DESC; - - order - .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.COLLECTION) - .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.PROJECT); - } - const userUuid = getUserUuid(api.getState()); if (!userUuid) { return; } try { @@ -71,7 +58,7 @@ export class TrashPanelMiddlewareService extends DataExplorerMiddlewareService { const listResults = await this.services.groupsService .contents(userUuid, { ...dataExplorerToListParams(dataExplorer), - order: order.getOrder(), + order: getOrder(dataExplorer), filters, recursive: true, includeTrash: true @@ -100,6 +87,23 @@ export class TrashPanelMiddlewareService extends DataExplorerMiddlewareService { } } +const getOrder = (dataExplorer: DataExplorer) => { + const sortColumn = getSortColumn(dataExplorer); + const order = new OrderBuilder(); + if (sortColumn && sortColumn.sort) { + const sortDirection = sortColumn.sort.direction === SortDirection.ASC + ? OrderDirection.ASC + : OrderDirection.DESC; + + return order + .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.COLLECTION) + .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.PROJECT) + .getOrder(); + } else { + return order.getOrder(); + } +}; + const couldNotFetchTrashContents = () => snackbarActions.OPEN_SNACKBAR({ message: 'Could not fetch trash contents.', diff --git a/src/store/users/user-panel-middleware-service.ts b/src/store/users/user-panel-middleware-service.ts index b062401c..e965cd00 100644 --- a/src/store/users/user-panel-middleware-service.ts +++ b/src/store/users/user-panel-middleware-service.ts @@ -56,7 +56,7 @@ const getParams = (dataExplorer: DataExplorer) => ({ .getFilters() }); -export const getOrder = (dataExplorer: DataExplorer) => { +const getOrder = (dataExplorer: DataExplorer) => { const sortColumn = getSortColumn(dataExplorer); const order = new OrderBuilder(); if (sortColumn && sortColumn.sort) { diff --git a/src/store/workflow-panel/workflow-middleware-service.ts b/src/store/workflow-panel/workflow-middleware-service.ts index 14c80fe1..587f0224 100644 --- a/src/store/workflow-panel/workflow-middleware-service.ts +++ b/src/store/workflow-panel/workflow-middleware-service.ts @@ -4,18 +4,15 @@ import { ServiceRepository } from 'services/services'; import { MiddlewareAPI, Dispatch } from 'redux'; -import { DataExplorerMiddlewareService, dataExplorerToListParams, listResultsToDataExplorerItemsMeta } from 'store/data-explorer/data-explorer-middleware-service'; +import { DataExplorerMiddlewareService, dataExplorerToListParams, getOrder, listResultsToDataExplorerItemsMeta } from 'store/data-explorer/data-explorer-middleware-service'; import { RootState } from 'store/store'; import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions'; import { DataExplorer, getDataExplorer } from 'store/data-explorer/data-explorer-reducer'; import { updateResources } from 'store/resources/resources-actions'; import { FilterBuilder } from 'services/api/filter-builder'; -import { SortDirection } from 'components/data-table/data-column'; -import { OrderDirection, OrderBuilder } from 'services/api/order-builder'; import { WorkflowResource } from 'models/workflow'; import { ListResults } from 'services/common-service/common-service'; import { workflowPanelActions } from 'store/workflow-panel/workflow-panel-actions'; -import { getSortColumn } from "store/data-explorer/data-explorer-reducer"; export class WorkflowMiddlewareService extends DataExplorerMiddlewareService { constructor(private services: ServiceRepository, id: string) { @@ -37,7 +34,7 @@ export class WorkflowMiddlewareService extends DataExplorerMiddlewareService { export const getParams = (dataExplorer: DataExplorer) => ({ ...dataExplorerToListParams(dataExplorer), - order: getOrder(dataExplorer), + order: getOrder(dataExplorer), filters: getFilters(dataExplorer) }); @@ -48,22 +45,6 @@ export const getFilters = (dataExplorer: DataExplorer) => { return filters; }; -export const getOrder = (dataExplorer: DataExplorer) => { - const sortColumn = getSortColumn(dataExplorer); - const order = new OrderBuilder(); - if (sortColumn && sortColumn.sort) { - const sortDirection = sortColumn.sort.direction === SortDirection.ASC - ? OrderDirection.ASC - : OrderDirection.DESC; - - return order - .addOrder(sortDirection, sortColumn.sort.field) - .getOrder(); - } else { - return order.getOrder(); - } -}; - export const setItems = (listResults: ListResults) => workflowPanelActions.SET_ITEMS({ ...listResultsToDataExplorerItemsMeta(listResults), diff --git a/src/views/favorite-panel/favorite-panel.tsx b/src/views/favorite-panel/favorite-panel.tsx index a74da762..2392d6fd 100644 --- a/src/views/favorite-panel/favorite-panel.tsx +++ b/src/views/favorite-panel/favorite-panel.tsx @@ -72,7 +72,6 @@ export const favoritePanelColumns: DataColumns = name: FavoritePanelColumnNames.NAME, selected: true, configurable: true, - // sort: {direction: SortDirection.NONE, field: "name"}, filters: createTree(), render: uuid => }, @@ -108,7 +107,6 @@ export const favoritePanelColumns: DataColumns = name: FavoritePanelColumnNames.LAST_MODIFIED, selected: true, configurable: true, - // sort: {direction: SortDirection.DESC, field: "modifiedAt"}, filters: createTree(), render: uuid => } diff --git a/src/views/public-favorites-panel/public-favorites-panel.tsx b/src/views/public-favorites-panel/public-favorites-panel.tsx index 0aa0e9fd..47c8aede 100644 --- a/src/views/public-favorites-panel/public-favorites-panel.tsx +++ b/src/views/public-favorites-panel/public-favorites-panel.tsx @@ -70,7 +70,6 @@ export const publicFavoritePanelColumns: DataColumns }, @@ -106,7 +105,6 @@ export const publicFavoritePanelColumns: DataColumns } -- 2.30.2