* Resource type used when defining dataExplorer columns will be used to constrain sort.field to keyof the type
* Removed sorting from favorites and public favorites since it was not implemented
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen@curii.com>
import { ArvadosTheme } from "common/custom-theme";
interface ColumnSelectorDataProps {
- columns: DataColumns<any>;
- onColumnToggle: (column: DataColumn<any>) => void;
+ columns: DataColumns<any, any>;
+ onColumnToggle: (column: DataColumn<any, any>) => void;
className?: string;
}
color="primary"
checked={column.selected}
className={classes.checkbox} />
- <ListItemText
+ <ListItemText
className={classes.listItemText}>
{column.name}
</ListItemText>
<MenuIcon aria-label="Select columns" />
</IconButton>
</Tooltip>;
-
-
fetchMode: DataTableFetchMode;
items: T[];
itemsAvailable: number;
- columns: DataColumns<T>;
+ columns: DataColumns<T, any>;
searchLabel?: string;
searchValue: string;
rowsPerPage: number;
}
interface DataExplorerActionProps<T> {
- onSetColumns: (columns: DataColumns<T>) => void;
+ onSetColumns: (columns: DataColumns<T, any>) => void;
onSearch: (value: string) => void;
onRowClick: (item: T) => void;
onRowDoubleClick: (item: T) => void;
- onColumnToggle: (column: DataColumn<T>) => void;
+ onColumnToggle: (column: DataColumn<T, any>) => void;
onContextMenu: (event: React.MouseEvent<HTMLElement>, item: T) => void;
- onSortToggle: (column: DataColumn<T>) => void;
- onFiltersChange: (filters: DataTableFilters, column: DataColumn<T>) => void;
+ onSortToggle: (column: DataColumn<T, any>) => void;
+ onFiltersChange: (filters: DataTableFilters, column: DataColumn<T, any>) => void;
onChangePage: (page: number) => void;
onChangeRowsPerPage: (rowsPerPage: number) => void;
onLoadMore: (page: number) => void;
</Tooltip>
</Grid>
- contextMenuColumn: DataColumn<any> = {
+ contextMenuColumn: DataColumn<any, any> = {
name: "Actions",
selected: true,
configurable: false,
import { DataTableFilters } from "../data-table-filters/data-table-filters-tree";
import { createTree } from 'models/tree';
-export interface DataColumn<T> {
+/**
+ *
+ * @template I Type of dataexplorer item reference
+ * @template R Type of resource to use to restrict values of column sort.field
+ */
+export interface DataColumn<I, R> {
key?: React.Key;
name: string;
selected: boolean;
* radio group and only one filter can be selected at a time.
*/
mutuallyExclusiveFilters?: boolean;
- sortDirection?: SortDirection;
+ sort?: {direction: SortDirection, field: keyof R};
filters: DataTableFilters;
- render: (item:
T) => React.ReactElement<any>;
+ render: (item:
I) => React.ReactElement<any>;
renderHeader?: () => React.ReactElement<any>;
}
NONE = "none"
}
-export const toggleSortDirection = <T>(column: DataColumn<T>): DataColumn<T> => {
- return column.sortDirection
- ? column.sortDirection === SortDirection.ASC
- ? { ...column, sortDirection: SortDirection.DESC }
- : { ...column, sortDirection: SortDirection.ASC }
+export const toggleSortDirection = <I, R>(column: DataColumn<I, R>): DataColumn<I, R> => {
+ return column.sort
+ ? column.sort.direction === SortDirection.ASC
+ ? { ...column, sort: {...column.sort, direction: SortDirection.DESC} }
+ : { ...column, sort: {...column.sort, direction: SortDirection.ASC} }
: column;
};
-export const resetSortDirection = <T>(column: DataColumn<T>): DataColumn<T> => {
- return column.sortDirection ? { ...column, sortDirection: SortDirection.NONE } : column;
+export const resetSortDirection = <I, R>(column: DataColumn<I, R>): DataColumn<I, R> => {
+ return column.sort ? { ...column, sort: {...column.sort, direction: SortDirection.NONE} } : column;
};
-export const createDataColumn = <T>(dataColumn: Partial<DataColumn<T>>): DataColumn<T> => ({
+export const createDataColumn = <I, R>(dataColumn: Partial<DataColumn<I, R>>): DataColumn<I, R> => ({
key: '',
name: '',
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
filters: createTree(),
render: () => React.createElement('span'),
...dataColumn,
import { SvgIconProps } from '@material-ui/core/SvgIcon';
import ArrowDownwardIcon from '@material-ui/icons/ArrowDownward';
-export type DataColumns<T> = Array<DataColumn<T>>;
+export type DataColumns<I, R> = Array<DataColumn<I, R>>;
export enum DataTableFetchMode {
PAGINATED,
INFINITE
}
-export interface DataTableDataProps<T> {
- items: T[];
- columns: DataColumns<T>;
- onRowClick: (event: React.MouseEvent<HTMLTableRowElement>, item: T) => void;
- onContextMenu: (event: React.MouseEvent<HTMLElement>, item: T) => void;
- onRowDoubleClick: (event: React.MouseEvent<HTMLTableRowElement>, item: T) => void;
- onSortToggle: (column: DataColumn<T>) => void;
- onFiltersChange: (filters: DataTableFilters, column: DataColumn<T>) => void;
- extractKey?: (item: T) => React.Key;
+export interface DataTableDataProps<I> {
+ items: I[];
+ columns: DataColumns<I, any>;
+ onRowClick: (event: React.MouseEvent<HTMLTableRowElement>, item: I) => void;
+ onContextMenu: (event: React.MouseEvent<HTMLElement>, item: I) => void;
+ onRowDoubleClick: (event: React.MouseEvent<HTMLTableRowElement>, item: I) => void;
+ onSortToggle: (column: DataColumn<I, any>) => void;
+ onFiltersChange: (filters: DataTableFilters, column: DataColumn<I, any>) => void;
+ extractKey?: (item: I) => React.Key;
working?: boolean;
defaultViewIcon?: IconType;
defaultViewMessages?: string[];
wordWrap: 'break-word',
paddingRight: '24px',
color: '#737373'
-
+
},
tableCellWorkflows: {
'&:nth-last-child(2)': {
</div>;
}
- renderNoItemsPlaceholder = (columns: DataColumns<T>) => {
+ renderNoItemsPlaceholder = (columns: DataColumns<T, any>) => {
const dirty = columns.some((column) => getTreeDirty('')(column.filters));
return <DataTableDefaultView
icon={this.props.defaultViewIcon}
filtersApplied={dirty} />;
}
- renderHeadCell = (column: DataColumn<T>, index: number) => {
- const { name, key, renderHeader, filters, sortDirection } = column;
+ renderHeadCell = (column: DataColumn<T, any>, index: number) => {
+ const { name, key, renderHeader, filters, sort } = column;
const { onSortToggle, onFiltersChange, classes } = this.props;
return <TableCell className={classes.tableCell} key={key || index}>
{renderHeader ?
filters={filters}>
{name}
</DataTableFiltersPopover>
- : sortDirection
+ : sort
? <TableSortLabel
- active={sortDirection !== SortDirection.NONE}
- direction={sortDirection !== SortDirection.NONE ? sortDirection : undefined}
+ active={sort.direction !== SortDirection.NONE}
+ direction={sort.direction !== SortDirection.NONE ? sort.direction : undefined}
IconComponent={this.ArrowIcon}
hideSortIcon
onClick={() =>
</TableRow>;
}
- mapVisibleColumns = (fn: (column: DataColumn<T>, index: number) => React.ReactElement<any>) => {
+ mapVisibleColumns = (fn: (column: DataColumn<T
, any>, index: number) => React.ReactElement<any>) => {
return this.props.columns.filter(column => column.selected).map(fn);
}
if (cancelToken) {
cfg.cancelToken = cancelToken;
}
-
+
const response = await CommonResourceService.defaultResponse(
this.serverApi.get(this.resourceType + pathUrl, cfg),
this.actions,
} 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 { ProcessResource } from "models/process";
import { SortDirection } from "components/data-table/data-column";
-import { containerRequestFieldsNoMounts } from "models/container-request";
+import { containerRequestFieldsNoMounts, ContainerRequestResource } from "models/container-request";
export class AllProcessesPanelMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
});
const getFilters = ( dataExplorer: DataExplorer ) => {
- const columns = dataExplorer.columns as DataColumns<string>;
+ const columns = dataExplorer.columns as DataColumns<string, ContainerRequestResource>;
const statusColumnFilters = getDataExplorerColumnFilters(columns, 'Status');
const activeStatusFilter = Object.keys(statusColumnFilters).find(
filterName => statusColumnFilters[filterName].selected
};
const getOrder = (dataExplorer: DataExplorer) => {
- const sortColumn = getSortColumn(dataExplorer);
- const order = new OrderBuilder<ProcessResource>();
- if (sortColumn) {
- const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
+ const sortColumn = getSortColumn<ContainerRequestResource>(dataExplorer);
+ const order = new OrderBuilder<ContainerRequestResource>();
+ if (sortColumn && sortColumn.sort) {
+ const sortDirection = sortColumn.sort.direction === SortDirection.ASC
? OrderDirection.ASC
: OrderDirection.DESC;
- const columnName = sortColumn && sortColumn.name === AllProcessesPanelColumnNames.NAME ? "name" : "createdAt";
return order
- .addOrder(sortDirection, columnName)
+ .addOrder(sortDirection, sortColumn.sort.field)
.getOrder();
} else {
return order.getOrder();
import { OrderDirection, OrderBuilder } from 'services/api/order-builder';
import { ListResults } from 'services/common-service/common-service';
import { ApiClientAuthorization } from 'models/api-client-authorization';
-import { ApiClientAuthorizationPanelColumnNames } from 'views/api-client-authorization-panel/api-client-authorization-panel-root';
import { SortDirection } from 'components/data-table/data-column';
export class ApiClientAuthorizationMiddlewareService extends DataExplorerMiddlewareService {
});
const getOrder = (dataExplorer: DataExplorer) => {
- const sortColumn = getSortColumn(dataExplorer);
+ const sortColumn = getSortColumn<ApiClientAuthorization>(dataExplorer);
const order = new OrderBuilder<ApiClientAuthorization>();
- if (sortColumn) {
- const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
+ if (sortColumn && sortColumn.sort) {
+ const sortDirection = sortColumn.sort.direction === SortDirection.ASC
? OrderDirection.ASC
: OrderDirection.DESC;
- const columnName = sortColumn && sortColumn.name === ApiClientAuthorizationPanelColumnNames.UUID ? "uuid" : "updatedAt";
return order
- .addOrder(sortDirection, columnName)
+ .addOrder(sortDirection, sortColumn.sort.field)
.getOrder();
} else {
return order.getOrder();
import { RootState } from 'store/store';
import { getUserUuid } from "common/getuser";
import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions';
-import { getDataExplorer } from 'store/data-explorer/data-explorer-reducer';
+import { DataExplorer, 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 { FavoritePanelColumnNames } from 'views/favorite-panel/favorite-panel';
-import { GroupContentsResource, GroupContentsResourcePrefix } from 'services/groups-service/groups-service';
import { progressIndicatorActions } from 'store/progress-indicator/progress-indicator-actions';
import { collectionsContentAddressActions } from './collections-content-address-panel-actions';
import { navigateTo } from 'store/navigation/navigation-action';
import { ResourceKind, extractUuidKind } from 'models/resource';
import { ownerNameActions } from 'store/owner-name/owner-name-actions';
import { getUserDisplayName } from 'models/user';
+import { CollectionResource } from 'models/collection';
export class CollectionsWithSameContentAddressMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
if (!dataExplorer) {
api.dispatch(collectionPanelDataExplorerIsNotSet());
} else {
- const sortColumn = getSortColumn(dataExplorer);
-
- const contentOrder = new OrderBuilder<GroupContentsResource>();
-
- if (sortColumn && sortColumn.name === FavoritePanelColumnNames.NAME) {
- const direction = sortColumn.sortDirection === SortDirection.ASC
- ? OrderDirection.ASC
- : OrderDirection.DESC;
-
- contentOrder
- .addOrder(direction, "name", GroupContentsResourcePrefix.COLLECTION);
- }
try {
api.dispatch(progressIndicatorActions.START_WORKING(this.getId()));
const userUuid = getUserUuid(api.getState());
.addEqual('portable_data_hash', contentAddress)
.addILike("name", dataExplorer.searchValue)
.getFilters(),
- includeOldVersions: true
+ includeOldVersions: true,
+ order: getOrder(dataExplorer)
});
const userUuids = response.items.map(it => {
if (extractUuidKind(it.ownerUuid) === ResourceKind.USER) {
}
}
+const getOrder = (dataExplorer: DataExplorer) => {
+ const sortColumn = getSortColumn<CollectionResource>(dataExplorer);
+ const order = new OrderBuilder<CollectionResource>();
+ 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.',
REQUEST_ITEMS: ofType<{ id: string, criteriaChanged?: boolean }>(),
REQUEST_STATE: ofType<{ id: string, criteriaChanged?: boolean }>(),
SET_FETCH_MODE: ofType<({ id: string, fetchMode: DataTableFetchMode })>(),
- SET_COLUMNS: ofType<{ id: string, columns: DataColumns<any> }>(),
+ SET_COLUMNS: ofType<{ id: string, columns: DataColumns<any, any> }>(),
SET_FILTERS: ofType<{ id: string, columnName: string, filters: DataTableFilters }>(),
SET_ITEMS: ofType<{ id: string, items: any[], page: number, rowsPerPage: number, itemsAvailable: number }>(),
APPEND_ITEMS: ofType<{ id: string, items: any[], page: number, rowsPerPage: number, itemsAvailable: number }>(),
dataExplorerActions.REQUEST_ITEMS({ id, criteriaChanged }),
SET_FETCH_MODE: (payload: { fetchMode: DataTableFetchMode }) =>
dataExplorerActions.SET_FETCH_MODE({ ...payload, id }),
- SET_COLUMNS: (payload: { columns: DataColumns<any> }) =>
+ SET_COLUMNS: (payload: { columns: DataColumns<any, any> }) =>
dataExplorerActions.SET_COLUMNS({ ...payload, id }),
SET_FILTERS: (payload: { columnName: string, filters: DataTableFilters }) =>
dataExplorerActions.SET_FILTERS({ ...payload, id }),
}
public getColumnFilters<T>(
- columns: DataColumns<T>,
+ columns: DataColumns<T, any>,
columnName: string
): DataTableFilters {
return getDataExplorerColumnFilters(columns, columnName);
}
export const getDataExplorerColumnFilters = <T>(
- columns: DataColumns<T>,
+ columns: DataColumns<T, any>,
columnName: string
): DataTableFilters => {
const column = columns.find((c) => c.name === columnName);
class ServiceMock extends DataExplorerMiddlewareService {
constructor(private config: {
id: string,
- columns: DataColumns<any>,
+ columns: DataColumns<any, any>,
requestItems: (api: MiddlewareAPI) => Promise<void>
}) {
super(config.id);
export interface DataExplorer {
fetchMode: DataTableFetchMode;
- columns: DataColumns<any>;
+ columns: DataColumns<any, any>;
items: any[];
itemsAvailable: number;
page: number;
return returnValue;
};
-export const getSortColumn = (dataExplorer: DataExplorer) =>
+export const getSortColumn = <R>(dataExplorer: DataExplorer): DataColumn<any, R> | undefined =>
dataExplorer.columns.find(
- (c: any) => !!c.sortDirection && c.sortDirection !== SortDirection.NONE
+ (c: DataColumn<any, R>) => !!c.sort && c.sort.direction !== SortDirection.NONE
);
const update = (
) => ({ ...state, [id]: updateFn(getDataExplorer(state, id)) });
const canUpdateColumns = (
- prevColumns: DataColumns<any>,
- nextColumns: DataColumns<any>
+ prevColumns: DataColumns<any, any>,
+ nextColumns: DataColumns<any, any>
) => {
if (prevColumns.length !== nextColumns.length) {
return true;
};
const setColumns =
- (columns: DataColumns<any>) => (dataExplorer: DataExplorer) => ({
+ (columns: DataColumns<any, any>) => (dataExplorer: DataExplorer) => ({
...dataExplorer,
columns: canUpdateColumns(dataExplorer.columns, columns)
? columns
});
const mapColumns =
- (mapFn: (column: DataColumn<any>) => DataColumn<any>) =>
+ (mapFn: (column: DataColumn<any, any>) => DataColumn<any, any>) =>
(dataExplorer: DataExplorer) => ({
...dataExplorer,
columns: dataExplorer.columns.map(mapFn),
});
-const toggleSort = (columnName: string) => (column: DataColumn<any>) =>
+const toggleSort = (columnName: string) => (column: DataColumn<any, any>) =>
column.name === columnName
? toggleSortDirection(column)
: resetSortDirection(column);
-const toggleColumn = (columnName: string) => (column: DataColumn<any>) =>
+const toggleColumn = (columnName: string) => (column: DataColumn<any, any>) =>
column.name === columnName
? { ...column, selected: !column.selected }
: column;
const setFilters =
(columnName: string, filters: DataTableFilters) =>
- (column: DataColumn<any>) =>
+ (column: DataColumn<any, any>) =>
column.name === columnName ? { ...column, filters } : column;
import { getUserUuid } from "common/getuser";
import { DataColumns } from "components/data-table/data-table";
import { ServiceRepository } from "services/services";
-import { SortDirection } from "components/data-table/data-column";
import { FilterBuilder } from "services/api/filter-builder";
import { updateFavorites } from "../favorites/favorites-actions";
import { favoritePanelActions } from "./favorite-panel-action";
import { Dispatch, MiddlewareAPI } from "redux";
-import { OrderBuilder, OrderDirection } from "services/api/order-builder";
-import { LinkResource } from "models/link";
-import { GroupContentsResource, GroupContentsResourcePrefix } from "services/groups-service/groups-service";
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 } from "store/data-explorer/data-explorer-reducer";
import { loadMissingProcessesInformation } from "store/project-panel/project-panel-middleware-service";
-import { getSortColumn } from "store/data-explorer/data-explorer-reducer";
import { getDataExplorerColumnFilters } from 'store/data-explorer/data-explorer-middleware-service';
import { serializeSimpleObjectTypeFilters } from '../resource-type-filters/resource-type-filters';
import { ResourceKind } from "models/resource";
import { LinkClass } from "models/link";
+import { GroupContentsResource } from "services/groups-service/groups-service";
export class FavoritePanelMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
if (!dataExplorer) {
api.dispatch(favoritesPanelDataExplorerIsNotSet());
} else {
- const columns = dataExplorer.columns as DataColumns<string>;
- const sortColumn = getSortColumn(dataExplorer);
+ const columns = dataExplorer.columns as DataColumns<string, GroupContentsResource>;
const typeFilters = serializeSimpleObjectTypeFilters(getDataExplorerColumnFilters(columns, FavoritePanelColumnNames.TYPE));
-
- const linkOrder = new OrderBuilder<LinkResource>();
- const contentOrder = new OrderBuilder<GroupContentsResource>();
-
- if (sortColumn && sortColumn.name === FavoritePanelColumnNames.NAME) {
- const direction = sortColumn.sortDirection === SortDirection.ASC
- ? OrderDirection.ASC
- : OrderDirection.DESC;
-
- linkOrder.addOrder(direction, "name");
- contentOrder
- .addOrder(direction, "name", GroupContentsResourcePrefix.COLLECTION)
- .addOrder(direction, "name", GroupContentsResourcePrefix.PROCESS)
- .addOrder(direction, "name", GroupContentsResourcePrefix.PROJECT);
- }
try {
api.dispatch(progressIndicatorActions.START_WORKING(this.getId()));
const responseLinks = await this.services.linkService.list({
import { OrderBuilder, OrderDirection } from 'services/api/order-builder';
import { GroupResource, GroupClass } from 'models/group';
import { SortDirection } from 'components/data-table/data-column';
-import { GroupsPanelColumnNames } from 'views/groups-panel/groups-panel';
import { progressIndicatorActions } from "store/progress-indicator/progress-indicator-actions";
export class GroupsPanelMiddlewareService extends DataExplorerMiddlewareService {
} else {
try {
api.dispatch(progressIndicatorActions.START_WORKING(this.getId()));
+ const sortColumn = getSortColumn<GroupResource>(dataExplorer);
const order = new OrderBuilder<GroupResource>();
- const sortColumn = getSortColumn(dataExplorer);
- if (sortColumn) {
+ if (sortColumn && sortColumn.sort) {
const direction =
- sortColumn.sortDirection === SortDirection.ASC && sortColumn.name === GroupsPanelColumnNames.GROUP
+ sortColumn.sort.direction === SortDirection.ASC
? OrderDirection.ASC
: OrderDirection.DESC;
- order.addOrder(direction, 'name');
+ order.addOrder(direction, sortColumn.sort.field);
}
const filters = new FilterBuilder()
.addEqual('group_class', GroupClass.ROLE)
import { getSortColumn } from "store/data-explorer/data-explorer-reducer";
import { LinkResource } from 'models/link';
import { linkPanelActions } from 'store/link-panel/link-panel-actions';
-import { LinkPanelColumnNames } from 'views/link-panel/link-panel-root';
export class LinkMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
});
const getOrder = (dataExplorer: DataExplorer) => {
- const sortColumn = getSortColumn(dataExplorer);
+ const sortColumn = getSortColumn<LinkResource>(dataExplorer);
const order = new OrderBuilder<LinkResource>();
- if (sortColumn) {
- const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
+ if (sortColumn && sortColumn.sort) {
+ const sortDirection = sortColumn.sort.direction === SortDirection.ASC
? OrderDirection.ASC
: OrderDirection.DESC;
- const columnName = sortColumn && sortColumn.name === LinkPanelColumnNames.NAME ? "name" : "modifiedAt";
return order
- .addOrder(sortDirection, columnName)
+ .addOrder(sortDirection, sortColumn.sort.field)
.getOrder();
} else {
return order.getOrder();
});
export const getFilters = (dataExplorer: DataExplorer) => {
- const columns = dataExplorer.columns as DataColumns<string>;
+ const columns = dataExplorer.columns as DataColumns<string, ProjectResource>;
const typeFilters = serializeResourceTypeFilters(getDataExplorerColumnFilters(columns, ProjectPanelColumnNames.TYPE));
const statusColumnFilters = getDataExplorerColumnFilters(columns, 'Status');
const activeStatusFilter = Object.keys(statusColumnFilters).find(
};
export const getOrder = (dataExplorer: DataExplorer) => {
- const sortColumn = getSortColumn(dataExplorer);
+ const sortColumn = getSortColumn<ProjectResource>(dataExplorer);
const order = new OrderBuilder<ProjectResource>();
- if (sortColumn) {
- const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
+ if (sortColumn && sortColumn.sort) {
+ const sortDirection = sortColumn.sort.direction === SortDirection.ASC
? OrderDirection.ASC
: OrderDirection.DESC;
- const columnName = sortColumn && sortColumn.name === ProjectPanelColumnNames.NAME ? "name" : "createdAt";
return order
- .addOrder(sortDirection, columnName, GroupContentsResourcePrefix.COLLECTION)
- .addOrder(sortDirection, columnName, GroupContentsResourcePrefix.PROCESS)
- .addOrder(sortDirection, columnName, GroupContentsResourcePrefix.PROJECT)
+ .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.COLLECTION)
+ .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.PROCESS)
+ .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.PROJECT)
.getOrder();
} else {
return order.getOrder();
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 { FavoritePanelColumnNames } from 'views/favorite-panel/favorite-panel';
import { publicFavoritePanelActions } from 'store/public-favorites-panel/public-favorites-action';
import { DataColumns } from 'components/data-table/data-table';
import { serializeSimpleObjectTypeFilters } from '../resource-type-filters/resource-type-filters';
-import { LinkResource, LinkClass } from 'models/link';
-import { GroupContentsResource, GroupContentsResourcePrefix } from 'services/groups-service/groups-service';
+import { LinkClass } from 'models/link';
import { progressIndicatorActions } from 'store/progress-indicator/progress-indicator-actions';
import { updatePublicFavorites } from 'store/public-favorites/public-favorites-actions';
+import { GroupContentsResource } from 'services/groups-service/groups-service';
export class PublicFavoritesMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
if (!dataExplorer) {
api.dispatch(favoritesPanelDataExplorerIsNotSet());
} else {
- const columns = dataExplorer.columns as DataColumns<string>;
- const sortColumn = getSortColumn(dataExplorer);
+ const columns = dataExplorer.columns as DataColumns<string, GroupContentsResource>;
const typeFilters = serializeSimpleObjectTypeFilters(getDataExplorerColumnFilters(columns, FavoritePanelColumnNames.TYPE));
-
- const linkOrder = new OrderBuilder<LinkResource>();
- const contentOrder = new OrderBuilder<GroupContentsResource>();
-
- if (sortColumn && sortColumn.name === FavoritePanelColumnNames.NAME) {
- const direction = sortColumn.sortDirection === SortDirection.ASC
- ? OrderDirection.ASC
- : OrderDirection.DESC;
-
- linkOrder.addOrder(direction, "name");
- contentOrder
- .addOrder(direction, "name", GroupContentsResourcePrefix.COLLECTION)
- .addOrder(direction, "name", GroupContentsResourcePrefix.PROCESS)
- .addOrder(direction, "name", GroupContentsResourcePrefix.PROJECT);
- }
try {
api.dispatch(progressIndicatorActions.START_WORKING(this.getId()));
const uuidPrefix = api.getState().auth.config.uuidPrefix;
import { DataColumns } from 'components/data-table/data-table';
import { serializeResourceTypeFilters } from 'store//resource-type-filters/resource-type-filters';
import { ProjectPanelColumnNames } from 'views/project-panel/project-panel';
-import { Resource, ResourceKind } from 'models/resource';
+import { ResourceKind } from 'models/resource';
import { ContainerRequestResource } from 'models/container-request';
export class SearchResultsMiddlewareService extends DataExplorerMiddlewareService {
}
}
-const typeFilters = (columns: DataColumns<string>) => serializeResourceTypeFilters(getDataExplorerColumnFilters(columns, ProjectPanelColumnNames.TYPE));
+const typeFilters = (columns: DataColumns<string, GroupContentsResource>) => serializeResourceTypeFilters(getDataExplorerColumnFilters(columns, ProjectPanelColumnNames.TYPE));
export const getParams = (dataExplorer: DataExplorer, query: string, apiRevision: number) => ({
...dataExplorerToListParams(dataExplorer),
});
const getOrder = (dataExplorer: DataExplorer) => {
- const sortColumn = getSortColumn(dataExplorer);
+ const sortColumn = getSortColumn<GroupContentsResource>(dataExplorer);
const order = new OrderBuilder<GroupContentsResource>();
- if (sortColumn) {
- const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
+ if (sortColumn && sortColumn.sort) {
+ const sortDirection = sortColumn.sort.direction === SortDirection.ASC
? OrderDirection.ASC
: OrderDirection.DESC;
return order
- .addOrder(sortDirection, sortColumn.name as keyof Resource, GroupContentsResourcePrefix.COLLECTION)
- .addOrder(sortDirection, sortColumn.name as keyof Resource, GroupContentsResourcePrefix.PROCESS)
- .addOrder(sortDirection, sortColumn.name as keyof Resource, GroupContentsResourcePrefix.PROJECT)
+ .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.COLLECTION)
+ .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.PROCESS)
+ .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.PROJECT)
.getOrder();
} else {
return order.getOrder();
import { SortDirection } from 'components/data-table/data-column';
import { OrderBuilder, OrderDirection } from 'services/api/order-builder';
import { ProjectResource } from 'models/project';
-import { ProjectPanelColumnNames } from 'views/project-panel/project-panel';
import { getSortColumn } from "store/data-explorer/data-explorer-reducer";
import { updatePublicFavorites } from 'store/public-favorites/public-favorites-actions';
import { FilterBuilder } from 'services/api/filter-builder';
});
export const getOrder = (dataExplorer: DataExplorer) => {
- const sortColumn = getSortColumn(dataExplorer);
+ const sortColumn = getSortColumn<ProjectResource>(dataExplorer);
const order = new OrderBuilder<ProjectResource>();
- if (sortColumn) {
- const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
+ if (sortColumn && sortColumn.sort) {
+ const sortDirection = sortColumn.sort.direction === SortDirection.ASC
? OrderDirection.ASC
: OrderDirection.DESC;
- const columnName = sortColumn && sortColumn.name === ProjectPanelColumnNames.NAME ? "name" : "createdAt";
- if (columnName === 'name') {
- return order
- .addOrder(sortDirection, columnName, GroupContentsResourcePrefix.COLLECTION)
- .addOrder(sortDirection, columnName, GroupContentsResourcePrefix.PROCESS)
- .addOrder(sortDirection, columnName, GroupContentsResourcePrefix.PROJECT)
- .getOrder();
- } else {
- return order
- .addOrder(sortDirection, columnName)
- .getOrder();
- }
+
+ return order
+ .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.COLLECTION)
+ .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.PROCESS)
+ .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.PROJECT)
+ .getOrder();
} else {
return order.getOrder();
}
import { ListResults } from 'services/common-service/common-service';
import { getSortColumn } from "store/data-explorer/data-explorer-reducer";
import { ProcessResource } from 'models/process';
-import { SubprocessPanelColumnNames } from 'views/subprocess-panel/subprocess-panel-root';
import { FilterBuilder, joinFilters } from 'services/api/filter-builder';
import { subprocessPanelActions } from './subprocess-panel-actions';
import { DataColumns } from 'components/data-table/data-table';
});
const getOrder = (dataExplorer: DataExplorer) => {
- const sortColumn = getSortColumn(dataExplorer);
+ const sortColumn = getSortColumn<ProcessResource>(dataExplorer);
const order = new OrderBuilder<ProcessResource>();
- if (sortColumn) {
- const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
+ if (sortColumn && sortColumn.sort) {
+ const sortDirection = sortColumn.sort.direction === SortDirection.ASC
? OrderDirection.ASC
: OrderDirection.DESC;
- const columnName = sortColumn && sortColumn.name === SubprocessPanelColumnNames.NAME ? "name" : "modifiedAt";
return order
- .addOrder(sortDirection, columnName)
+ .addOrder(sortDirection, sortColumn.sort.field)
.getOrder();
} else {
return order.getOrder();
export const getFilters = (
dataExplorer: DataExplorer,
parentContainerRequest: ContainerRequestResource) => {
- const columns = dataExplorer.columns as DataColumns<string>;
+ const columns = dataExplorer.columns as DataColumns<string, ProcessResource>;
const statusColumnFilters = getDataExplorerColumnFilters(columns, 'Status');
const activeStatusFilter = Object.keys(statusColumnFilters).find(
filterName => statusColumnFilters[filterName].selected
import { trashPanelActions } from "./trash-panel-action";
import { Dispatch, MiddlewareAPI } from "redux";
import { OrderBuilder, OrderDirection } from "services/api/order-builder";
-import { GroupContentsResourcePrefix } from "services/groups-service/groups-service";
-import { ProjectResource } from "models/project";
+import { GroupContentsResource, GroupContentsResourcePrefix } from "services/groups-service/groups-service";
import { ProjectPanelColumnNames } from "views/project-panel/project-panel";
import { updateFavorites } from "store/favorites/favorites-actions";
import { updatePublicFavorites } from 'store/public-favorites/public-favorites-actions';
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';
+import { CollectionResource } from "models/collection";
export class TrashPanelMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
async requestItems(api: MiddlewareAPI<Dispatch, RootState>) {
const dataExplorer = api.getState().dataExplorer[this.getId()];
- const columns = dataExplorer.columns as DataColumns<string>;
- const sortColumn = getSortColumn(dataExplorer);
+ const columns = dataExplorer.columns as DataColumns<string, CollectionResource>;
+ const sortColumn = getSortColumn<GroupContentsResource>(dataExplorer);
const typeFilters = serializeResourceTypeFilters(getDataExplorerColumnFilters(columns, ProjectPanelColumnNames.TYPE));
otherFilters,
);
- const order = new OrderBuilder<ProjectResource>();
+ const order = new OrderBuilder<GroupContentsResource>();
- if (sortColumn) {
- const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
+ if (sortColumn && sortColumn.sort) {
+ const sortDirection = sortColumn.sort.direction === SortDirection.ASC
? OrderDirection.ASC
: OrderDirection.DESC;
- const columnName = sortColumn && sortColumn.name === ProjectPanelColumnNames.NAME ? "name" : "createdAt";
order
- .addOrder(sortDirection, columnName, GroupContentsResourcePrefix.COLLECTION)
- .addOrder(sortDirection, columnName, GroupContentsResourcePrefix.PROJECT);
+ .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.COLLECTION)
+ .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.PROJECT);
}
const userUuid = getUserUuid(api.getState());
});
export const getOrder = (dataExplorer: DataExplorer) => {
- const sortColumn = getSortColumn(dataExplorer);
+ const sortColumn = getSortColumn<UserResource>(dataExplorer);
const order = new OrderBuilder<UserResource>();
- if (sortColumn) {
- const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
+ if (sortColumn && sortColumn.sort) {
+ const sortDirection = sortColumn.sort.direction === SortDirection.ASC
? OrderDirection.ASC
: OrderDirection.DESC;
- switch (sortColumn.name) {
- case UserPanelColumnNames.NAME:
- order.addOrder(sortDirection, "firstName")
- .addOrder(sortDirection, "lastName");
- break;
- case UserPanelColumnNames.UUID:
- order.addOrder(sortDirection, "uuid");
- break;
- case UserPanelColumnNames.EMAIL:
- order.addOrder(sortDirection, "email");
- break;
- case UserPanelColumnNames.USERNAME:
- order.addOrder(sortDirection, "username");
- break;
+
+ if (sortColumn.name === UserPanelColumnNames.NAME) {
+ order.addOrder(sortDirection, "firstName")
+ .addOrder(sortDirection, "lastName");
+ } else {
+ order.addOrder(sortDirection, sortColumn.sort.field);
}
}
return order.getOrder();
import { updateResources } from 'store/resources/resources-actions';
import { FilterBuilder } from 'services/api/filter-builder';
import { SortDirection } from 'components/data-table/data-column';
-import { WorkflowPanelColumnNames } from 'views/workflow-panel/workflow-panel-view';
import { OrderDirection, OrderBuilder } from 'services/api/order-builder';
import { WorkflowResource } from 'models/workflow';
import { ListResults } from 'services/common-service/common-service';
};
export const getOrder = (dataExplorer: DataExplorer) => {
- const sortColumn = getSortColumn(dataExplorer);
+ const sortColumn = getSortColumn<WorkflowResource>(dataExplorer);
const order = new OrderBuilder<WorkflowResource>();
- if (sortColumn) {
- const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
+ if (sortColumn && sortColumn.sort) {
+ const sortDirection = sortColumn.sort.direction === SortDirection.ASC
? OrderDirection.ASC
: OrderDirection.DESC;
- const columnName = sortColumn && sortColumn.name === WorkflowPanelColumnNames.NAME ? "name" : "modifiedAt";
+
return order
- .addOrder(sortDirection, columnName)
+ .addOrder(sortDirection, sortColumn.sort.field)
.getOrder();
} else {
return order.getOrder();
snackbarActions.OPEN_SNACKBAR({
message: 'Could not fetch workflows.',
kind: SnackbarKind.ERROR
- });
\ No newline at end of file
+ });
const mapDispatchToProps = () => {
return (dispatch: Dispatch, { id, onRowClick, onRowDoubleClick, onContextMenu }: Props) => ({
- onSetColumns: (columns: DataColumns<any>) => {
+ onSetColumns: (columns: DataColumns<any, any>) => {
dispatch(dataExplorerActions.SET_COLUMNS({ id, columns }));
},
dispatch(dataExplorerActions.SET_EXPLORER_SEARCH_VALUE({ id, searchValue }));
},
- onColumnToggle: (column: DataColumn<any>) => {
+ onColumnToggle: (column: DataColumn<any, any>) => {
dispatch(dataExplorerActions.TOGGLE_COLUMN({ id, columnName: column.name }));
},
- onSortToggle: (column: DataColumn<any>) => {
+ onSortToggle: (column: DataColumn<any, any>) => {
dispatch(dataExplorerActions.TOGGLE_SORT({ id, columnName: column.name }));
},
- onFiltersChange: (filters: DataTableFilters, column: DataColumn<any>) => {
+ onFiltersChange: (filters: DataTableFilters, column: DataColumn<any, any>) => {
dispatch(dataExplorerActions.SET_FILTERS({ id, columnName: column.name, filters }));
},
};
export const DataExplorer = connect(mapStateToProps, mapDispatchToProps)(DataExplorerComponent);
-
import { openProcessContextMenu } from 'store/context-menu/context-menu-actions';
import { loadDetailsPanel } from 'store/details-panel/details-panel-action';
import { navigateTo } from 'store/navigation/navigation-action';
-import { ContainerRequestState } from "models/container-request";
+import { ContainerRequestResource, ContainerRequestState } from "models/container-request";
import { RootState } from 'store/store';
import { createTree } from 'models/tree';
import { getInitialProcessStatusFilters, getInitialProcessTypeFilters } from 'store/resource-type-filters/resource-type-filters';
type: ResourceKind | ContainerRequestState;
}
-export const allProcessesPanelColumns: DataColumns<string> = [
+export const allProcessesPanelColumns: DataColumns<string, ContainerRequestResource> = [
{
name: AllProcessesPanelColumnNames.NAME,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "name"},
filters: createTree(),
render: uuid => <ResourceName uuid={uuid} />
},
name: AllProcessesPanelColumnNames.CREATED_AT,
selected: true,
configurable: true,
- sortDirection: SortDirection.DESC,
+ sort: {direction: SortDirection.DESC, field: "createdAt"},
filters: createTree(),
render: uuid => <ResourceCreatedAtDate uuid={uuid} />
},
CommonUuid, TokenApiClientId, TokenApiToken, TokenCreatedByIpAddress, TokenDefaultOwnerUuid, TokenExpiresAt,
TokenLastUsedAt, TokenLastUsedByIpAddress, TokenScopes, TokenUserId
} from 'views-components/data-explorer/renderers';
+import { ApiClientAuthorization } from 'models/api-client-authorization';
type CssRules = 'root';
USER_ID = 'User ID'
}
-export const apiClientAuthorizationPanelColumns: DataColumns<string> = [
+export const apiClientAuthorizationPanelColumns: DataColumns<string, ApiClientAuthorization> = [
{
name: ApiClientAuthorizationPanelColumnNames.UUID,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "uuid"},
filters: createTree(),
render: uuid => <CommonUuid uuid={uuid} />
},
LAST_MODIFIED = "Last modified"
}
-export const collectionContentAddressPanelColumns: DataColumns<string> = [
+export const collectionContentAddressPanelColumns: DataColumns<string, CollectionResource> = [
{
name: CollectionContentAddressPanelColumnNames.COLLECTION_WITH_THIS_ADDRESS,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "uuid"},
filters: createTree(),
render: uuid => <ResourceName uuid={uuid} />
},
name: CollectionContentAddressPanelColumnNames.LAST_MODIFIED,
selected: true,
configurable: true,
- sortDirection: SortDirection.DESC,
+ sort: {direction: SortDirection.DESC, field: "modifiedAt"},
filters: createTree(),
render: uuid => <ResourceLastModifiedDate uuid={uuid} />
}
import { DataColumns } from 'components/data-table/data-table';
import { RouteComponentProps } from 'react-router';
import { DataTableFilterItem } from 'components/data-table-filters/data-table-filters';
-import { SortDirection } from 'components/data-table/data-column';
import { ResourceKind } from 'models/resource';
import { ArvadosTheme } from 'common/custom-theme';
import { FAVORITE_PANEL_ID } from "store/favorite-panel/favorite-panel-action";
type: ResourceKind | ContainerRequestState;
}
-export const favoritePanelColumns: DataColumns<string> = [
+export const favoritePanelColumns: DataColumns<string, GroupContentsResource> = [
{
name: FavoritePanelColumnNames.NAME,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ // sort: {direction: SortDirection.NONE, field: "name"},
filters: createTree(),
render: uuid => <ResourceName uuid={uuid} />
},
name: FavoritePanelColumnNames.LAST_MODIFIED,
selected: true,
configurable: true,
- sortDirection: SortDirection.DESC,
+ // sort: {direction: SortDirection.DESC, field: "modifiedAt"},
filters: createTree(),
render: uuid => <ResourceLastModifiedDate uuid={uuid} />
}
import { getUserUuid } from 'common/getuser';
import { GroupResource, isBuiltinGroup } from 'models/group';
import { ArvadosTheme } from 'common/custom-theme';
+import { PermissionResource } from 'models/permission';
type CssRules = "root" | "content";
const MEMBERS_DEFAULT_MESSAGE = 'Members list is empty.';
const PERMISSIONS_DEFAULT_MESSAGE = 'Permissions list is empty.';
-export const groupDetailsMembersPanelColumns: DataColumns<string> = [
+export const groupDetailsMembersPanelColumns: DataColumns<string, PermissionResource> = [
{
name: GroupDetailsPanelMembersColumnNames.FULL_NAME,
selected: true,
},
];
-export const groupDetailsPermissionsPanelColumns: DataColumns<string> = [
+export const groupDetailsPermissionsPanelColumns: DataColumns<string, PermissionResource> = [
{
name: GroupDetailsPanelPermissionsColumnNames.NAME,
selected: true,
MEMBERS = "Members",
}
-export const groupsPanelColumns: DataColumns<string> = [
+export const groupsPanelColumns: DataColumns<string, GroupResource> = [
{
name: GroupsPanelColumnNames.GROUP,
selected: true,
configurable: true,
- sortDirection: SortDirection.ASC,
+ sort: {direction: SortDirection.ASC, field: "name"},
filters: createTree(),
render: uuid => <ResourceName uuid={uuid} />
},
from 'views-components/data-explorer/renderers';
import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core';
import { ArvadosTheme } from 'common/custom-theme';
+import { LinkResource } from 'models/link';
type CssRules = "root";
UUID = "UUID"
}
-export const linkPanelColumns: DataColumns<string> = [
+export const linkPanelColumns: DataColumns<string, LinkResource> = [
{
name: LinkPanelColumnNames.NAME,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "name"},
filters: createTree(),
render: uuid => <ResourceLinkName uuid={uuid} />
},
import { GroupClass, GroupResource } from 'models/group';
import { CollectionResource } from 'models/collection';
import { resourceIsFrozen } from 'common/frozen-resources';
+import { ProjectResource } from 'models/project';
type CssRules = 'root' | "button";
type: ResourceKind | ContainerRequestState;
}
-export const projectPanelColumns: DataColumns<string> = [
+export const projectPanelColumns: DataColumns<string, ProjectResource> = [
{
name: ProjectPanelColumnNames.NAME,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "name"},
filters: createTree(),
render: uuid => <ResourceName uuid={uuid} />
},
name: ProjectPanelColumnNames.CREATED_AT,
selected: false,
configurable: true,
- sortDirection: SortDirection.DESC,
+ sort: {direction: SortDirection.NONE, field: "createdAt"},
filters: createTree(),
render: uuid => <ResourceCreatedAtDate uuid={uuid} />
},
name: ProjectPanelColumnNames.LAST_MODIFIED,
selected: true,
configurable: true,
- sortDirection: SortDirection.DESC,
+ sort: {direction: SortDirection.DESC, field: "modifiedAt"},
filters: createTree(),
render: uuid => <ResourceLastModifiedDate uuid={uuid} />
},
name: ProjectPanelColumnNames.TRASH_AT,
selected: false,
configurable: true,
- sortDirection: SortDirection.DESC,
+ sort: {direction: SortDirection.NONE, field: "trashAt"},
filters: createTree(),
render: uuid => <ResourceTrashDate uuid={uuid} />
},
name: ProjectPanelColumnNames.DELETE_AT,
selected: false,
configurable: true,
- sortDirection: SortDirection.DESC,
+ sort: {direction: SortDirection.NONE, field: "deleteAt"},
filters: createTree(),
render: uuid => <ResourceDeleteDate uuid={uuid} />
},
import { DataColumns } from 'components/data-table/data-table';
import { RouteComponentProps } from 'react-router';
import { DataTableFilterItem } from 'components/data-table-filters/data-table-filters';
-import { SortDirection } from 'components/data-table/data-column';
import { ResourceKind } from 'models/resource';
import { ArvadosTheme } from 'common/custom-theme';
import {
type: ResourceKind | ContainerRequestState;
}
-export const publicFavoritePanelColumns: DataColumns<string> = [
+export const publicFavoritePanelColumns: DataColumns<string, GroupContentsResource> = [
{
name: PublicFavoritePanelColumnNames.NAME,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ // sort: {direction: SortDirection.NONE, field: "name"},
filters: createTree(),
render: uuid => <ResourceName uuid={uuid} />
},
name: PublicFavoritePanelColumnNames.LAST_MODIFIED,
selected: true,
configurable: true,
- sortDirection: SortDirection.DESC,
+ // sort: {direction: SortDirection.DESC, field: "modifiedAt"},
filters: createTree(),
render: uuid => <ResourceLastModifiedDate uuid={uuid} />
}
import { ArvadosTheme } from 'common/custom-theme';
import { getSearchSessions } from 'store/search-bar/search-bar-actions';
import { camelCase } from 'lodash';
+import { GroupContentsResource } from 'services/groups-service/groups-service';
export enum SearchResultsPanelColumnNames {
CLUSTER = "Cluster",
type: ResourceKind | ContainerRequestState;
}
-export const searchResultsPanelColumns: DataColumns<string> = [
+export const searchResultsPanelColumns: DataColumns<string, GroupContentsResource> = [
{
name: SearchResultsPanelColumnNames.CLUSTER,
selected: true,
name: SearchResultsPanelColumnNames.NAME,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "name"},
filters: createTree(),
render: (uuid: string) => <ResourceName uuid={uuid} />
},
name: SearchResultsPanelColumnNames.LAST_MODIFIED,
selected: true,
configurable: true,
- sortDirection: SortDirection.DESC,
+ sort: {direction: SortDirection.DESC, field: "modifiedAt"},
filters: createTree(),
render: uuid => <ResourceLastModifiedDate uuid={uuid} />
}
import { MPVPanelProps } from 'components/multi-panel-view/multi-panel-view';
import { StyleRulesCallback, Typography, WithStyles, withStyles } from '@material-ui/core';
import { ArvadosTheme } from 'common/custom-theme';
+import { ProcessResource } from 'models/process';
type CssRules = 'iconHeader' | 'cardHeader';
type: ResourceKind | ContainerRequestState;
}
-export const subprocessPanelColumns: DataColumns<string> = [
+export const subprocessPanelColumns: DataColumns<string, ProcessResource> = [
{
name: SubprocessPanelColumnNames.NAME,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "name"},
filters: createTree(),
render: uuid => <ResourceName uuid={uuid} />
},
name: SubprocessPanelColumnNames.CREATED_AT,
selected: true,
configurable: true,
- sortDirection: SortDirection.DESC,
+ sort: {direction: SortDirection.DESC, field: "createdAt"},
filters: createTree(),
render: uuid => <ResourceCreatedAtDate uuid={uuid} />
},
import {
getTrashPanelTypeFilters
} from 'store/resource-type-filters/resource-type-filters';
+import { CollectionResource } from 'models/collection';
type CssRules = "toolbar" | "button" | "root";
</Tooltip>
);
-export const trashPanelColumns: DataColumns<string> = [
+export const trashPanelColumns: DataColumns<string, CollectionResource> = [
{
name: TrashPanelColumnNames.NAME,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "name"},
filters: createTree(),
render: uuid => <ResourceName uuid={uuid} />
},
name: TrashPanelColumnNames.TYPE,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
filters: getTrashPanelTypeFilters(),
render: uuid => <ResourceType uuid={uuid} />,
},
name: TrashPanelColumnNames.FILE_SIZE,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "fileSizeTotal"},
filters: createTree(),
render: uuid => <ResourceFileSize uuid={uuid} />
},
name: TrashPanelColumnNames.TRASHED_DATE,
selected: true,
configurable: true,
- sortDirection: SortDirection.DESC,
+ sort: {direction: SortDirection.DESC, field: "trashAt"},
filters: createTree(),
render: uuid => <ResourceTrashDate uuid={uuid} />
},
name: TrashPanelColumnNames.TO_BE_DELETED,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "deleteAt"},
filters: createTree(),
render: uuid => <ResourceDeleteDate uuid={uuid} />
},
name: '',
selected: true,
configurable: false,
- sortDirection: SortDirection.NONE,
filters: createTree(),
render: uuid => <ResourceRestore uuid={uuid} />
}
USERNAME = "Username"
}
-export const userPanelColumns: DataColumns<string> = [
+export const userPanelColumns: DataColumns<string, UserResource> = [
{
name: UserPanelColumnNames.NAME,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "firstName"},
filters: createTree(),
render: uuid => <UserResourceFullName uuid={uuid} link={true} />
},
name: UserPanelColumnNames.UUID,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "uuid"},
filters: createTree(),
render: uuid => <ResourceUuid uuid={uuid} />
},
name: UserPanelColumnNames.EMAIL,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "email"},
filters: createTree(),
render: uuid => <ResourceEmail uuid={uuid} />
},
name: UserPanelColumnNames.USERNAME,
selected: true,
configurable: false,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "username"},
filters: createTree(),
render: uuid => <ResourceUsername uuid={uuid} />
}
import { getResource, ResourcesState } from 'store/resources/resources';
import { DefaultView } from 'components/default-view/default-view';
import { CopyToClipboardSnackbar } from 'components/copy-to-clipboard-snackbar/copy-to-clipboard-snackbar';
+import { PermissionResource } from 'models/permission';
type CssRules = 'root' | 'emptyRoot' | 'gridItem' | 'label' | 'readOnlyValue' | 'title' | 'description' | 'actions' | 'content' | 'copyIcon';
}
-export const userProfileGroupsColumns: DataColumns<string> = [
+export const userProfileGroupsColumns: DataColumns<string, PermissionResource> = [
{
name: UserProfileGroupsColumnNames.NAME,
selected: true,
// }
// };
-export const workflowPanelColumns: DataColumns<string> = [
+export const workflowPanelColumns: DataColumns<string, WorkflowResource> = [
{
name: WorkflowPanelColumnNames.NAME,
selected: true,
configurable: true,
- sortDirection: SortDirection.ASC,
+ sort: {direction: SortDirection.ASC, field: "name"},
filters: createTree(),
render: (uuid: string) => <ResourceWorkflowName uuid={uuid} />
},
name: WorkflowPanelColumnNames.LAST_MODIFIED,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "modifiedAt"},
filters: createTree(),
render: (uuid: string) => <ResourceLastModifiedDate uuid={uuid} />
},
projects / arvados-workbench2.git / commitdiff