APP_NAME?=arvados-workbench2
-# GIT_TAG is the last tagged stable release (i.e. 1.2.0)
-GIT_TAG?=$(shell git describe --abbrev=0)
-
-# TS_GIT is the timestamp in the current directory (i.e. 1528815021).
-# Note that it will only change if files change.
-TS_GIT?=$(shell git log -n1 --first-parent "--format=format:%ct" .)
-
-# DATE_FROM_TS_GIT is the human(ish)-readable version of TS_GIT
-# 1528815021 -> 20180612145021
-DATE_FROM_TS_GIT?=$(shell date -ud @$(TS_GIT) +%Y%m%d%H%M%S)
-
# VERSION uses all the above to produce X.Y.Z.timestamp
# something in the lines of 1.2.0.20180612145021, this will be the package version
# it can be overwritten when invoking make as in make packages VERSION=1.2.0
-VERSION?=$(GIT_TAG).$(DATE_FROM_TS_GIT)
+VERSION?=$(shell ./version-at-commit.sh HEAD)
# ITERATION is the package iteration, intended for manual change if anything non-code related
# changes in the package. (i.e. example config files externally added
ITERATION?=1
+TARGETS?="centos7 debian8 debian9 debian10 ubuntu1404 ubuntu1604 ubuntu1804"
+
DESCRIPTION=Arvados Workbench2 - Arvados is a free and open source platform for big data science.
MAINTAINER=Ward Vandewege <wvandewege@veritasgenetics.com>
$(WORKSPACE)/build/=$(DEST_DIR)
copy: $(DEB_FILE) $(RPM_FILE)
- mkdir packages
- for target in $^ ; do \
+ for target in $(TARGETS) ; do \
+ mkdir -p packages/$$target
if [[ $$target =~ ^centos ]]; then
cp -p $(RPM_FILE) packages/$$target ; \
else
# use FPM to create DEB and RPM
packages: copy
+
+workbench2-build-image:
+ docker build -t workbench2-build .
const groupDetailsMatch = Routes.matchGroupDetailsRoute(pathname);
const linksMatch = Routes.matchLinksRoute(pathname);
const collectionsContentAddressMatch = Routes.matchCollectionsContentAddressRoute(pathname);
+ const allProcessesMatch = Routes.matchAllProcessesRoute(pathname);
store.dispatch(dialogActions.CLOSE_ALL_DIALOGS());
store.dispatch(contextMenuActions.CLOSE_CONTEXT_MENU());
store.dispatch(WorkbenchActions.loadLinks);
} else if (collectionsContentAddressMatch) {
store.dispatch(WorkbenchActions.loadCollectionContentAddress);
+ } else if (allProcessesMatch) {
+ store.dispatch(WorkbenchActions.loadAllProcesses());
}
};
\ No newline at end of file
LINKS: '/links',
PUBLIC_FAVORITES: '/public-favorites',
COLLECTIONS_CONTENT_ADDRESS: '/collections/:id',
+ ALL_PROCESSES: '/all_processes',
};
export const getResourceUrl = (uuid: string) => {
export const matchTrashRoute = (route: string) =>
matchPath(route, { path: Routes.TRASH });
+export const matchAllProcessesRoute = (route: string) =>
+ matchPath(route, { path: Routes.ALL_PROCESSES });
+
export const matchProjectRoute = (route: string) =>
matchPath<ResourceRouteParams>(route, { path: Routes.PROJECTS });
--- /dev/null
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { bindDataExplorerActions } from "../data-explorer/data-explorer-action";
+
+export const ALL_PROCESSES_PANEL_ID = "allProcessesPanel";
+export const allProcessesPanelActions = bindDataExplorerActions(ALL_PROCESSES_PANEL_ID);
+
+export const loadAllProcessesPanel = () => allProcessesPanelActions.REQUEST_ITEMS();
--- /dev/null
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { DataExplorerMiddlewareService, dataExplorerToListParams, getDataExplorerColumnFilters } 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";
+import { allProcessesPanelActions } from "./all-processes-panel-action";
+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.ts';
+import { getDataExplorer, DataExplorer, getSortColumn } 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 {
+ ProcessStatusFilter,
+ buildProcessStatusFilters,
+ 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 { ProcessResource } from "~/models/process";
+import { SortDirection } from "~/components/data-table/data-column";
+
+export class AllProcessesPanelMiddlewareService extends DataExplorerMiddlewareService {
+ constructor(private services: ServiceRepository, id: string) {
+ super(id);
+ }
+
+ async requestItems(api: MiddlewareAPI<Dispatch, RootState>) {
+ const dataExplorer = getDataExplorer(api.getState().dataExplorer, this.getId());
+ if (!dataExplorer) {
+ api.dispatch(allProcessesPanelDataExplorerIsNotSet());
+ } else {
+ try {
+ api.dispatch(progressIndicatorActions.START_WORKING(this.getId()));
+ const processItems = await this.services.containerRequestService.list(
+ { ...getParams(dataExplorer) });
+
+ api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId()));
+ api.dispatch(resourcesActions.SET_RESOURCES(processItems.items));
+ await api.dispatch<any>(loadMissingProcessesInformation(processItems.items));
+ api.dispatch(allProcessesPanelActions.SET_ITEMS({
+ items: processItems.items.map((resource: any) => resource.uuid),
+ itemsAvailable: processItems.itemsAvailable,
+ page: Math.floor(processItems.offset / processItems.limit),
+ rowsPerPage: processItems.limit
+ }));
+ } catch {
+ api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId()));
+ api.dispatch(allProcessesPanelActions.SET_ITEMS({
+ items: [],
+ itemsAvailable: 0,
+ page: 0,
+ rowsPerPage: dataExplorer.rowsPerPage
+ }));
+ api.dispatch(couldNotFetchAllProcessesListing());
+ }
+ }
+ }
+}
+
+const getParams = ( dataExplorer: DataExplorer ) => ({
+ ...dataExplorerToListParams(dataExplorer),
+ order: getOrder(dataExplorer),
+ filters: getFilters(dataExplorer)
+});
+
+const getFilters = ( dataExplorer: DataExplorer ) => {
+ const columns = dataExplorer.columns as DataColumns<string>;
+ const statusColumnFilters = getDataExplorerColumnFilters(columns, 'Status');
+ const activeStatusFilter = Object.keys(statusColumnFilters).find(
+ filterName => statusColumnFilters[filterName].selected
+ ) || ProcessStatusFilter.ALL;
+
+ const nameFilter = new FilterBuilder().addILike("name", dataExplorer.searchValue).getFilters();
+ const statusFilter = buildProcessStatusFilters(new FilterBuilder(), activeStatusFilter).getFilters();
+ const typeFilters = serializeOnlyProcessTypeFilters(getDataExplorerColumnFilters(columns, AllProcessesPanelColumnNames.TYPE));
+
+ return joinFilters(
+ nameFilter,
+ statusFilter,
+ typeFilters
+ );
+};
+
+const getOrder = (dataExplorer: DataExplorer) => {
+ const sortColumn = getSortColumn(dataExplorer);
+ const order = new OrderBuilder<ProcessResource>();
+ if (sortColumn) {
+ const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
+ ? OrderDirection.ASC
+ : OrderDirection.DESC;
+
+ const columnName = sortColumn && sortColumn.name === AllProcessesPanelColumnNames.NAME ? "name" : "createdAt";
+ return order
+ .addOrder(sortDirection, columnName)
+ .getOrder();
+ } else {
+ return order.getOrder();
+ }
+};
+
+const allProcessesPanelDataExplorerIsNotSet = () =>
+ snackbarActions.OPEN_SNACKBAR({
+ message: 'All Processes panel is not ready.',
+ kind: SnackbarKind.ERROR
+ });
+
+const couldNotFetchAllProcessesListing = () =>
+ snackbarActions.OPEN_SNACKBAR({
+ message: 'Could not fetch All Processes listing.',
+ kind: SnackbarKind.ERROR
+ });
export const navigateTo = (uuid: string) =>
async (dispatch: Dispatch, getState: () => RootState) => {
const kind = extractUuidKind(uuid);
- if (kind === ResourceKind.PROJECT || kind === ResourceKind.USER || kind === ResourceKind.COLLECTION || kind === ResourceKind.CONTAINER_REQUEST) {
- dispatch<any>(pushOrGoto(getNavUrl(uuid, getState().auth)));
- } else if (kind === ResourceKind.VIRTUAL_MACHINE) {
- dispatch<any>(navigateToAdminVirtualMachines);
+
+ switch (kind) {
+ case ResourceKind.PROJECT:
+ case ResourceKind.USER:
+ case ResourceKind.COLLECTION:
+ case ResourceKind.CONTAINER_REQUEST:
+ dispatch<any>(pushOrGoto(getNavUrl(uuid, getState().auth)));
+ return;
+ case ResourceKind.VIRTUAL_MACHINE:
+ dispatch<any>(navigateToAdminVirtualMachines);
+ return;
}
- if (uuid === SidePanelTreeCategory.FAVORITES) {
- dispatch<any>(navigateToFavorites);
- } else if (uuid === SidePanelTreeCategory.PUBLIC_FAVORITES) {
- dispatch(navigateToPublicFavorites);
- } else if (uuid === SidePanelTreeCategory.SHARED_WITH_ME) {
- dispatch(navigateToSharedWithMe);
- } else if (uuid === SidePanelTreeCategory.WORKFLOWS) {
- dispatch(navigateToWorkflows);
- } else if (uuid === SidePanelTreeCategory.TRASH) {
- dispatch(navigateToTrash);
- } else if (uuid === GROUPS_PANEL_LABEL) {
- dispatch(navigateToGroups);
+
+ switch (uuid) {
+ case SidePanelTreeCategory.FAVORITES:
+ dispatch<any>(navigateToFavorites);
+ return;
+ case SidePanelTreeCategory.PUBLIC_FAVORITES:
+ dispatch(navigateToPublicFavorites);
+ return;
+ case SidePanelTreeCategory.SHARED_WITH_ME:
+ dispatch(navigateToSharedWithMe);
+ return;
+ case SidePanelTreeCategory.WORKFLOWS:
+ dispatch(navigateToWorkflows);
+ return;
+ case SidePanelTreeCategory.TRASH:
+ dispatch(navigateToTrash);
+ return;
+ case GROUPS_PANEL_LABEL:
+ dispatch(navigateToGroups);
+ return;
+ case SidePanelTreeCategory.ALL_PROCESSES:
+ dispatch(navigateToAllProcesses);
+ return;
}
};
export const navigateToLinks = push(Routes.LINKS);
export const navigateToCollectionsContentAddress = push(Routes.COLLECTIONS_CONTENT_ADDRESS);
+
+export const navigateToAllProcesses = push(Routes.ALL_PROCESSES);
case containerRequest.state === ContainerRequestState.UNCOMMITTED:
return ProcessStatus.DRAFT;
+ case container && container.state === ContainerState.COMPLETE && container.exitCode === 0:
+ return ProcessStatus.COMPLETED;
+
case containerRequest.priority === 0:
case container && container.state === ContainerState.CANCELLED:
return ProcessStatus.CANCELLED;
case container && container.state === ContainerState.RUNNING:
return ProcessStatus.RUNNING;
- case container && container.state === ContainerState.COMPLETE && container.exitCode === 0:
- return ProcessStatus.COMPLETED;
-
case container && container.state === ContainerState.COMPLETE && container.exitCode !== 0:
return ProcessStatus.FAILED;
import { getSelectedNodes } from '~/models/tree';
import { CollectionType } from '~/models/collection';
import { GroupContentsResourcePrefix } from '~/services/groups-service/groups-service';
+import { ContainerState } from '~/models/container';
export enum ProcessStatusFilter {
ALL = 'All',
initFilter(ObjectTypeFilter.COLLECTION),
);
-// Using pipe() with more tha 7 arguments makes the return type be 'any',
+// Using pipe() with more than 7 arguments makes the return type be 'any',
// causing compile issues.
export const getInitialResourceTypeFilters = pipe(
(): DataTableFilters => createTree<DataTableFilterItem>(),
),
);
+export const getInitialProcessTypeFilters = pipe(
+ (): DataTableFilters => createTree<DataTableFilterItem>(),
+ initFilter(ProcessTypeFilter.MAIN_PROCESS),
+ initFilter(ProcessTypeFilter.CHILD_PROCESS, '', false)
+);
+
export const getInitialProcessStatusFilters = pipe(
(): DataTableFilters => createTree<DataTableFilterItem>(),
pipe(
() => getMatchingFilters(values(ProcessTypeFilter), selectedFilters),
filters => filters,
mappedFilters => ({
- fb: buildProcessTypeFilters({ fb, filters: mappedFilters }),
+ fb: buildProcessTypeFilters({ fb, filters: mappedFilters, use_prefix: true }),
selectedFilters
})
)();
const PROCESS_TYPES = values(ProcessTypeFilter);
const PROCESS_PREFIX = GroupContentsResourcePrefix.PROCESS;
-const buildProcessTypeFilters = ({ fb, filters }: { fb: FilterBuilder, filters: string[] }) => {
+const buildProcessTypeFilters = ({ fb, filters, use_prefix }: { fb: FilterBuilder, filters: string[], use_prefix: boolean }) => {
switch (true) {
case filters.length === 0 || filters.length === PROCESS_TYPES.length:
return fb;
case includes(ProcessTypeFilter.MAIN_PROCESS, filters):
- return fb.addEqual('requesting_container_uuid', null, PROCESS_PREFIX);
+ return fb.addEqual('requesting_container_uuid', null, use_prefix ? PROCESS_PREFIX : '');
case includes(ProcessTypeFilter.CHILD_PROCESS, filters):
- return fb.addDistinct('requesting_container_uuid', null, PROCESS_PREFIX);
+ return fb.addDistinct('requesting_container_uuid', null, use_prefix ? PROCESS_PREFIX : '');
default:
return fb;
}
({ fb }) => fb.getFilters(),
);
+export const serializeOnlyProcessTypeFilters = pipe(
+ createFiltersBuilder,
+ ({ fb, selectedFilters }: ReturnType<typeof createFiltersBuilder>) => pipe(
+ () => getMatchingFilters(values(ProcessTypeFilter), selectedFilters),
+ filters => filters,
+ mappedFilters => ({
+ fb: buildProcessTypeFilters({ fb, filters: mappedFilters, use_prefix: false }),
+ selectedFilters
+ })
+ )(),
+ ({ fb }) => fb.getFilters(),
+);
+
export const serializeSimpleObjectTypeFilters = (filters: Tree<DataTableFilterItem>) => {
return getSelectedNodes(filters)
.map(f => f.id)
.map(objectTypeToResourceKind);
};
+
+export const buildProcessStatusFilters = ( fb:FilterBuilder, activeStatusFilter:string ): FilterBuilder => {
+ switch (activeStatusFilter) {
+ case ProcessStatusFilter.COMPLETED: {
+ fb.addEqual('container.state', ContainerState.COMPLETE);
+ fb.addEqual('container.exit_code', '0');
+ break;
+ }
+ case ProcessStatusFilter.FAILED: {
+ fb.addEqual('container.state', ContainerState.COMPLETE);
+ fb.addDistinct('container.exit_code', '0');
+ break;
+ }
+ case ProcessStatusFilter.QUEUED: {
+ fb.addEqual('container.state', ContainerState.QUEUED);
+ fb.addDistinct('container.priority', '0');
+ break;
+ }
+ case ProcessStatusFilter.CANCELLED:
+ case ProcessStatusFilter.FAILED:
+ case ProcessStatusFilter.LOCKED:
+ case ProcessStatusFilter.RUNNING: {
+ fb.addEqual('container.state', activeStatusFilter);
+ break;
+ }
+ }
+ return fb;
+};
\ No newline at end of file
PUBLIC_FAVORITES = 'Public Favorites',
WORKFLOWS = 'Workflows',
FAVORITES = 'Favorites',
- TRASH = 'Trash'
+ TRASH = 'Trash',
+ ALL_PROCESSES = 'All Processes'
}
export const SIDE_PANEL_TREE = 'sidePanelTree';
};
const SIDE_PANEL_CATEGORIES = [
+ SidePanelTreeCategory.ALL_PROCESSES,
SidePanelTreeCategory.PUBLIC_FAVORITES,
SidePanelTreeCategory.WORKFLOWS,
SidePanelTreeCategory.FAVORITES,
import { Dispatch } from 'redux';
import { isSidePanelTreeCategory, SidePanelTreeCategory } from '~/store/side-panel-tree/side-panel-tree-actions';
-import { navigateToFavorites, navigateTo, navigateToTrash, navigateToSharedWithMe, navigateToWorkflows, navigateToPublicFavorites } from '~/store/navigation/navigation-action';
+import { navigateToFavorites, navigateTo, navigateToTrash, navigateToSharedWithMe, navigateToWorkflows, navigateToPublicFavorites, navigateToAllProcesses } from '~/store/navigation/navigation-action';
import {snackbarActions, SnackbarKind} from '~/store/snackbar/snackbar-actions';
export const navigateFromSidePanel = (id: string) =>
return navigateToSharedWithMe;
case SidePanelTreeCategory.WORKFLOWS:
return navigateToWorkflows;
+ case SidePanelTreeCategory.ALL_PROCESSES:
+ return navigateToAllProcesses;
default:
return sidePanelTreeCategoryNotAvailable(id);
}
import { PROJECT_PANEL_ID } from "./project-panel/project-panel-action";
import { ProjectPanelMiddlewareService } from "./project-panel/project-panel-middleware-service";
import { FavoritePanelMiddlewareService } from "./favorite-panel/favorite-panel-middleware-service";
+import { AllProcessesPanelMiddlewareService } from "./all-processes-panel/all-processes-panel-middleware-service";
import { collectionPanelReducer } from './collection-panel/collection-panel-reducer';
import { dialogReducer } from './dialog/dialog-reducer';
import { ServiceRepository } from "~/services/services";
import { ownerNameReducer } from '~/store/owner-name/owner-name-reducer';
import { SubprocessMiddlewareService } from '~/store/subprocess-panel/subprocess-panel-middleware-service';
import { SUBPROCESS_PANEL_ID } from '~/store/subprocess-panel/subprocess-panel-actions';
+import { ALL_PROCESSES_PANEL_ID } from './all-processes-panel/all-processes-panel-action';
const composeEnhancers =
(process.env.NODE_ENV === 'development' &&
const favoritePanelMiddleware = dataExplorerMiddleware(
new FavoritePanelMiddlewareService(services, FAVORITE_PANEL_ID)
);
+ const allProcessessPanelMiddleware = dataExplorerMiddleware(
+ new AllProcessesPanelMiddlewareService(services, ALL_PROCESSES_PANEL_ID)
+ );
const trashPanelMiddleware = dataExplorerMiddleware(
new TrashPanelMiddlewareService(services, TRASH_PANEL_ID)
);
authMiddleware(services),
projectPanelMiddleware,
favoritePanelMiddleware,
+ allProcessessPanelMiddleware,
trashPanelMiddleware,
searchResultsPanelMiddleware,
sharedWithMePanelMiddleware,
export const loadSubprocessPanel = () =>
(dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ dispatch(subprocessPanelActions.CLEAR());
dispatch(subprocessPanelActions.REQUEST_ITEMS());
};
import { FilterBuilder, joinFilters } from '~/services/api/filter-builder';
import { subprocessPanelActions } from './subprocess-panel-actions';
import { DataColumns } from '~/components/data-table/data-table';
-import { ProcessStatusFilter } from '../resource-type-filters/resource-type-filters';
+import { ProcessStatusFilter, buildProcessStatusFilters } from '../resource-type-filters/resource-type-filters';
import { ContainerRequestResource } from '~/models/container-request';
import { progressIndicatorActions } from '../progress-indicator/progress-indicator-actions';
+import { loadMissingProcessesInformation } from '../project-panel/project-panel-middleware-service';
export class SubprocessMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
const parentContainerRequest = await this.services.containerRequestService.get(parentContainerRequestUuid);
const containerRequests = await this.services.containerRequestService.list(
{ ...getParams(dataExplorer, parentContainerRequest) });
- const containerUuids: string[] = containerRequests.items.reduce(
- (uuids, { containerUuid }) =>
- containerUuid
- ? [...uuids, containerUuid]
- : uuids, []);
- const containers = await this.services.containerService.list({
- filters: new FilterBuilder().addIn('uuid', containerUuids).getFilters()
- });
api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId()));
api.dispatch(updateResources(containerRequests.items));
- api.dispatch(updateResources(containers.items));
+ await api.dispatch<any>(loadMissingProcessesInformation(containerRequests.items));
// Populate the actual user view
api.dispatch(setItems(containerRequests));
} catch {
const statusColumnFilters = getDataExplorerColumnFilters(columns, 'Status');
const activeStatusFilter = Object.keys(statusColumnFilters).find(
filterName => statusColumnFilters[filterName].selected
- );
+ ) || ProcessStatusFilter.ALL;
// Get all the subprocess' container requests and containers.
const fb = new FilterBuilder().addEqual('requesting_container_uuid', parentContainerRequest.containerUuid);
- switch (activeStatusFilter) {
- case ProcessStatusFilter.COMPLETED: {
- fb.addEqual('container.state', 'Complete');
- fb.addEqual('container.exit_code', '0');
- break;
- }
- case ProcessStatusFilter.FAILED: {
- fb.addEqual('container.state', 'Complete');
- fb.addDistinct('container.exit_code', '0');
- break;
- }
- case ProcessStatusFilter.CANCELLED:
- case ProcessStatusFilter.FAILED:
- case ProcessStatusFilter.LOCKED:
- case ProcessStatusFilter.QUEUED:
- case ProcessStatusFilter.RUNNING: {
- fb.addEqual('container.state', activeStatusFilter);
- break;
- }
- }
- const statusFilters = fb.getFilters();
+ const statusFilters = buildProcessStatusFilters(fb, activeStatusFilter).getFilters();
const nameFilters = dataExplorer.searchValue
? new FilterBuilder()
import { Dispatch } from 'redux';
import { RootState } from "~/store/store";
-import { getUserUuid } from "~/common/getuser";
+import { getUserUuid } from "~/common/getuser";
import { loadDetailsPanel } from '~/store/details-panel/details-panel-action';
import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions';
import { favoritePanelActions, loadFavoritePanel } from '~/store/favorite-panel/favorite-panel-action';
import { collectionContentAddressPanelColumns } from '~/views/collection-content-address-panel/collection-content-address-panel';
import { subprocessPanelActions } from '~/store/subprocess-panel/subprocess-panel-actions';
import { subprocessPanelColumns } from '~/views/subprocess-panel/subprocess-panel-root';
+import { loadAllProcessesPanel, allProcessesPanelActions } from '../all-processes-panel/all-processes-panel-action';
+import { allProcessesPanelColumns } from '~/views/all-processes-panel/all-processes-panel';
export const WORKBENCH_LOADING_SCREEN = 'workbenchLoadingScreen';
if (user) {
dispatch(projectPanelActions.SET_COLUMNS({ columns: projectPanelColumns }));
dispatch(favoritePanelActions.SET_COLUMNS({ columns: favoritePanelColumns }));
+ dispatch(allProcessesPanelActions.SET_COLUMNS({ columns: allProcessesPanelColumns }));
dispatch(publicFavoritePanelActions.SET_COLUMNS({ columns: publicFavoritePanelColumns }));
dispatch(trashPanelActions.SET_COLUMNS({ columns: trashPanelColumns }));
dispatch(sharedWithMePanelActions.SET_COLUMNS({ columns: projectPanelColumns }));
dispatch<any>(setSidePanelBreadcrumbs(SidePanelTreeCategory.TRASH));
});
+export const loadAllProcesses = () =>
+ handleFirstTimeLoad(
+ (dispatch: Dispatch) => {
+ dispatch<any>(activateSidePanelTreeItem(SidePanelTreeCategory.ALL_PROCESSES));
+ dispatch<any>(loadAllProcessesPanel());
+ dispatch<any>(setSidePanelBreadcrumbs(SidePanelTreeCategory.ALL_PROCESSES));
+ }
+ );
+
export const loadProject = (uuid: string) =>
handleFirstTimeLoad(
async (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
</Typography>;
});
+export const ProcessStartDate = connect(
+ (state: RootState, props: { uuid: string }) => {
+ const process = getProcess(props.uuid)(state.resources);
+ return { date: ( process && process.container ) ? process.container.startedAt : '' };
+ })((props: { date: string }) => renderDate(props.date));
+
export const renderRunTime = (time: number) =>
<Typography noWrap style={{ minWidth: '45px' }}>
{formatTime(time, true)}
import { TreeItem } from "~/components/tree/tree";
import { ProjectResource } from "~/models/project";
import { ListItemTextIcon } from "~/components/list-item-text-icon/list-item-text-icon";
-import { ProjectIcon, FavoriteIcon, ProjectsIcon, ShareMeIcon, TrashIcon, PublicFavoriteIcon } from '~/components/icon/icon';
+import { ProcessIcon, ProjectIcon, FavoriteIcon, ProjectsIcon, ShareMeIcon, TrashIcon, PublicFavoriteIcon } from '~/components/icon/icon';
import { WorkflowIcon } from '~/components/icon/icon';
import { activateSidePanelTreeItem, toggleSidePanelTreeItemCollapse, SIDE_PANEL_TREE, SidePanelTreeCategory } from '~/store/side-panel-tree/side-panel-tree-actions';
import { openSidePanelContextMenu } from '~/store/context-menu/context-menu-actions';
return WorkflowIcon;
case SidePanelTreeCategory.PUBLIC_FAVORITES:
return PublicFavoriteIcon;
+ case SidePanelTreeCategory.ALL_PROCESSES:
+ return ProcessIcon;
default:
return ProjectIcon;
}
--- /dev/null
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import * as React from 'react';
+import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core';
+import { DataExplorer } from "~/views-components/data-explorer/data-explorer";
+import { connect, DispatchProp } from 'react-redux';
+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 { ALL_PROCESSES_PANEL_ID } from '~/store/all-processes-panel/all-processes-panel-action';
+import {
+ ProcessStatus,
+ ResourceName,
+ ResourceOwner,
+ ResourceType,
+ ContainerRunTime,
+ ResourceCreatedAtDate
+} from '~/views-components/data-explorer/renderers';
+import { ProcessIcon } from '~/components/icon/icon';
+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 { RootState } from '~/store/store';
+import { DataTableDefaultView } from '~/components/data-table-default-view/data-table-default-view';
+import { createTree } from '~/models/tree';
+import { getInitialProcessStatusFilters, getInitialProcessTypeFilters } from '~/store/resource-type-filters/resource-type-filters';
+import { getProcess } from '~/store/processes/process';
+import { ResourcesState } from '~/store/resources/resources';
+
+type CssRules = "toolbar" | "button";
+
+const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
+ toolbar: {
+ paddingBottom: theme.spacing.unit * 3,
+ textAlign: "right"
+ },
+ button: {
+ marginLeft: theme.spacing.unit
+ },
+});
+
+export enum AllProcessesPanelColumnNames {
+ NAME = "Name",
+ STATUS = "Status",
+ TYPE = "Type",
+ OWNER = "Owner",
+ CREATED_AT = "Created at",
+ RUNTIME = "Run Time"
+}
+
+export interface AllProcessesPanelFilter extends DataTableFilterItem {
+ type: ResourceKind | ContainerRequestState;
+}
+
+export const allProcessesPanelColumns: DataColumns<string> = [
+ {
+ name: AllProcessesPanelColumnNames.NAME,
+ selected: true,
+ configurable: true,
+ sortDirection: SortDirection.NONE,
+ filters: createTree(),
+ render: uuid => <ResourceName uuid={uuid} />
+ },
+ {
+ name: AllProcessesPanelColumnNames.STATUS,
+ selected: true,
+ configurable: true,
+ mutuallyExclusiveFilters: true,
+ filters: getInitialProcessStatusFilters(),
+ render: uuid => <ProcessStatus uuid={uuid} />
+ },
+ {
+ name: AllProcessesPanelColumnNames.TYPE,
+ selected: true,
+ configurable: true,
+ filters: getInitialProcessTypeFilters(),
+ render: uuid => <ResourceType uuid={uuid} />
+ },
+ {
+ name: AllProcessesPanelColumnNames.OWNER,
+ selected: true,
+ configurable: true,
+ filters: createTree(),
+ render: uuid => <ResourceOwner uuid={uuid} />
+ },
+ {
+ name: AllProcessesPanelColumnNames.CREATED_AT,
+ selected: true,
+ configurable: true,
+ sortDirection: SortDirection.DESC,
+ filters: createTree(),
+ render: uuid => <ResourceCreatedAtDate uuid={uuid} />
+ },
+ {
+ name: AllProcessesPanelColumnNames.RUNTIME,
+ selected: true,
+ configurable: true,
+ filters: createTree(),
+ render: uuid => <ContainerRunTime uuid={uuid} />
+ }
+];
+
+interface AllProcessesPanelDataProps {
+ resources: ResourcesState;
+}
+
+interface AllProcessesPanelActionProps {
+ onItemClick: (item: string) => void;
+ onDialogOpen: (ownerUuid: string) => void;
+ onItemDoubleClick: (item: string) => void;
+}
+const mapStateToProps = (state : RootState): AllProcessesPanelDataProps => ({
+ resources: state.resources
+});
+
+type AllProcessesPanelProps = AllProcessesPanelDataProps & AllProcessesPanelActionProps & DispatchProp
+ & WithStyles<CssRules> & RouteComponentProps<{ id: string }>;
+
+export const AllProcessesPanel = withStyles(styles)(
+ connect(mapStateToProps)(
+ class extends React.Component<AllProcessesPanelProps> {
+ handleContextMenu = (event: React.MouseEvent<HTMLElement>, resourceUuid: string) => {
+ const process = getProcess(resourceUuid)(this.props.resources);
+ if (process) {
+ this.props.dispatch<any>(openProcessContextMenu(event, process));
+ }
+ this.props.dispatch<any>(loadDetailsPanel(resourceUuid));
+ }
+
+ handleRowDoubleClick = (uuid: string) => {
+ this.props.dispatch<any>(navigateTo(uuid));
+ }
+
+ handleRowClick = (uuid: string) => {
+ this.props.dispatch(loadDetailsPanel(uuid));
+ }
+
+ render() {
+ return <DataExplorer
+ id={ALL_PROCESSES_PANEL_ID}
+ onRowClick={this.handleRowClick}
+ onRowDoubleClick={this.handleRowDoubleClick}
+ onContextMenu={this.handleContextMenu}
+ contextMenuColumn={true}
+ dataTableDefaultView={
+ <DataTableDefaultView
+ icon={ProcessIcon}
+ messages={['Processes list empty.']}
+ />
+ } />;
+ }
+ }
+ )
+);
import { LinkAccountPanel } from '~/views/link-account-panel/link-account-panel';
import { FedLogin } from './fed-login';
import { CollectionsContentAddressPanel } from '~/views/collection-content-address-panel/collection-content-address-panel';
+import { AllProcessesPanel } from '../all-processes-panel/all-processes-panel';
type CssRules = 'root' | 'container' | 'splitter' | 'asidePanel' | 'contentWrapper' | 'content';
<Route path={Routes.PROJECTS} component={ProjectPanel} />
<Route path={Routes.COLLECTIONS} component={CollectionPanel} />
<Route path={Routes.FAVORITES} component={FavoritePanel} />
+ <Route path={Routes.ALL_PROCESSES} component={AllProcessesPanel} />
<Route path={Routes.PROCESSES} component={ProcessPanel} />
<Route path={Routes.TRASH} component={TrashPanel} />
<Route path={Routes.PROCESS_LOGS} component={ProcessLogPanel} />
import { subprocessPanelActions } from "~/store/subprocess-panel/subprocess-panel-actions";
import { projectPanelActions } from "~/store/project-panel/project-panel-action";
import { getProjectPanelCurrentUuid } from '~/store/project-panel/project-panel-action';
+import { allProcessesPanelActions } from '~/store/all-processes-panel/all-processes-panel-action';
export const initWebSocket = (config: Config, authService: AuthService, store: RootStore) => {
if (config.websocketUrl) {
// fall through, this will happen for container requests as well.
case ResourceKind.CONTAINER:
store.dispatch(subprocessPanelActions.REQUEST_ITEMS());
+ store.dispatch(allProcessesPanelActions.REQUEST_ITEMS());
if (message.objectOwnerUuid === getProjectPanelCurrentUuid(store.getState())) {
store.dispatch(projectPanelActions.REQUEST_ITEMS());
}
--- /dev/null
+#!/bin/bash
+
+set -e -o pipefail
+commit="$1"
+versionglob="[0-9].[0-9]*.[0-9]*"
+devsuffix=".dev"
+
+# automatically assign version
+#
+# handles the following cases:
+#
+# 1. commit is directly tagged. print that.
+#
+# 2. commit is on master or a development branch, the nearest tag is older
+# than commit where this branch joins master.
+# -> take greatest version tag in repo X.Y.Z and assign X.(Y+1).0
+#
+# 3. commit is on a release branch, the nearest tag is newer
+# than the commit where this branch joins master.
+# -> take nearest tag X.Y.Z and assign X.Y.(Z+1)
+
+tagged=$(git tag --points-at "$commit")
+
+if [[ -n "$tagged" ]] ; then
+ echo $tagged
+else
+ # 1. get the nearest tag with 'git describe'
+ # 2. get the merge base between this commit and master
+ # 3. if the tag is an ancestor of the merge base,
+ # (tag is older than merge base) increment minor version
+ # else, tag is newer than merge base, so increment point version
+
+ nearest_tag=$(git describe --tags --abbrev=0 --match "$versionglob" "$commit")
+ merge_base=$(git merge-base origin/master "$commit")
+
+ if git merge-base --is-ancestor "$nearest_tag" "$merge_base" ; then
+ # x.(y+1).0.devTIMESTAMP, where x.y.z is the newest version that does not contain $commit
+ # grep reads the list of tags (-f) that contain $commit and filters them out (-v)
+ # this prevents a newer tag from retroactively changing the versions of everything before it
+ v=$(git tag | grep -vFf <(git tag --contains "$commit") | sort -Vr | head -n1 | perl -pe 's/\.(\d+)\.\d+/".".($1+1).".0"/e')
+ else
+ # x.y.(z+1).devTIMESTAMP, where x.y.z is the latest released ancestor of $commit
+ v=$(echo $nearest_tag | perl -pe 's/(\d+)$/$1+1/e')
+ fi
+ isodate=$(TZ=UTC git log -n1 --format=%cd --date=iso "$commit")
+ ts=$(TZ=UTC date --date="$isodate" "+%Y%m%d%H%M%S")
+ echo "${v}${devsuffix}${ts}"
+fi
projects / arvados-workbench2.git / commitdiff