[ARVADOS-WORKBENCH2] updated: 1.2.1-1063-g8623f43

Git user git at public.curoverse.com
Thu Nov 29 06:34:21 EST 2018


Summary of changes:
 README.md                                          |   3 +-
 package.json                                       |   4 +-
 src/common/config.ts                               |   9 +-
 src/components/autocomplete/autocomplete.tsx       |  13 ++-
 src/components/progress-button/progress-button.tsx |  36 +++++++
 src/index.tsx                                      |   2 +
 src/models/vocabulary.ts                           |  24 +++++
 src/services/auth-service/auth-service.ts          |   4 +-
 src/services/services.ts                           |   3 +
 .../vocabulary-service/vocabulary-service.ts       |  18 ++++
 src/store/auth/auth-actions.test.ts                |   4 +-
 src/store/vocabulary/vocabulary-actions.ts         |  20 ++++
 src/store/vocabulary/vocabulary-selctors.ts        |  16 ++++
 .../project-properties-form.tsx                    |  97 ++-----------------
 .../property-field-common.tsx                      |  45 +++++++++
 .../property-key-field.tsx                         |  46 +++++++++
 .../property-value-field.tsx                       |  62 ++++++++++++
 .../resource-properties-form.tsx                   |  44 +++++++++
 src/views/collection-panel/collection-tag-form.tsx | 106 ++-------------------
 19 files changed, 363 insertions(+), 193 deletions(-)
 create mode 100644 src/components/progress-button/progress-button.tsx
 create mode 100644 src/models/vocabulary.ts
 create mode 100644 src/services/vocabulary-service/vocabulary-service.ts
 create mode 100644 src/store/vocabulary/vocabulary-actions.ts
 create mode 100644 src/store/vocabulary/vocabulary-selctors.ts
 create mode 100644 src/views-components/resource-properties-form/property-field-common.tsx
 create mode 100644 src/views-components/resource-properties-form/property-key-field.tsx
 create mode 100644 src/views-components/resource-properties-form/property-value-field.tsx
 create mode 100644 src/views-components/resource-properties-form/resource-properties-form.tsx

       via  8623f430ea556381f8681c2aea00e43e64d3f6d1 (commit)
       via  3fe29b3b329b7d61fe8740c02d6f84454d9c310b (commit)
       via  f880dbab588eff4a3623011e3f1bd4407eda4cca (commit)
       via  c0411a76d1ae1e076dac049267a54366df1c8517 (commit)
       via  d2f157cc1d05e8385fe3771447cd8b1412f2f5dd (commit)
       via  fdc9e2f707b15d520ec0a39e7cfe52ef23a958f4 (commit)
       via  b7de31f185fccd2f9b276c1e89754d288e7facfe (commit)
       via  9a6108f929e78dd1b68dcf3cc27fd934d1fde9d6 (commit)
       via  f0aac0b9747eac597ed42e5169be73cf6fbad410 (commit)
       via  ca4613365dcc5e9e88d6c9ea4f05ffbed4b37daa (commit)
       via  6a9232429f4bb61e2be686dc6b164e40e9952f7d (commit)
       via  486d4d2abb7329ea90fb31b9901c767d69b4ef37 (commit)
       via  52bc782204edbbf55ec837a23029eee6c40629fb (commit)
       via  4ff8b25918f8441696baa393b10435a384fbc8eb (commit)
       via  2cb16ce08bd7f09fdff84c572429485384455d7a (commit)
       via  768d715efc5ecf3f0108a70f695e3c32e187c900 (commit)
       via  6578e959652ed10a51424d1b66f80280164824dd (commit)
       via  cf3a9e014c504405624cc704dda509f38b38ef7b (commit)
       via  e9fdba2e2c5f99623438cc7bfd6f7e1731b8c93b (commit)
       via  e8bda1ab1d0d5c7c4a051814cb6de39ca6189260 (commit)
       via  0b43ddb091143c3afbd2760b06a27a99050e5326 (commit)
       via  01d6c5fbcba3e51ffddf36aa0c5a0be7dc4127bc (commit)
       via  3f2690d796cce718b68006a4005940fa412ddd5f (commit)
       via  8eb3dc9fe8b8ed991b439885f874d5cb5dc1ecd1 (commit)
       via  e039a6f51ca398dae75a76cf2817b3f91bc0c1a6 (commit)
       via  6fbf6c43b2f7e1f8770cbcd245cbffc7ce0715be (commit)
       via  366a714c6d51fae8905c50d960555b4707305f42 (commit)
       via  6453a6063ff9745b4d78552ecc083f38c8fde2a4 (commit)
       via  850f82dacf3797236f8242cc50dddd250b904d2d (commit)
       via  4aaaf7498df9cbcef8a8123db8a234b741a8745f (commit)
       via  81546d30cd19cd98939e56e1b01b5c9684941f98 (commit)
       via  511702e8333a82459900a4118b65bf1f9d9c5ff3 (commit)
       via  857ac804982b4c54c995d25f413a8811da56b63c (commit)
       via  028b8ca12dbf19c890c2337894b88e7f23a5e97d (commit)
       via  612cc2f292c66f073e464ae321e389bb96ef1a04 (commit)
       via  fdd79297de2d58c0e25588beb9ddf4feda908afa (commit)
       via  960d08db813ea71f171bf24d16a9264108356ab0 (commit)
       via  1022c7ee7dadce002b00144eaacb5742ea0a7058 (commit)
       via  b8bba11c446b95f2e82a397e0c55486d16fbb97f (commit)
       via  042fbd69136d8f7090ac0295645d24dbc2a9f4a4 (commit)
       via  85c93508dc959ca5491998283565a8e125a56a86 (commit)
       via  54bc9553ec46b8f8244900fd19efca6030a6398a (commit)
       via  e843169bf01229e8735c3fb784441e9de2c23a14 (commit)
       via  80fab904a6ea3f81465e70d879d9d0b722d072e6 (commit)
      from  25d3415ed6b183eb627bfc06e2d5d977c85ad828 (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 8623f430ea556381f8681c2aea00e43e64d3f6d1
Merge: 25d3415 3fe29b3
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date:   Thu Nov 29 12:34:13 2018 +0100

    merge master
    
    Feature #14498
    
    Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>

diff --cc src/services/auth-service/auth-service.ts
index 8221e48,edc6e24..2c0c83d
--- a/src/services/auth-service/auth-service.ts
+++ b/src/services/auth-service/auth-service.ts
@@@ -59,10 -59,9 +59,10 @@@ export class AuthService 
          const email = localStorage.getItem(USER_EMAIL_KEY);
          const firstName = localStorage.getItem(USER_FIRST_NAME_KEY);
          const lastName = localStorage.getItem(USER_LAST_NAME_KEY);
-         const uuid = localStorage.getItem(USER_UUID_KEY);
-         const ownerUuid = localStorage.getItem(USER_OWNER_UUID_KEY);
+         const uuid = this.getUuid();
+         const ownerUuid = this.getOwnerUuid();
          const isAdmin = this.getIsAdmin();
 +        console.log(isAdmin);
  
          return email && firstName && lastName && uuid && ownerUuid
              ? { email, firstName, lastName, uuid, ownerUuid, isAdmin }

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list