[arvados-workbench2] updated: 2.7.1-69-g4b6f3d41
git repository hosting
git at public.arvados.org
Mon Dec 18 19:08:22 UTC 2023
Summary of changes:
Makefile | 3 +
cypress/integration/process.spec.js | 47 +++++
cypress/integration/side-panel.spec.js | 37 ++++
package.json | 9 +-
public/arrow-to-left.png | Bin 10416 -> 0 bytes
public/arrow-to-right.png | Bin 10484 -> 0 bytes
public/collapseLHS-New.svg | 25 ---
public/mui-start-icon.svg | 1 +
src/components/data-explorer/data-explorer.tsx | 78 +++++---
src/components/data-table/data-table.tsx | 2 +-
src/components/icon/icon.tsx | 7 +
.../multiselect-toolbar/MultiselectToolbar.tsx | 21 ++-
.../subprocess-progress-bar.test.tsx | 165 +++++++++++++++++
.../subprocess-progress-bar.tsx | 105 +++++++++++
src/components/tree/tree.tsx | 41 +++--
src/index.tsx | 3 +
src/store/favorites/favorites-actions.ts | 2 +
src/store/navigation/navigation-action.ts | 3 +
.../process-logs-panel-actions.ts | 59 +++++-
.../public-favorites/public-favorites-actions.ts | 2 +
.../side-panel-tree/side-panel-tree-actions.ts | 114 +++++++-----
.../subprocess-panel/subprocess-panel-actions.ts | 81 +++++++++
src/store/tree-picker/tree-picker-actions.test.ts | 5 +-
src/store/workbench/workbench-actions.ts | 3 +-
src/views-components/data-explorer/renderers.tsx | 24 +++
.../side-panel-toggle/side-panel-toggle.tsx | 15 +-
.../side-panel-tree/side-panel-tree.tsx | 6 +-
.../side-panel/side-panel-collapsed.tsx | 159 +++++++++++++++++
src/views-components/side-panel/side-panel.tsx | 8 +-
src/views/process-panel/process-panel-root.tsx | 2 +-
.../shared-with-me-panel/shared-with-me-panel.tsx | 198 +++++++++++++++++++++
.../subprocess-panel/subprocess-panel-root.tsx | 10 +-
src/views/subprocess-panel/subprocess-panel.tsx | 6 +-
src/views/workbench/workbench.tsx | 4 +-
yarn.lock | 116 +++++++-----
35 files changed, 1173 insertions(+), 188 deletions(-)
delete mode 100644 public/arrow-to-left.png
delete mode 100644 public/arrow-to-right.png
delete mode 100644 public/collapseLHS-New.svg
create mode 100644 public/mui-start-icon.svg
create mode 100644 src/components/subprocess-progress-bar/subprocess-progress-bar.test.tsx
create mode 100644 src/components/subprocess-progress-bar/subprocess-progress-bar.tsx
create mode 100644 src/views-components/side-panel/side-panel-collapsed.tsx
via 4b6f3d41d327740ff09c7756eb440113ceffbaa6 (commit)
via e09a9e644ad7937bb3800ca8096f444f6ff4411b (commit)
via bf64b82d45ef695c312b08b663311f4da7b7a4e3 (commit)
via 55334ee8b218344fec8552c1d0ea56d4c8e53a2d (commit)
via 2ffe3ac11c9bad93b8b226167aef687a274028fd (commit)
via b774da617da87999f68863b90542dd41d9ba0bd3 (commit)
via 66897bc5cef798a8bfc2a3426568914dcaf15759 (commit)
via 3e3dec8b2504a47aa407878aea111dd49ab1a8e6 (commit)
via 1cd60c69e5306f19dc26429379792151cdb274b8 (commit)
via 2c7f44ed77a3df21088ec608f6a5d58dd7f65518 (commit)
via e06a65d3deb59887fed473e27c3eebd8aefa5090 (commit)
via ba244d0282e8dc6c21ebf6a509750717bae35783 (commit)
via ca46f67ca632f9e1633298ccc5868015acbdd04a (commit)
via 56abc754816d01cb8e9df01a35c8e9af66ada408 (commit)
via e2f200c518a48a05bb8dba7682dbb445c19951df (commit)
via 25667ac485387b286faa5c5e4a6bb96231dddf20 (commit)
via 8228d441690ed78340e1a44f3e0bf8b4f94215a0 (commit)
via 30e91748f6f3202604f3a19d1aa7ddf02ffd149e (commit)
via d3bd5784e528b8b99881b293b530b78a23d0a775 (commit)
via 7d45d61adcaffb47f58031a44f89ff3f9005ce22 (commit)
via dcf2e835b33e926073dad1f636cf92a95493ca0b (commit)
via 356d030ba429f793d4dd5d9997395cb0a7125514 (commit)
via 2a0558ceed0332333908344cd1274d2827716d87 (commit)
via 8530de10102e931fca7adf3eae39ca562ffea5ec (commit)
via 6c351b29d205b54fd86b62cf4e39d06b0d2a6dcd (commit)
via 4d3c5f5861ea4c1d5e8491517806651cdfeab57f (commit)
via 21be228d6b3f99b6c27b2a2a0fd1cc9c46ce6cfb (commit)
via 9a3525e1e4561393a4fb42c6e02f4f6b6d074954 (commit)
via b5311e4a8420181d6ad1e0380f0cd9959c96faec (commit)
via f5fd828741edeebb7c4d3449f474c3606b3912d4 (commit)
via 6c9138600a27ea2980ac455e9b62ac7b7c1e64b8 (commit)
via bc46a0bb4a5e0fe799c39e6570c2b2c186452037 (commit)
via 0e98b3fc0b3c49e6268905fba19859b05e26fc4f (commit)
via acbdf56bc7c678796cc4a8d0627ab66fd1edf37f (commit)
via 72c70bed4eb3098a92a0deb07841a0b46d9df5bf (commit)
via 82646dcb3d8f2497de1a33d2250101749526662f (commit)
via e335fc05c480a0eda91cf36c374cbcc784281c2e (commit)
via 1d6407bd7c7d0669c99b615c8ecc2be3a10b6ba9 (commit)
via e5fadeed6b9052254606e7c0529752b74f50a27b (commit)
via 8997608d0fae4eba9d92d7e363bdc6bb462e933d (commit)
via 4288d7816f793b621fa8c70cb646c19136e05d2a (commit)
via 599aa352ade599966cf2a4606a1e6a1776a0738d (commit)
via 9eca8f9b0755eaeb1104a8e699a463f0ac127040 (commit)
via ef5e2f624a7f51fc326a7ef34e8c12134b108ab4 (commit)
via ce84334e25316fdf1671bdf5ce8acda9c1a455de (commit)
via 992d07cd979b34d79fbe3135be089a86b13f0201 (commit)
via 37a104a131a5121b213146fb4ee1b18bc822df90 (commit)
via c178ba288276f6383703fb9b7e513ff78f68b917 (commit)
via 5f48a19354d8503c7967c22af2caedf30f1f1056 (commit)
via 525f8b0afcbeee6bea0cc1f3fc7c3a249fde995a (commit)
via 5d6640046afef7dc3714b784430e18bf2f2153fe (commit)
via b4d518c97713bc542abfb8f4041ae25b82db3764 (commit)
via c314adae7b1551ef6682d4a3760bda5787b989ce (commit)
via 9fe1e9ff7d9af167f0ee350ab5a68ded128d8043 (commit)
via 45dab1a8d772d04484cdd8a5f7487cb74a105ad9 (commit)
via 89e80fa011ac209afc87d5440ceef174c2e5ef70 (commit)
via d1dd322910160323245664b836d9c2f69e068d85 (commit)
via 11b6ed73b4a0dc051072bb02a060396b55db4a26 (commit)
via eeb58b87d42354940875c56d41add15b4bfc0894 (commit)
via fdb810aee6d7ee83f3ccea81e21dac1a4c3823d6 (commit)
via cfa88a0915d5a49a6eb870505c346db2dbd58648 (commit)
via 0602c276f01e91b1bb6dafcc3adfc0dd43a922fc (commit)
via 70cc7de1fd7fb72c757a8466dee7ca6bf8e55c84 (commit)
via 8a4ef30d51b2ccc6138bc1d8d8300b106bcdd8b2 (commit)
via c986217e3930682b6b4ab49941314bdeb0357595 (commit)
from 25c3b17ad0dc0e70b48911c5a818bbcf6851352e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 4b6f3d41d327740ff09c7756eb440113ceffbaa6
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Mon Dec 18 14:08:14 2023 -0500
21128: fixed subprocess toolbar not expanding Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
diff --git a/src/components/data-table/data-table.tsx b/src/components/data-table/data-table.tsx
index 97e1a3ac..de3e272d 100644
--- a/src/components/data-table/data-table.tsx
+++ b/src/components/data-table/data-table.tsx
@@ -144,7 +144,7 @@ export const DataTable = withStyles(styles)(
};
componentDidMount(): void {
- this.initializeCheckedList(this.props.items);
+ this.initializeCheckedList([]);
}
componentDidUpdate(prevProps: Readonly<DataTableProps<T>>, prevState: DataTableState) {
diff --git a/src/components/multiselect-toolbar/MultiselectToolbar.tsx b/src/components/multiselect-toolbar/MultiselectToolbar.tsx
index 30d5bd79..2a4f4a4b 100644
--- a/src/components/multiselect-toolbar/MultiselectToolbar.tsx
+++ b/src/components/multiselect-toolbar/MultiselectToolbar.tsx
@@ -48,6 +48,7 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
height: '2.7rem',
padding: 0,
margin: "1rem auto auto 0.5rem",
+ transition: `width ${WIDTH_TRANSITION}ms`,
overflowY: 'auto',
scrollBehavior: 'smooth',
'&::-webkit-scrollbar': {
@@ -108,23 +109,26 @@ export const MultiselectToolbar = connect(
const currentPathIsTrash = window.location.pathname === "/trash";
const [isTransitioning, setIsTransitioning] = useState(false);
- const actions =
- currentPathIsTrash && selectedToKindSet(checkedList).size
- ? [msToggleTrashAction]
- : selectActionsByKind(currentResourceKinds as string[], multiselectActionsFilters)
- .filter((action) => (singleSelectedUuid === null ? action.isForMulti : true));
-
const handleTransition = () => {
setIsTransitioning(true)
setTimeout(() => {
setIsTransitioning(false)
}, WIDTH_TRANSITION);
}
-
+
useEffect(()=>{
- handleTransition()
+ if(!isTransitioning){
+ handleTransition()
+ }
}, [checkedList])
+ const actions =
+ currentPathIsTrash && selectedToKindSet(checkedList).size
+ ? [msToggleTrashAction]
+ : selectActionsByKind(currentResourceKinds as string[], multiselectActionsFilters).filter((action) =>
+ singleSelectedUuid === null ? action.isForMulti : true
+ );
+
return (
<React.Fragment>
<Toolbar
diff --git a/src/views/subprocess-panel/subprocess-panel-root.tsx b/src/views/subprocess-panel/subprocess-panel-root.tsx
index dd5229bb..65c723f6 100644
--- a/src/views/subprocess-panel/subprocess-panel-root.tsx
+++ b/src/views/subprocess-panel/subprocess-panel-root.tsx
@@ -87,7 +87,7 @@ export interface SubprocessPanelDataProps {
}
export interface SubprocessPanelActionProps {
- onItemClick: (item: string) => void;
+ onRowClick: (item: string) => void;
onContextMenu: (event: React.MouseEvent<HTMLElement>, item: string, resources: ResourcesState) => void;
onItemDoubleClick: (item: string) => void;
}
@@ -114,7 +114,7 @@ const SubProcessesTitle = withStyles(styles)(
export const SubprocessPanelRoot = (props: SubprocessPanelProps & MPVPanelProps) => {
return <DataExplorer
id={SUBPROCESS_PANEL_ID}
- onRowClick={props.onItemClick}
+ onRowClick={props.onRowClick}
onRowDoubleClick={props.onItemDoubleClick}
onContextMenu={(event, item) => props.onContextMenu(event, item, props.resources)}
contextMenuColumn={true}
diff --git a/src/views/subprocess-panel/subprocess-panel.tsx b/src/views/subprocess-panel/subprocess-panel.tsx
index c52f054b..684e1fd2 100644
--- a/src/views/subprocess-panel/subprocess-panel.tsx
+++ b/src/views/subprocess-panel/subprocess-panel.tsx
@@ -10,6 +10,7 @@ import { RootState } from "store/store";
import { navigateTo } from "store/navigation/navigation-action";
import { loadDetailsPanel } from "store/details-panel/details-panel-action";
import { getProcess } from "store/processes/process";
+import { toggleOne } from 'store/multiselect/multiselect-actions';
const mapDispatchToProps = (dispatch: Dispatch): SubprocessPanelActionProps => ({
onContextMenu: (event, resourceUuid, resources) => {
@@ -18,7 +19,8 @@ const mapDispatchToProps = (dispatch: Dispatch): SubprocessPanelActionProps => (
dispatch<any>(openProcessContextMenu(event, process));
}
},
- onItemClick: (uuid: string) => {
+ onRowClick: (uuid: string) => {
+ dispatch<any>(toggleOne(uuid))
dispatch<any>(loadDetailsPanel(uuid));
},
onItemDoubleClick: uuid => {
commit e09a9e644ad7937bb3800ca8096f444f6ff4411b
Merge: 25c3b17a bf64b82d
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Mon Dec 18 11:42:25 2023 -0500
21128: Merge branch 'main' into 21128-toolbar-context-menu
refs #21128
Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
diff --cc src/components/multiselect-toolbar/MultiselectToolbar.tsx
index d9024cd1,4eff8885..30d5bd79
--- a/src/components/multiselect-toolbar/MultiselectToolbar.tsx
+++ b/src/components/multiselect-toolbar/MultiselectToolbar.tsx
@@@ -42,35 -26,13 +42,36 @@@ type CssRules = "root" | "transition"
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
root: {
display: "flex",
+ flexShrink: 0,
flexDirection: "row",
width: 0,
+ height: '2.7rem',
padding: 0,
margin: "1rem auto auto 0.5rem",
- overflow: "hidden",
- transition: "width 150ms",
+ overflowY: 'auto',
+ scrollBehavior: 'smooth',
+ '&::-webkit-scrollbar': {
+ width: 0,
+ height: 2
+ },
+ '&::-webkit-scrollbar-track': {
+ width: 0,
+ height: 2
+ },
+ '&::-webkit-scrollbar-thumb': {
+ backgroundColor: '#757575',
+ borderRadius: 2
+ }
+ },
+ transition: {
+ display: "flex",
+ flexDirection: "row",
+ width: 0,
+ height: '2.7rem',
+ padding: 0,
+ margin: "1rem auto auto 0.5rem",
+ overflow: 'hidden',
+ transition: `width ${WIDTH_TRANSITION}ms`,
},
button: {
width: "2.5rem",
diff --cc src/store/favorites/favorites-actions.ts
index a1667326,1e23f35c..da454ed7
--- a/src/store/favorites/favorites-actions.ts
+++ b/src/store/favorites/favorites-actions.ts
@@@ -10,8 -10,7 +10,9 @@@ import { checkFavorite } from "./favori
import { snackbarActions, SnackbarKind } from "../snackbar/snackbar-actions";
import { ServiceRepository } from "services/services";
import { progressIndicatorActions } from "store/progress-indicator/progress-indicator-actions";
+import { MultiSelectMenuActionNames } from "views-components/multiselect-toolbar/ms-menu-actions";
+import { addDisabledButton, removeDisabledButton } from "store/multiselect/multiselect-actions";
+ import { loadFavoritesTree} from "store/side-panel-tree/side-panel-tree-actions";
export const favoritesActions = unionize({
TOGGLE_FAVORITE: ofType<{ resourceUuid: string }>(),
@@@ -53,8 -51,8 +54,9 @@@ export const toggleFavorite = (resource
hideDuration: 2000,
kind: SnackbarKind.SUCCESS
}));
+ dispatch<any>(removeDisabledButton(MultiSelectMenuActionNames.ADD_TO_FAVORITES))
dispatch(progressIndicatorActions.STOP_WORKING("toggleFavorite"));
+ dispatch<any>(loadFavoritesTree())
})
.catch((e: any) => {
dispatch(progressIndicatorActions.STOP_WORKING("toggleFavorite"));
diff --cc src/store/public-favorites/public-favorites-actions.ts
index 5bf5078d,363b0b44..0f8ed6c2
--- a/src/store/public-favorites/public-favorites-actions.ts
+++ b/src/store/public-favorites/public-favorites-actions.ts
@@@ -9,8 -9,7 +9,9 @@@ import { checkPublicFavorite } from "./
import { snackbarActions, SnackbarKind } from "store/snackbar/snackbar-actions";
import { ServiceRepository } from "services/services";
import { progressIndicatorActions } from "store/progress-indicator/progress-indicator-actions";
+import { addDisabledButton, removeDisabledButton } from "store/multiselect/multiselect-actions";
+import { MultiSelectMenuActionNames } from "views-components/multiselect-toolbar/ms-menu-actions";
+ import { loadPublicFavoritesTree } from "store/side-panel-tree/side-panel-tree-actions";
export const publicFavoritesActions = unionize({
TOGGLE_PUBLIC_FAVORITE: ofType<{ resourceUuid: string }>(),
@@@ -50,8 -48,8 +51,9 @@@ export const togglePublicFavorite = (re
hideDuration: 2000,
kind: SnackbarKind.SUCCESS
}));
+ dispatch<any>(removeDisabledButton(MultiSelectMenuActionNames.ADD_TO_PUBLIC_FAVORITES))
dispatch(progressIndicatorActions.STOP_WORKING("togglePublicFavorite"));
+ dispatch<any>(loadPublicFavoritesTree())
})
.catch((e: any) => {
dispatch(progressIndicatorActions.STOP_WORKING("togglePublicFavorite"));
diff --cc src/views/shared-with-me-panel/shared-with-me-panel.tsx
index 7731df6b,250447ea..f3f827d1
--- a/src/views/shared-with-me-panel/shared-with-me-panel.tsx
+++ b/src/views/shared-with-me-panel/shared-with-me-panel.tsx
@@@ -17,8 -18,35 +18,36 @@@ import
openContextMenu,
resourceUuidToContextMenuKind
} from 'store/context-menu/context-menu-actions';
+ import {
+ ResourceName,
+ ProcessStatus as ResourceStatus,
+ ResourceType,
+ ResourceOwnerWithNameLink,
+ ResourcePortableDataHash,
+ ResourceFileSize,
+ ResourceFileCount,
+ ResourceUUID,
+ ResourceContainerUuid,
+ ContainerRunTime,
+ ResourceOutputUuid,
+ ResourceLogUuid,
+ ResourceParentProcess,
+ ResourceModifiedByUserUuid,
+ ResourceVersion,
+ ResourceCreatedAtDate,
+ ResourceLastModifiedDate,
+ ResourceTrashDate,
+ ResourceDeleteDate,
+ } from 'views-components/data-explorer/renderers';
+ import { DataTableFilterItem } from 'components/data-table-filters/data-table-filters';
import { GroupContentsResource } from 'services/groups-service/groups-service';
+import { toggleOne } from 'store/multiselect/multiselect-actions';
+ import { DataColumns } from 'components/data-table/data-table';
+ import { ContainerRequestState } from 'models/container-request';
+ import { ProjectResource } from 'models/project';
+ import { createTree } from 'models/tree';
+ import { SortDirection } from 'components/data-table/data-column';
+ import { getInitialResourceTypeFilters, getInitialProcessStatusFilters } from 'store/resource-type-filters/resource-type-filters';
type CssRules = "toolbar" | "button" | "root";
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list