[ARVADOS-WORKBENCH2] updated: 1.3.0-134-g54b2272

Git user git at public.curoverse.com
Thu Dec 13 09:18:45 EST 2018


Summary of changes:
 src/common/config.ts                                          | 11 ++++++++---
 src/components/icon/icon.tsx                                  |  2 ++
 src/services/collection-service/collection-service.ts         |  2 +-
 src/store/file-viewers/file-viewers-selectors.ts              |  4 +---
 .../context-menu/actions/file-viewer-actions.tsx              |  4 ++++
 5 files changed, 16 insertions(+), 7 deletions(-)

       via  54b2272cee641887e00c1cc04fd44121048e36b4 (commit)
       via  ce77c6af348f60f332297de2ca9281ade68450e7 (commit)
       via  e4060326613f1a4dfa59c4854078fb4be4f53aea (commit)
       via  e9e0cc24a86e55e7b6421b352800ff29f201a29d (commit)
       via  09f5c7f7b6473444a2d6dc964c2beba6128f319a (commit)
       via  4322da0c140b34c48ecf20e20331111ad27fabaa (commit)
      from  0a9fd3e65e852b2e27f7051736f10fa81a73ba5d (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 54b2272cee641887e00c1cc04fd44121048e36b4
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Thu Dec 13 15:17:03 2018 +0100

    Replace FileViewerActions icon with OpenIcon
    
    Feature #13540
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/views-components/context-menu/actions/file-viewer-actions.tsx b/src/views-components/context-menu/actions/file-viewer-actions.tsx
index bedc590..b2ce556 100644
--- a/src/views-components/context-menu/actions/file-viewer-actions.tsx
+++ b/src/views-components/context-menu/actions/file-viewer-actions.tsx
@@ -3,13 +3,14 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from "react";
-import { ListItemText, ListItem, ListItemIcon, Icon } from "@material-ui/core";
+import { ListItemText, ListItem, ListItemIcon } from "@material-ui/core";
 import { RootState } from '~/store/store';
 import { getNodeValue } from '~/models/tree';
 import { CollectionDirectory, CollectionFile, CollectionFileType } from '~/models/collection-file';
 import { FileViewerList, FileViewer } from '~/models/file-viewers-config';
 import { getFileViewers } from '~/store/file-viewers/file-viewers-selectors';
 import { connect } from 'react-redux';
+import { OpenIcon } from '~/components/icon/icon';
 
 interface FileViewerActionProps {
     fileUrl: string;
@@ -63,7 +64,7 @@ export const FileViewerActions = connect(mapStateToProps)(
                     target='_blank'>
                     <ListItem button>
                         <ListItemIcon>
-                            <Icon />
+                            <OpenIcon />
                         </ListItemIcon>
                         <ListItemText>
                             {viewer.name}

commit ce77c6af348f60f332297de2ca9281ade68450e7
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Thu Dec 13 15:15:13 2018 +0100

    Add OpenIcon
    
    Feature #13540
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx
index c077f7a..2bd1697 100644
--- a/src/components/icon/icon.tsx
+++ b/src/components/icon/icon.tsx
@@ -38,6 +38,7 @@ import MoreVert from '@material-ui/icons/MoreVert';
 import Mail from '@material-ui/icons/Mail';
 import MoveToInbox from '@material-ui/icons/MoveToInbox';
 import Notifications from '@material-ui/icons/Notifications';
+import OpenInNew from '@material-ui/icons/OpenInNew';
 import People from '@material-ui/icons/People';
 import Person from '@material-ui/icons/Person';
 import PersonAdd from '@material-ui/icons/PersonAdd';
@@ -83,6 +84,7 @@ export const MoreOptionsIcon: IconType = (props) => <MoreVert {...props} />;
 export const MoveToIcon: IconType = (props) => <Input {...props} />;
 export const NewProjectIcon: IconType = (props) => <CreateNewFolder {...props} />;
 export const NotificationIcon: IconType = (props) => <Notifications {...props} />;
+export const OpenIcon: IconType = (props) => <OpenInNew {...props} />;
 export const OutputIcon: IconType = (props) => <MoveToInbox {...props} />;
 export const PaginationDownIcon: IconType = (props) => <ArrowDropDown {...props} />;
 export const PaginationLeftArrowIcon: IconType = (props) => <ChevronLeft {...props} />;

commit e4060326613f1a4dfa59c4854078fb4be4f53aea
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Thu Dec 13 14:58:51 2018 +0100

    Fill file actions space with an empty icon
    
    Feature #13540
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/views-components/context-menu/actions/file-viewer-actions.tsx b/src/views-components/context-menu/actions/file-viewer-actions.tsx
index 868769d..bedc590 100644
--- a/src/views-components/context-menu/actions/file-viewer-actions.tsx
+++ b/src/views-components/context-menu/actions/file-viewer-actions.tsx
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from "react";
-import { ListItemText, ListItem, ListItemIcon } from "@material-ui/core";
+import { ListItemText, ListItem, ListItemIcon, Icon } from "@material-ui/core";
 import { RootState } from '~/store/store';
 import { getNodeValue } from '~/models/tree';
 import { CollectionDirectory, CollectionFile, CollectionFileType } from '~/models/collection-file';
@@ -62,6 +62,9 @@ export const FileViewerActions = connect(mapStateToProps)(
                     onClick={onClick}
                     target='_blank'>
                     <ListItem button>
+                        <ListItemIcon>
+                            <Icon />
+                        </ListItemIcon>
                         <ListItemText>
                             {viewer.name}
                         </ListItemText>

commit e9e0cc24a86e55e7b6421b352800ff29f201a29d
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Thu Dec 13 14:57:57 2018 +0100

    Clean up DEFAULT_FILE_VIEWERS
    
    Feature #13540
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/store/file-viewers/file-viewers-selectors.ts b/src/store/file-viewers/file-viewers-selectors.ts
index 009e1f3..abc9d3d 100644
--- a/src/store/file-viewers/file-viewers-selectors.ts
+++ b/src/store/file-viewers/file-viewers-selectors.ts
@@ -7,8 +7,6 @@ import { FileViewerList } from '~/models/file-viewers-config';
 
 export const FILE_VIEWERS_PROPERTY_NAME = 'fileViewers';
 
-export const DEFAULT_FILE_VIEWERS: FileViewerList = [
-    { name: 'Test viewer', url: 'http://viewer.com', filePathParam: 'filePath' },
-];
+export const DEFAULT_FILE_VIEWERS: FileViewerList = [];
 export const getFileViewers = (state: PropertiesState) =>
     getProperty<FileViewerList>(FILE_VIEWERS_PROPERTY_NAME)(state) || DEFAULT_FILE_VIEWERS;

commit 09f5c7f7b6473444a2d6dc964c2beba6128f319a
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Thu Dec 13 14:57:27 2018 +0100

    Pass FILE_VIEWERS_CONFIG_URL to configuration
    
    Feature #13540
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/common/config.ts b/src/common/config.ts
index 4d96bbb..db67ed8 100644
--- a/src/common/config.ts
+++ b/src/common/config.ts
@@ -60,10 +60,15 @@ export const fetchConfig = () => {
         .catch(() => Promise.resolve(getDefaultConfig()))
         .then(config => Axios
             .get<Config>(getDiscoveryURL(config.API_HOST))
-            .then(response => ({ 
+            .then(response => ({
                 // TODO: After tests delete `|| '/vocabulary-example.json'`
-                config: {...response.data, vocabularyUrl: config.VOCABULARY_URL || '/vocabulary-example.json' }, 
-                apiHost: config.API_HOST, 
+                // TODO: After tests delete `|| '/file-viewers-example.json'`
+                config: {
+                    ...response.data,
+                    vocabularyUrl: config.VOCABULARY_URL || '/vocabulary-example.json',
+                    fileViewersConfigUrl: config.FILE_VIEWERS_CONFIG_URL || '/file-viewers-example.json'
+                },
+                apiHost: config.API_HOST,
             })));
 
 };

commit 4322da0c140b34c48ecf20e20331111ad27fabaa
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Thu Dec 13 09:05:39 2018 +0100

    Delete api token from file url
    
    Feature #13540
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/services/collection-service/collection-service.ts b/src/services/collection-service/collection-service.ts
index b0d5cb1..f0f25a2 100644
--- a/src/services/collection-service/collection-service.ts
+++ b/src/services/collection-service/collection-service.ts
@@ -56,7 +56,7 @@ export class CollectionService extends TrashableResourceService<CollectionResour
             : this.webdavClient.defaults.baseURL;
         return {
             ...file,
-            url: baseUrl + file.url + '?api_token=' + this.authService.getApiToken()
+            url: baseUrl + file.url
         };
     }
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list