[ARVADOS-WORKBENCH2] updated: 1.2.0-1006-g95b86eb

Git user git at public.curoverse.com
Tue Nov 27 04:09:41 EST 2018


Summary of changes:
 src/components/data-explorer/data-explorer.tsx     |   7 +-
 ...-filters.tsx => data-table-filters-popover.tsx} |  59 +++------
 .../data-table-filters/data-table-filters-tree.tsx |  74 +++++++++++
 .../data-table-filters/data-table-filters.tsx      |  22 +++-
 src/components/data-table/data-column.ts           |  11 +-
 src/components/data-table/data-table.test.tsx      |  31 +++--
 src/components/data-table/data-table.tsx           |  14 +-
 src/components/tree/tree.tsx                       |  10 +-
 src/models/collection.ts                           |   6 +
 src/models/resource.ts                             |   3 +
 src/models/tree.ts                                 |  20 ++-
 src/services/api/filter-builder.test.ts            |   8 +-
 src/services/api/filter-builder.ts                 |   6 +-
 src/store/advanced-tab/advanced-tab.ts             | 118 +++++++++++------
 src/store/data-explorer/data-explorer-action.ts    |   6 +-
 .../data-explorer-middleware-service.ts            |  14 +-
 .../data-explorer/data-explorer-middleware.test.ts |   8 +-
 src/store/data-explorer/data-explorer-reducer.ts   |   4 +-
 .../favorite-panel-middleware-service.ts           |  16 ++-
 src/store/project-panel/project-panel-action.ts    |   7 +-
 .../project-panel-middleware-service.ts            |  20 ++-
 .../resource-type-filters.test.ts                  |  50 ++++++++
 .../resource-type-filters/resource-type-filters.ts | 141 +++++++++++++++++++++
 .../trash-panel/trash-panel-middleware-service.ts  |  27 ++--
 .../context-menu/action-sets/ssh-key-action-set.ts |   3 +-
 .../data-explorer/data-explorer.tsx                |   4 +-
 src/views/favorite-panel/favorite-panel.tsx        |  35 ++---
 src/views/project-panel/project-panel.tsx          |  54 +++-----
 .../search-results-panel-view.tsx                  |  36 ++----
 src/views/trash-panel/trash-panel.tsx              |  29 ++---
 src/views/workflow-panel/workflow-panel-view.tsx   |  45 ++++---
 31 files changed, 608 insertions(+), 280 deletions(-)
 copy src/components/data-table-filters/{data-table-filters.tsx => data-table-filters-popover.tsx} (72%)
 create mode 100644 src/components/data-table-filters/data-table-filters-tree.tsx
 create mode 100644 src/store/resource-type-filters/resource-type-filters.test.ts
 create mode 100644 src/store/resource-type-filters/resource-type-filters.ts

       via  95b86eb6b3184b787b570a906347ccaac32195c6 (commit)
       via  0a08341c1d88b3f47d6fda46ecd9110d45aaea1d (commit)
       via  3cb71e5a3dadfaa307dc948f8933e6ca3af4df60 (commit)
       via  280a875681514a5e9f707de09e39fa3e33565796 (commit)
       via  70ae2966b7ee93bd4c352e33ab0f90deec993467 (commit)
       via  ac0992ffca196679a7121fab27e43c38bc25072f (commit)
       via  f8d794c588b0a252bb8956efe2051697bff0d617 (commit)
       via  74b0d4404556af0e325906280a4c733a8b0515c9 (commit)
       via  76a864095a7ee3c329a019fbdf0a269ee31a4358 (commit)
       via  a20fe4fc8e5f3705310db8e9a68a2ff266d85fba (commit)
       via  1bbdd9c70d0099e0bf46b3c1ac55e423e3406314 (commit)
       via  f5ba9e7b5919aeea4ba208c9ca82ca4b79313d56 (commit)
       via  3c2e602507112e9136a868b65a75b6e214c47387 (commit)
       via  c819965b61e2c46566137b257b2625decc94a7ce (commit)
       via  cf15eee86516adcd2430319ca618d795b3c33b5f (commit)
       via  acbcc3e7ea8c92dc96f0b481c8b54ff7c294d273 (commit)
       via  e50ea86d3df3312a2d61ab7c674a2562901141e0 (commit)
       via  496bde686809aa98b6b15e361b0c2a916509345b (commit)
       via  dcbc5a6fce31857b47ef82274d7ca637ece04e78 (commit)
       via  45db37b6e6c4060b8445b98f8b9264c6ecaa985b (commit)
       via  6f48379abdd444ed69e030b25e47174b39129a5d (commit)
       via  65dd200fab411bdd638aec5b4d35c3063e596eac (commit)
       via  89059eace676f0855ca66aa0a66d6110223b1d7e (commit)
       via  dad5fab1615023c73ad67a9dff8f63aa7d1bf282 (commit)
       via  d32c007b46b6137c6490009b3739a363dbe2bd66 (commit)
       via  87636089f8b7d150a2987cafd48a2ca7dd6c24f9 (commit)
       via  781bcd15b161efd660d859dc9e0e62fcdeee53a6 (commit)
       via  da64c0d5be6c1c0b1cf4f0e1f600a281506e9b09 (commit)
       via  0fd32542a6ee7f9db950609a408b18d3b6017a56 (commit)
       via  890c0889fffd420a8ccf59c652d83e4fd1a06e6b (commit)
       via  effd3b741cde8a53bb3a41c8f83118481c4b4a9b (commit)
       via  84aee059a7614c1f9b59ae0495570a29eb1f32cb (commit)
       via  85ed721db9b85e55bdfeb0326167a1dcbef4f69c (commit)
       via  d46617532e5a33bbafb5cce7ae95ca06471bd45c (commit)
       via  d88f3e92dcbf4810fab55f098d7d4296107aa6ab (commit)
       via  46bb6c3da94118dabc77a01429900b0ecdd70343 (commit)
       via  b5dde550c7dd67f0b90841d6b92930e56c625dcd (commit)
       via  f7fe08bec2ee46d97356159e2bb54e076ccd0b3c (commit)
       via  a8595bc84a3272c75e6d3163db1d6031cd166bd7 (commit)
       via  fe7cca11d3d09d6aff1acf5284112a4069c49c1a (commit)
       via  b693bdde231b0ca4171015e578d9760c6001749b (commit)
       via  486b76baf259d3b83bc551cd0f7dd0c9d4395961 (commit)
       via  296ddbd8d4042198dc3f29817a048d30e506464f (commit)
       via  dade8b5aa00fa21c7c20b92767cddedabcf612cd (commit)
       via  38bcb23ba4dec9b1eda066936541341785fc657a (commit)
       via  4ff3ff000c1a0132d29ea4829907f484467b6275 (commit)
       via  8cdb226fa1c32cceccc10955ed340c7a7dd7f10d (commit)
       via  84662748161b3be21885f95dc39d0c008bac971d (commit)
       via  21f3b76dcab32f5bfa7a1d48fc323b0432718f43 (commit)
       via  e25c40c23679763255fa94bce653a106b2187abc (commit)
      from  efbf87610d0d483416a14a5364a5f8c61bdee10b (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 95b86eb6b3184b787b570a906347ccaac32195c6
Merge: efbf876 0a08341
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date:   Tue Nov 27 10:09:28 2018 +0100

    Merge branch 'master' into 13864-Virtual-machines
    
    refs #13864
    
    Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>

diff --cc src/models/resource.ts
index 679a800,006d0a2..7e2127b
--- a/src/models/resource.ts
+++ b/src/models/resource.ts
@@@ -44,8 -43,8 +44,9 @@@ export enum ResourceObjectType 
      LOG = '57u5n',
      REPOSITORY = 's0uqq',
      USER = 'tpzed',
 +    VIRTUAL_MACHINE = '2x53u',
      WORKFLOW = '7fd4e',
+     SSH_KEY = 'fngyi'
  }
  
  export const RESOURCE_UUID_PATTERN = '.{5}-.{5}-.{15}';
@@@ -78,10 -77,10 +79,12 @@@ export const extractUuidKind = (uuid: s
              return ResourceKind.LOG;
          case ResourceObjectType.WORKFLOW:
              return ResourceKind.WORKFLOW;
 +        case ResourceObjectType.VIRTUAL_MACHINE:
 +            return ResourceKind.VIRTUAL_MACHINE;
          case ResourceObjectType.REPOSITORY:
              return ResourceKind.REPOSITORY;
+         case ResourceObjectType.SSH_KEY:
+             return ResourceKind.SSH_KEY;
          default:
              return undefined;
      }

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list