[ARVADOS-WORKBENCH2] updated: 1.1.4-620-ge13e7dd

Git user git at public.curoverse.com
Tue Aug 14 08:32:07 EDT 2018


Summary of changes:
 package.json                                       |   8 +-
 src/common/api/common-resource-service.test.ts     |   2 +-
 src/common/api/common-resource-service.ts          |   2 +-
 src/common/config.ts                               |  22 ++--
 src/common/labels.ts                               |   4 +-
 .../collection-panel-files.tsx                     |   6 +-
 src/components/column-selector/column-selector.tsx |   2 +-
 .../confirmation-dialog/confirmation-dialog.tsx    |   4 +-
 src/components/context-menu/context-menu.test.tsx  |   2 +-
 .../data-explorer/data-explorer.test.tsx           |  16 ++-
 src/components/data-explorer/data-explorer.tsx     | 114 +++++++++++++--------
 .../data-table-filters/data-table-filters.test.tsx |   2 +-
 src/components/data-table/data-column.ts           |   1 +
 src/components/data-table/data-table.test.tsx      |  26 +++--
 src/components/data-table/data-table.tsx           |   2 +-
 src/components/default-view/default-view.tsx       |  46 +++++++++
 .../details-attribute/details-attribute.tsx        |  23 +++--
 .../dropdown-menu/dropdown-menu.test.tsx           |   4 +-
 src/components/file-tree/file-tree-item.tsx        |   2 +-
 src/components/file-upload/file-upload.tsx         |   4 +-
 .../list-item-text-icon/list-item-text-icon.tsx    |   2 +-
 src/components/popover/popover.test.tsx            |   8 +-
 src/components/rename-dialog/rename-dialog.tsx     |   4 +-
 src/components/side-panel/side-panel.tsx           |   4 +-
 src/components/text-field/text-field.tsx           |   6 +-
 src/components/tree/tree.tsx                       |   2 +-
 src/index.tsx                                      |   2 +
 src/services/auth-service/auth-service.ts          |   4 +-
 .../collection-files-service.ts                    |   2 +-
 .../collection-manifest-mapper.test.ts             |  21 ++--
 .../collection-manifest-mapper.ts                  |   4 +-
 .../collection-manifest-parser.ts                  |   2 +-
 .../collection-service/collection-service.ts       |  12 +--
 .../favorite-service/favorite-order-builder.ts     |   8 +-
 .../favorite-service/favorite-service.test.ts      |   8 +-
 src/services/favorite-service/favorite-service.ts  |   8 +-
 src/services/groups-service/groups-service.ts      |  14 +--
 src/services/keep-service/keep-service.ts          |   4 +-
 src/services/link-service/link-service.ts          |   6 +-
 .../project-service/project-service.test.ts        |   5 +-
 src/services/project-service/project-service.ts    |  10 +-
 src/services/services.ts                           |   2 +-
 src/services/tag-service/tag-service.ts            |   9 +-
 src/store/auth/auth-action.ts                      |   4 +-
 src/store/auth/auth-actions.test.ts                |   4 +-
 src/store/auth/auth-reducer.test.ts                |   2 +-
 src/store/auth/auth-reducer.ts                     |   4 +-
 .../collection-panel/collection-panel-action.ts    |  20 ++--
 .../collection-panel-files-actions.ts              |   8 +-
 .../collection-panel-files-reducer.test.ts         |   4 +-
 .../collection-panel-files-reducer.ts              |   4 +-
 .../collection-panel-files-state.ts                |   6 +-
 .../collection-panel/collection-panel-reducer.ts   |   4 +-
 .../creator/collection-creator-action.ts           |   4 +-
 .../updater/collection-updater-action.ts           |  12 +--
 .../updater/collection-updater-reducer.ts          |   2 +-
 src/store/context-menu/context-menu-reducer.ts     |   1 +
 src/store/data-explorer/data-explorer-action.ts    |   4 +-
 .../data-explorer/data-explorer-middleware.test.ts |   4 +-
 .../data-explorer/data-explorer-reducer.test.tsx   |  12 ++-
 src/store/data-explorer/data-explorer-reducer.ts   |   6 +-
 src/store/details-panel/details-panel-action.ts    |   4 +-
 src/store/details-panel/details-panel-reducer.ts   |   2 +-
 .../favorite-panel-middleware-service.ts           |  15 ++-
 src/store/favorites/favorites-actions.ts           |   2 +-
 src/store/navigation/navigation-action.ts          |  25 +++--
 .../project-panel-middleware-service.ts            |  17 ++-
 src/store/project/project-action.ts                |  31 +++---
 src/store/project/project-reducer.test.ts          |   4 +-
 src/store/project/project-reducer.ts               |   4 +-
 src/store/side-panel/side-panel-reducer.test.ts    |   2 +-
 src/store/side-panel/side-panel-reducer.ts         |  15 ++-
 src/store/store.ts                                 |   2 +-
 src/store/tree-picker/tree-picker-actions.ts       |   1 -
 src/store/tree-picker/tree-picker-reducer.test.ts  |   5 +-
 src/store/tree-picker/tree-picker-reducer.ts       |   7 +-
 src/store/tree-picker/tree-picker.ts               |   6 +-
 src/views-components/api-token/api-token.tsx       |   8 +-
 .../collection-panel-files.ts                      |  18 ++--
 .../action-sets/collection-action-set.ts           |  10 +-
 .../action-sets/collection-files-action-set.ts     |   4 +-
 .../collection-files-item-action-set.ts            |   2 +-
 ...on-set.ts => collection-resource-action-set.ts} |  26 ++---
 .../action-sets/favorite-action-set.ts             |   4 +-
 .../context-menu/action-sets/project-action-set.ts |  12 ++-
 .../action-sets/resource-action-set.ts             |   2 +-
 .../action-sets/root-project-action-set.ts         |  32 ++++--
 .../context-menu/actions/favorite-action.tsx       |   4 +-
 .../context-menu/context-menu-action-set.ts        |   4 +-
 src/views-components/context-menu/context-menu.tsx |  13 +--
 .../create-collection-dialog-with-selected.tsx     |   4 +-
 .../create-collection-dialog.tsx                   |  10 +-
 .../create-project-dialog.tsx                      |   8 +-
 .../current-token-dialog/current-token-dialog.tsx  |  20 ++--
 .../data-explorer/data-explorer.tsx                |  14 +--
 src/views-components/data-explorer/renderers.tsx   |  10 +-
 .../details-panel/collection-details.tsx           |  12 +--
 .../details-panel/details-data.tsx                 |   2 +-
 .../details-panel/details-panel.tsx                |  14 +--
 .../details-panel/empty-details.tsx                |  42 +-------
 .../details-panel/process-details.tsx              |  12 +--
 .../details-panel/project-details.tsx              |  12 +--
 .../dialog-collection-create-selected.tsx          |   8 +-
 .../dialog-create/dialog-collection-create.tsx     |  14 +--
 .../dialog-create/dialog-project-create.tsx        |   8 +-
 .../dialog-update/dialog-collection-update.tsx     |   8 +-
 .../favorite-star/favorite-star.tsx                |   6 +-
 .../file-remove-dialog/file-remove-dialog.ts       |  10 +-
 .../multiple-files-remove-dialog.ts                |   6 +-
 .../main-app-bar/main-app-bar.test.tsx             |  10 +-
 src/views-components/main-app-bar/main-app-bar.tsx |  10 +-
 .../project-tree-picker/project-tree-picker.tsx    |  20 ++--
 .../project-tree/project-tree.test.tsx             |   6 +-
 src/views-components/project-tree/project-tree.tsx |  12 +--
 .../remove-dialog/remove-dialog.tsx                |   4 +-
 .../rename-file-dialog/rename-file-dialog.tsx      |   8 +-
 src/views-components/snackbar/snackbar.tsx         |   4 +-
 src/views-components/tree-picker/tree-picker.ts    |   8 +-
 .../update-collection-dialog..tsx                  |  10 +-
 src/views/collection-panel/collection-panel.tsx    |  28 ++---
 src/views/collection-panel/collection-tag-form.tsx |  20 ++--
 src/views/favorite-panel/favorite-panel-item.ts    |   6 +-
 src/views/favorite-panel/favorite-panel.tsx        |  27 ++---
 src/views/project-panel/project-panel-item.ts      |   8 +-
 src/views/project-panel/project-panel.tsx          |  36 ++++---
 src/views/workbench/workbench.test.tsx             |  14 +--
 src/views/workbench/workbench.tsx                  |  98 ++++++++++--------
 tsconfig.json                                      |  11 +-
 yarn.lock                                          |   6 +-
 129 files changed, 760 insertions(+), 631 deletions(-)
 create mode 100644 src/components/default-view/default-view.tsx
 copy src/views-components/context-menu/action-sets/{collection-action-set.ts => collection-resource-action-set.ts} (64%)

       via  e13e7dd672160e4ab5569c24133f4f6032db4a9a (commit)
       via  52481255ee28ad3e4e69cbdb8a03cbf63546a0ce (commit)
       via  8500bc0465a1bea55bb6dee5c6b0740cf5dfba8e (commit)
       via  e5ecd847e0a5d64f78ab45194f3b4f2e7fbd199a (commit)
       via  b9d9f71443a149cb99e9dfdbe8a293e52cc6d498 (commit)
       via  c11055f2d6ce8385088bc221eab1175e31777ec0 (commit)
       via  f0d519637c997df11d5b1a1b32b3d9e4a2872325 (commit)
       via  c6ef6cc481dc56270d8ad80d387115eace618525 (commit)
       via  37e43f4e19ad2bd27b15fe7f0d857218dad39055 (commit)
       via  876e5e2f31a218255845977489ea70aacc0211cd (commit)
       via  df041a7ff7f8515adc49b2e2ddd3fc6663b345af (commit)
       via  eb880179bed8f07348faeccb79d34c9726d206e8 (commit)
       via  3626497d024cddee09990afd6e08a24debaf5c7b (commit)
       via  dd89200ad6fdbfa337fdbab5f54def8712c6746c (commit)
       via  732294bc8aeafde5e85a4437cbd36b0d2648b04e (commit)
       via  786d7c2b99da82c92d0ab5bc242f75513a46b4b5 (commit)
       via  0eea74dd422f762226b5b854274a8c18b9c24a1b (commit)
       via  c3cbb4ad3272bbd8f8b282a3db00a86c674e4117 (commit)
       via  08f35d9b26a06b70da6e54533782276617c5bed1 (commit)
       via  0f2d05eeb8a5fbacead1a6c9e9f8403109d8aae2 (commit)
       via  65d436f7c4bd643c7b6cccf97001ff6aef2c896b (commit)
       via  1e1230bf8e17941d22621a655f656932ddedbe06 (commit)
       via  5ba1cb25d09fa41dc8bff3d84c74908a141c8b53 (commit)
       via  a40f50b97895044b2e6879109fe430844b027ad6 (commit)
       via  20b5587edcc69eb39f91f4fb1f2eb68e5b7827d5 (commit)
       via  a568ee3c7ddab4aee95c2e3c0092cede4609e26a (commit)
       via  22b7bf88fb799c912a813790301f715fb6b8ccf0 (commit)
      from  d260d2473cd7faefb0f06cedfb26ef5abda7e012 (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 e13e7dd672160e4ab5569c24133f4f6032db4a9a
Merge: d260d24 5248125
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Tue Aug 14 14:31:51 2018 +0200

    Merge lates changes
    
    Feature #14013
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --cc src/services/collection-service/collection-service.ts
index c611f36,d07ef21..b154f40
--- a/src/services/collection-service/collection-service.ts
+++ b/src/services/collection-service/collection-service.ts
@@@ -2,15 -2,20 +2,15 @@@
  //
  // SPDX-License-Identifier: AGPL-3.0
  
- import { CommonResourceService } from "../../common/api/common-resource-service";
- import { CollectionResource } from "../../models/collection";
 -import * as _ from "lodash";
+ import { CommonResourceService } from "~/common/api/common-resource-service";
+ import { CollectionResource } from "~/models/collection";
 -import axios, { AxiosInstance } from "axios";
 -import { KeepService } from "../keep-service/keep-service";
 +import { AxiosInstance } from "axios";
- import { CollectionFile, CollectionDirectory } from "../../models/collection-file";
- import { WebDAV } from "../../common/webdav";
++import { CollectionFile, CollectionDirectory } from "~/models/collection-file";
+ import { WebDAV } from "~/common/webdav";
  import { AuthService } from "../auth-service/auth-service";
- import { mapTreeValues } from "../../models/tree";
 -import { mapTree, getNodeChildren, getNode, TreeNode } from "../../models/tree";
 -import { getTagValue } from "~/common/xml";
 -import { FilterBuilder } from "~/common/api/filter-builder";
 -import { CollectionFile, createCollectionFile, CollectionFileType, CollectionDirectory, createCollectionDirectory } from '~/models/collection-file';
 -import { parseKeepManifestText, stringifyKeepManifest } from "../collection-files-service/collection-manifest-parser";
 -import { KeepManifestStream } from "~/models/keep-manifest";
 -import { createCollectionFilesTree } from '~/models/collection-file';
++import { mapTreeValues } from "~/models/tree";
 +import { parseFilesResponse } from "./collection-service-files-response";
- import { fileToArrayBuffer } from "../../common/file";
++import { fileToArrayBuffer } from "~/common/file";
  
  export type UploadProgress = (fileId: number, loaded: number, total: number, currentTime: number) => void;
  

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list