[ARVADOS-WORKBENCH2] updated: 1.4.1-145-g2d03b09b
Git user
git at public.curoverse.com
Wed Nov 27 20:32:58 UTC 2019
Summary of changes:
package.json | 5 +-
src/common/getuser.ts | 10 ++
src/index.tsx | 17 +-
src/models/tree.ts | 3 +
src/models/user.ts | 9 +-
src/services/auth-service/auth-service.ts | 57 +-----
src/services/services.ts | 23 ++-
src/services/user-service/user-service.ts | 16 ++
src/store/auth/auth-action-session.ts | 31 +---
src/store/auth/auth-action-ssh.ts | 13 +-
src/store/auth/auth-action.test.ts | 191 ++++++++++++---------
src/store/auth/auth-action.ts | 92 +++-------
src/store/auth/auth-middleware.ts | 73 ++++++++
src/store/auth/auth-reducer.test.ts | 23 +--
src/store/auth/auth-reducer.ts | 21 +--
src/store/breadcrumbs/breadcrumbs-actions.ts | 5 +-
...llections-content-address-middleware-service.ts | 13 +-
src/store/collections/collection-create-actions.ts | 4 +-
src/store/config/config-action.ts | 12 --
src/store/config/config-reducer.ts | 17 --
.../favorite-panel-middleware-service.ts | 5 +-
src/store/favorites/favorites-actions.ts | 9 +-
.../link-account-panel-actions.ts | 38 ++--
src/store/my-account/my-account-panel-actions.ts | 5 +-
src/store/navigation/navigation-action.ts | 6 +-
.../project-tree-picker-actions.ts | 13 +-
src/store/projects/project-create-actions.ts | 12 +-
src/store/projects/project-move-actions.ts | 4 +-
.../public-favorites-middleware-service.ts | 4 +-
.../public-favorites/public-favorites-actions.ts | 4 +-
src/store/repositories/repositories-actions.ts | 7 +-
.../run-process-panel/run-process-panel-actions.ts | 4 +-
src/store/search-bar/search-bar-tree-actions.ts | 8 +-
.../side-panel-tree/side-panel-tree-actions.ts | 14 +-
src/store/store.ts | 5 +-
.../trash-panel/trash-panel-middleware-service.ts | 5 +-
src/store/tree-picker/tree-picker-actions.ts | 19 +-
src/store/users/users-actions.ts | 22 ++-
src/store/workbench/workbench-actions.ts | 5 +-
src/views-components/api-token/api-token.tsx | 9 +-
src/views-components/main-app-bar/account-menu.tsx | 2 +-
.../project-tree-picker/project-tree-picker.tsx | 7 +-
src/views/inactive-panel/inactive-panel.tsx | 2 +-
.../link-account-panel/link-account-panel.tsx | 2 +-
src/views/login-panel/login-panel.tsx | 2 +-
src/views/main-panel/main-panel.tsx | 2 +-
yarn.lock | 92 +++++++++-
47 files changed, 540 insertions(+), 402 deletions(-)
create mode 100644 src/common/getuser.ts
create mode 100644 src/store/auth/auth-middleware.ts
delete mode 100644 src/store/config/config-action.ts
delete mode 100644 src/store/config/config-reducer.ts
via 2d03b09bc6f29ab1bfe42a2fd3a88f17189e6a52 (commit)
via 5ec3f2a5dd1e0dd3cf439b46ea9eebecbd0eb250 (commit)
via 72ee613468c6dee53b98ed1469ce9781a942dbe9 (commit)
via e69ce2f8f14e4272acf5efa4c8a252bc101227ca (commit)
via 6fdd4a4d609cf8fa459786f42eb337f8da6a5afa (commit)
via 8d6d5f23ab2e666fbb179093750d6b31280baede (commit)
via 707b848245596bd4f25d497b45c1c3e501785ee4 (commit)
via 818c47686e619fbdc3bfa11edd290d0c9e0db64b (commit)
via 72c6b63b58e7b583c6e9f638c1a4be8e8ce69e89 (commit)
via 6bdb4758d981aa05c19700761d3ace0db7af324a (commit)
via db4b8c25a0a3418df5645060ccfa9406d20fce62 (commit)
via c2264792def7c362d13d0dca8d912322e2ea8229 (commit)
via c133ed0f3634fe29b082a4501abd04f05f6221d5 (commit)
via 39a2bbbbe3099f039acf73358753f91c0dc39677 (commit)
via dd3d65aa7dea7269352eabe19096cb3dc44eb6c5 (commit)
from 9be874f7744b5ceb53f4be20d1748db34859468a (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 2d03b09bc6f29ab1bfe42a2fd3a88f17189e6a52
Merge: 9be874f7 5ec3f2a5
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Wed Nov 27 15:32:39 2019 -0500
Merge branch '15803-unsetup' refs #15803
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>
diff --cc src/store/tree-picker/tree-picker-actions.ts
index 1ec49141,7229bf63..ff36e3e6
--- a/src/store/tree-picker/tree-picker-actions.ts
+++ b/src/store/tree-picker/tree-picker-actions.ts
@@@ -4,9 -4,9 +4,10 @@@
import { unionize, ofType, UnionOf } from "~/common/unionize";
import { TreeNode, initTreeNode, getNodeDescendants, TreeNodeStatus, getNode, TreePickerId, Tree } from '~/models/tree';
+import { createCollectionFilesTree } from "~/models/collection-file";
import { Dispatch } from 'redux';
import { RootState } from '~/store/store';
+ import { getUserUuid } from "~/common/getuser";
import { ServiceRepository } from '~/services/services';
import { FilterBuilder } from '~/services/api/filter-builder';
import { pipe, values } from 'lodash/fp';
commit 5ec3f2a5dd1e0dd3cf439b46ea9eebecbd0eb250
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Wed Nov 27 15:32:00 2019 -0500
15803: Fix whitespace
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>
diff --git a/src/store/repositories/repositories-actions.ts b/src/store/repositories/repositories-actions.ts
index 4585231f..239b531c 100644
--- a/src/store/repositories/repositories-actions.ts
+++ b/src/store/repositories/repositories-actions.ts
@@ -42,7 +42,7 @@ export const openRepositoryAttributes = (uuid: string) =>
export const openRepositoryCreateDialog = () =>
async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
const userUuid = getUserUuid(getState());
- if (!userUuid) { return; }
+ if (!userUuid) { return; }
const user = await services.userService.get(userUuid!);
dispatch(reset(REPOSITORY_CREATE_FORM_NAME));
dispatch(dialogActions.OPEN_DIALOG({ id: REPOSITORY_CREATE_FORM_NAME, data: { user } }));
@@ -51,7 +51,7 @@ export const openRepositoryCreateDialog = () =>
export const createRepository = (repository: RepositoryResource) =>
async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
const userUuid = getUserUuid(getState());
- if (!userUuid) { return; }
+ if (!userUuid) { return; }
const user = await services.userService.get(userUuid!);
dispatch(startSubmit(REPOSITORY_CREATE_FORM_NAME));
try {
diff --git a/src/store/users/users-actions.ts b/src/store/users/users-actions.ts
index 26c942d6..f6287260 100644
--- a/src/store/users/users-actions.ts
+++ b/src/store/users/users-actions.ts
@@ -65,7 +65,7 @@ export const loginAs = (uuid: string) =>
export const openUserCreateDialog = () =>
async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
const userUuid = getUserUuid(getState());
- if (!userUuid) { return; }
+ if (!userUuid) { return; }
const user = await services.userService.get(userUuid!);
const virtualMachines = await services.virtualMachineService.list();
dispatch(reset(USER_CREATE_FORM_NAME));
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list