projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed redubdant "state" column
[arvados-workbench2.git]
/
src
/
views
/
project-panel
/
project-panel.tsx
diff --git
a/src/views/project-panel/project-panel.tsx
b/src/views/project-panel/project-panel.tsx
index 0ba61893c1240500c082030d397e580ce9994c6c..61d555483ea340b5056b9328ca49d517bfeadc7c 100644
(file)
--- a/
src/views/project-panel/project-panel.tsx
+++ b/
src/views/project-panel/project-panel.tsx
@@
-16,21
+16,26
@@
import { ContainerRequestState } from 'models/container-request';
import { SortDirection } from 'components/data-table/data-column';
import { ResourceKind, Resource } from 'models/resource';
import {
import { SortDirection } from 'components/data-table/data-column';
import { ResourceKind, Resource } from 'models/resource';
import {
+ ResourceName,
+ ProcessStatus as ResourceStatus,
+ ResourceType,
+ ResourceOwnerWithName,
+ ResourceVersion,
+ ResourceDescription,
ResourceFileSize,
ResourceFileSize,
+ ResourceFileCount,
+ ResourceUUID,
+ ResourceContainerUuid,
+ ResourceOutputUuid,
+ ResourceLogUuid,
+ ResourceParentProcess,
+ ResourcePortableDataHash,
ResourceCreatedAtDate,
ResourceLastModifiedDate,
ResourceTrashDate,
ResourceDeleteDate,
ResourceCreatedAtDate,
ResourceLastModifiedDate,
ResourceTrashDate,
ResourceDeleteDate,
- ProcessStatus,
- ResourceType,
- ResourceUUID,
- ResourceMetadata,
- ResourceVersion,
- ResourceDescription,
- ResourceOwnerWithName
} from 'views-components/data-explorer/renderers';
import { ProjectIcon } from 'components/icon/icon';
} from 'views-components/data-explorer/renderers';
import { ProjectIcon } from 'components/icon/icon';
-import { ResourceName } from 'views-components/data-explorer/renderers';
import {
ResourcesState,
getResource
import {
ResourcesState,
getResource
@@
-70,15
+75,20
@@
export enum ProjectPanelColumnNames {
STATUS = "Status",
TYPE = "Type",
OWNER = "Owner",
STATUS = "Status",
TYPE = "Type",
OWNER = "Owner",
+ VERSION = "Version",
+ DESCRIPTION = "Description",
FILE_SIZE = "File size",
FILE_SIZE = "File size",
+ FILE_COUNT = "File count",
UUID = "UUID",
UUID = "UUID",
+ CONTAINER_UUID = "Container UUID",
+ OUTPUT_UUID = "Output UUID",
+ LOG_UUID = "Log UUID",
+ PARENT_PROCESS = 'Parent process UUID',
+ PORTABLE_DATA_HASH = "Portable data hash",
CREATED_AT = "Date created",
LAST_MODIFIED = "Last modified",
TRASH_AT = "Trash at",
DELETE_AT = "Delete at",
CREATED_AT = "Date created",
LAST_MODIFIED = "Last modified",
TRASH_AT = "Trash at",
DELETE_AT = "Delete at",
- DESCRIPTION = "Description",
- METADATA = "Metadata",
- VERSION = "Version"
}
export interface ProjectPanelFilter extends DataTableFilterItem {
}
export interface ProjectPanelFilter extends DataTableFilterItem {
@@
-95,12
+105,12
@@
export const projectPanelColumns: DataColumns<string> = [
render: uuid => <ResourceName uuid={uuid} />
},
{
render: uuid => <ResourceName uuid={uuid} />
},
{
- name:
"Status"
,
+ name:
ProjectPanelColumnNames.STATUS
,
selected: true,
configurable: true,
mutuallyExclusiveFilters: true,
filters: getInitialProcessStatusFilters(),
selected: true,
configurable: true,
mutuallyExclusiveFilters: true,
filters: getInitialProcessStatusFilters(),
- render: uuid => <
Process
Status uuid={uuid} />,
+ render: uuid => <
Resource
Status uuid={uuid} />,
},
{
name: ProjectPanelColumnNames.TYPE,
},
{
name: ProjectPanelColumnNames.TYPE,
@@
-116,6
+126,20
@@
export const projectPanelColumns: DataColumns<string> = [
filters: createTree(),
render: uuid => <ResourceOwnerWithName uuid={uuid} />
},
filters: createTree(),
render: uuid => <ResourceOwnerWithName uuid={uuid} />
},
+ {
+ name: ProjectPanelColumnNames.VERSION,
+ selected: false,
+ configurable: true,
+ filters: createTree(),
+ render: uuid =><ResourceVersion uuid={uuid}/>
+ },
+ {
+ name: ProjectPanelColumnNames.DESCRIPTION,
+ selected: false,
+ configurable: true,
+ filters: createTree(),
+ render: uuid =><ResourceDescription uuid={uuid}/>
+ },
{
name: ProjectPanelColumnNames.FILE_SIZE,
selected: true,
{
name: ProjectPanelColumnNames.FILE_SIZE,
selected: true,
@@
-123,65
+147,88
@@
export const projectPanelColumns: DataColumns<string> = [
filters: createTree(),
render: uuid => <ResourceFileSize uuid={uuid} />
},
filters: createTree(),
render: uuid => <ResourceFileSize uuid={uuid} />
},
+ {
+ name: ProjectPanelColumnNames.FILE_COUNT,
+ selected: false,
+ configurable: true,
+ filters: createTree(),
+ render: uuid =><ResourceFileCount uuid={uuid}/>
+ },
{
name: ProjectPanelColumnNames.UUID,
{
name: ProjectPanelColumnNames.UUID,
- selected:
tru
e,
+ selected:
fals
e,
configurable: true,
filters: createTree(),
render: uuid => <ResourceUUID uuid={uuid}/>
},
{
configurable: true,
filters: createTree(),
render: uuid => <ResourceUUID uuid={uuid}/>
},
{
- name: ProjectPanelColumnNames.
METADATA
,
+ name: ProjectPanelColumnNames.
CONTAINER_UUID
,
selected: false,
configurable: true,
filters: createTree(),
selected: false,
configurable: true,
filters: createTree(),
- render: uuid => <Resource
Metadata
uuid={uuid}/>
+ render: uuid => <Resource
ContainerUuid
uuid={uuid}/>
},
{
},
{
- name: ProjectPanelColumnNames.
CREATED_AT
,
+ name: ProjectPanelColumnNames.
OUTPUT_UUID
,
selected: false,
configurable: true,
filters: createTree(),
selected: false,
configurable: true,
filters: createTree(),
- render: uuid =>
<ResourceCreatedAtDate
uuid={uuid}/>
+ render: uuid =>
<ResourceOutputUuid
uuid={uuid}/>
},
{
},
{
- name: ProjectPanelColumnNames.L
AST_MODIFIE
D,
+ name: ProjectPanelColumnNames.L
OG_UUI
D,
selected: false,
configurable: true,
selected: false,
configurable: true,
- sortDirection: SortDirection.DESC,
filters: createTree(),
filters: createTree(),
- render: uuid => <ResourceL
astModifiedDate uuid={uuid}
/>
+ render: uuid => <ResourceL
ogUuid uuid={uuid}
/>
},
{
},
{
- name: ProjectPanelColumnNames.
TRASH_AT
,
+ name: ProjectPanelColumnNames.
PARENT_PROCESS
,
selected: false,
configurable: true,
selected: false,
configurable: true,
- sortDirection: SortDirection.DESC,
filters: createTree(),
filters: createTree(),
- render: uuid => <Resource
TrashDate uuid={uuid}
/>
+ render: uuid => <Resource
ParentProcess uuid={uuid}
/>
},
{
},
{
- name: ProjectPanelColumnNames.DELETE_AT,
+ name: ProjectPanelColumnNames.PORTABLE_DATA_HASH,
+ selected: false,
+ configurable: true,
+ filters: createTree(),
+ render: uuid => <ResourcePortableDataHash uuid={uuid}/>
+ },
+ {
+ name: ProjectPanelColumnNames.CREATED_AT,
selected: false,
configurable: true,
sortDirection: SortDirection.DESC,
filters: createTree(),
selected: false,
configurable: true,
sortDirection: SortDirection.DESC,
filters: createTree(),
- render: uuid =>
<ResourceDeleteDate uuid={uuid}
/>
+ render: uuid =>
<ResourceCreatedAtDate uuid={uuid}
/>
},
{
},
{
- name: ProjectPanelColumnNames.
DESCRIPTION
,
+ name: ProjectPanelColumnNames.
LAST_MODIFIED
,
selected: true,
configurable: true,
selected: true,
configurable: true,
+ sortDirection: SortDirection.DESC,
filters: createTree(),
filters: createTree(),
- render: uuid =>
<ResourceDescription uuid={uuid}
/>
+ render: uuid =>
<ResourceLastModifiedDate uuid={uuid}
/>
},
{
},
{
- name: ProjectPanelColumnNames.
VERSION
,
+ name: ProjectPanelColumnNames.
TRASH_AT
,
selected: false,
configurable: true,
selected: false,
configurable: true,
+ sortDirection: SortDirection.DESC,
filters: createTree(),
filters: createTree(),
- render: uuid =><ResourceVersion uuid={uuid}/>
- }
+ render: uuid => <ResourceTrashDate uuid={uuid} />
+ },
+ {
+ name: ProjectPanelColumnNames.DELETE_AT,
+ selected: false,
+ configurable: true,
+ sortDirection: SortDirection.DESC,
+ filters: createTree(),
+ render: uuid => <ResourceDeleteDate uuid={uuid} />
+ },
+
];
export const PROJECT_PANEL_ID = "projectPanel";
];
export const PROJECT_PANEL_ID = "projectPanel";