refs #master Merge branch 'origin/master' into 14007-ts-paths
authorDaniel Kos <daniel.kos@contractors.roche.com>
Mon, 13 Aug 2018 17:48:41 +0000 (19:48 +0200)
committerDaniel Kos <daniel.kos@contractors.roche.com>
Mon, 13 Aug 2018 17:48:41 +0000 (19:48 +0200)
# Conflicts:
# src/components/data-explorer/data-explorer.test.tsx
# src/components/data-explorer/data-explorer.tsx
# src/store/navigation/navigation-action.ts
# src/views-components/context-menu/action-sets/root-project-action-set.ts
# src/views-components/details-panel/empty-details.tsx
# src/views/favorite-panel/favorite-panel.tsx
# src/views/project-panel/project-panel.tsx
# src/views/workbench/workbench.test.tsx
# src/views/workbench/workbench.tsx

Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>

122 files changed:
package.json
src/common/api/common-resource-service.test.ts
src/common/api/common-resource-service.ts
src/common/labels.ts
src/components/collection-panel-files/collection-panel-files.tsx
src/components/column-selector/column-selector.tsx
src/components/confirmation-dialog/confirmation-dialog.tsx
src/components/context-menu/context-menu.test.tsx
src/components/data-explorer/data-explorer.tsx
src/components/data-table-filters/data-table-filters.test.tsx
src/components/data-table/data-column.ts
src/components/data-table/data-table.test.tsx
src/components/data-table/data-table.tsx
src/components/details-attribute/details-attribute.tsx
src/components/dropdown-menu/dropdown-menu.test.tsx
src/components/file-tree/file-tree-item.tsx
src/components/file-upload/file-upload.tsx
src/components/list-item-text-icon/list-item-text-icon.tsx
src/components/popover/popover.test.tsx
src/components/rename-dialog/rename-dialog.tsx
src/components/side-panel/side-panel.tsx
src/components/text-field/text-field.tsx
src/components/tree/tree.tsx
src/services/auth-service/auth-service.ts
src/services/collection-files-service/collection-files-service.ts
src/services/collection-files-service/collection-manifest-mapper.ts
src/services/collection-files-service/collection-manifest-parser.ts
src/services/collection-service/collection-service.ts
src/services/favorite-service/favorite-order-builder.ts
src/services/favorite-service/favorite-service.test.ts
src/services/favorite-service/favorite-service.ts
src/services/groups-service/groups-service.ts
src/services/keep-service/keep-service.ts
src/services/link-service/link-service.ts
src/services/project-service/project-service.test.ts
src/services/project-service/project-service.ts
src/services/services.ts
src/services/tag-service/tag-service.ts
src/store/auth/auth-action.ts
src/store/auth/auth-actions.test.ts
src/store/auth/auth-reducer.test.ts
src/store/auth/auth-reducer.ts
src/store/collection-panel/collection-panel-action.ts
src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
src/store/collection-panel/collection-panel-files/collection-panel-files-reducer.test.ts
src/store/collection-panel/collection-panel-files/collection-panel-files-reducer.ts
src/store/collection-panel/collection-panel-files/collection-panel-files-state.ts
src/store/collection-panel/collection-panel-reducer.ts
src/store/collections/creator/collection-creator-action.ts
src/store/collections/updater/collection-updater-action.ts
src/store/data-explorer/data-explorer-action.ts
src/store/data-explorer/data-explorer-middleware.test.ts
src/store/data-explorer/data-explorer-reducer.test.tsx
src/store/data-explorer/data-explorer-reducer.ts
src/store/details-panel/details-panel-action.ts
src/store/details-panel/details-panel-reducer.ts
src/store/favorite-panel/favorite-panel-middleware-service.ts
src/store/favorites/favorites-actions.ts
src/store/navigation/navigation-action.ts
src/store/project-panel/project-panel-middleware-service.ts
src/store/project/project-action.ts
src/store/project/project-reducer.test.ts
src/store/project/project-reducer.ts
src/store/side-panel/side-panel-reducer.test.ts
src/store/side-panel/side-panel-reducer.ts
src/store/store.ts
src/store/tree-picker/tree-picker-actions.ts
src/store/tree-picker/tree-picker-reducer.test.ts
src/store/tree-picker/tree-picker-reducer.ts
src/store/tree-picker/tree-picker.ts
src/views-components/api-token/api-token.tsx
src/views-components/collection-panel-files/collection-panel-files.ts
src/views-components/context-menu/action-sets/collection-action-set.ts
src/views-components/context-menu/action-sets/collection-files-action-set.ts
src/views-components/context-menu/action-sets/collection-files-item-action-set.ts
src/views-components/context-menu/action-sets/collection-resource-action-set.ts
src/views-components/context-menu/action-sets/favorite-action-set.ts
src/views-components/context-menu/action-sets/project-action-set.ts
src/views-components/context-menu/action-sets/resource-action-set.ts
src/views-components/context-menu/action-sets/root-project-action-set.ts
src/views-components/context-menu/actions/favorite-action.tsx
src/views-components/context-menu/context-menu-action-set.ts
src/views-components/context-menu/context-menu.tsx
src/views-components/create-collection-dialog-with-selected/create-collection-dialog-with-selected.tsx
src/views-components/create-collection-dialog/create-collection-dialog.tsx
src/views-components/create-project-dialog/create-project-dialog.tsx
src/views-components/current-token-dialog/current-token-dialog.tsx
src/views-components/data-explorer/data-explorer.tsx
src/views-components/data-explorer/renderers.tsx
src/views-components/details-panel/collection-details.tsx
src/views-components/details-panel/details-data.tsx
src/views-components/details-panel/details-panel.tsx
src/views-components/details-panel/empty-details.tsx
src/views-components/details-panel/process-details.tsx
src/views-components/details-panel/project-details.tsx
src/views-components/dialog-create/dialog-collection-create-selected.tsx
src/views-components/dialog-create/dialog-collection-create.tsx
src/views-components/dialog-create/dialog-project-create.tsx
src/views-components/dialog-update/dialog-collection-update.tsx
src/views-components/favorite-star/favorite-star.tsx
src/views-components/file-remove-dialog/file-remove-dialog.ts
src/views-components/file-remove-dialog/multiple-files-remove-dialog.ts
src/views-components/main-app-bar/main-app-bar.test.tsx
src/views-components/main-app-bar/main-app-bar.tsx
src/views-components/project-tree-picker/project-tree-picker.tsx
src/views-components/project-tree/project-tree.test.tsx
src/views-components/project-tree/project-tree.tsx
src/views-components/remove-dialog/remove-dialog.tsx
src/views-components/rename-file-dialog/rename-file-dialog.tsx
src/views-components/snackbar/snackbar.tsx
src/views-components/tree-picker/tree-picker.ts
src/views-components/update-collection-dialog/update-collection-dialog..tsx
src/views/collection-panel/collection-panel.tsx
src/views/collection-panel/collection-tag-form.tsx
src/views/favorite-panel/favorite-panel-item.ts
src/views/favorite-panel/favorite-panel.tsx
src/views/project-panel/project-panel-item.ts
src/views/project-panel/project-panel.tsx
src/views/workbench/workbench.test.tsx
src/views/workbench/workbench.tsx
tsconfig.json
yarn.lock

index cd8a9c4d241356df33f60894c8ca23f2bf0fc1e4..e2b6c4e1ec21f4017c0096a75bba61191a923dbd 100644 (file)
@@ -20,7 +20,7 @@
     "react-router": "4.3.1",
     "react-router-dom": "4.3.1",
     "react-router-redux": "5.0.0-alpha.9",
-    "react-scripts-ts": "2.16.0",
+    "react-scripts-ts": "2.17.0",
     "redux": "4.0.0",
     "redux-thunk": "2.3.0",
     "unionize": "2.1.2"
@@ -54,7 +54,9 @@
     "redux-form": "7.4.2",
     "typescript": "3.0.1"
   },
-  "moduleNameMapper": {
-    "^~/(.*)$": "<rootDir>/src/$1"
+  "jest": {
+    "moduleNameMapper": {
+      "^~/(.*)$": "<rootDir>/src/$1"
+    }
   }
 }
index d909c092aa8bad0a37ac0308a4da8ca80a872585..a1d5e0868f4e0f0c333251022aed668e2edc7ded 100644 (file)
@@ -5,7 +5,7 @@
 import { CommonResourceService } from "./common-resource-service";
 import axios, { AxiosInstance } from "axios";
 import MockAdapter from "axios-mock-adapter";
-import { Resource } from "../../models/resource";
+import { Resource } from "~/models/resource";
 
 export const mockResourceService = <R extends Resource, C extends CommonResourceService<R>>(Service: new (client: AxiosInstance) => C) => {
     const axiosInstance = axios.create();
index a836246b2e23fd50dde96eebe613f8dd14c7820f..36017f0f11f5b2455e27a74330a67e43c2c8cbe5 100644 (file)
@@ -6,7 +6,7 @@ import * as _ from "lodash";
 import { FilterBuilder } from "./filter-builder";
 import { OrderBuilder } from "./order-builder";
 import { AxiosInstance, AxiosPromise } from "axios";
-import { Resource } from "../../models/resource";
+import { Resource } from "~/models/resource";
 
 export interface ListArguments {
     limit?: number;
index ed3a43d1427e6622e55c9059cddc7bfbf77eff46..0e3131db6a3f8c9621c05e3e4df3770960537b88 100644 (file)
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { ResourceKind } from "../models/resource";
+import { ResourceKind } from "~/models/resource";
 
 export const resourceLabel = (type: string) => {
     switch (type) {
@@ -15,4 +15,4 @@ export const resourceLabel = (type: string) => {
         default:
             return "Unknown";
     }
-};
\ No newline at end of file
+};
index afe9e8517cc4027d5e90a4fca4d6007a560ea5d1..665758c3e62cbd916366045f79c1e4026a560c99 100644 (file)
@@ -6,12 +6,12 @@ import * as React from 'react';
 import { TreeItem, TreeItemStatus } from '../tree/tree';
 import { FileTreeData } from '../file-tree/file-tree-data';
 import { FileTree } from '../file-tree/file-tree';
-import { IconButton, Grid, Typography, StyleRulesCallback, withStyles, WithStyles, CardHeader, CardContent, Card, Button } from '@material-ui/core';
+import { IconButton, Grid, Typography, StyleRulesCallback, withStyles, WithStyles, CardHeader, Card, Button } from '@material-ui/core';
 import { CustomizeTableIcon } from '../icon/icon';
 import { connect, DispatchProp } from "react-redux";
 import { Dispatch } from "redux";
-import { RootState } from "../../store/store";
-import { ServiceRepository } from "../../services/services";
+import { RootState } from "~/store/store";
+import { ServiceRepository } from "~/services/services";
 
 export interface CollectionPanelFilesProps {
     items: Array<TreeItem<FileTreeData>>;
index f2e42dd251bfbfa07e3c926de0a24cd7291c2038..5e4b3397fab9e3b695d4c92bb37ad1e5e99c60b9 100644 (file)
@@ -9,7 +9,7 @@ import { DataColumn } from '../data-table/data-column';
 import { Popover } from "../popover/popover";
 import { IconButtonProps } from '@material-ui/core/IconButton';
 import { DataColumns } from '../data-table/data-table';
-import { ArvadosTheme } from "../../common/custom-theme";
+import { ArvadosTheme } from "~/common/custom-theme";
 
 interface ColumnSelectorDataProps {
     columns: DataColumns<any>;
index 6e87416781eb01a02866bc9f2bcea65dc0c59a68..9ca3454a61e7c304ef703f32f84ef734662837f6 100644 (file)
@@ -3,10 +3,8 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from "react";
-import { defaultTo, property } from 'lodash';
-import { Dialog, DialogTitle, DialogContent, DialogActions, Button, Typography, DialogContentText, CircularProgress } from "@material-ui/core";
+import { Dialog, DialogTitle, DialogContent, DialogActions, Button, DialogContentText } from "@material-ui/core";
 import { WithDialogProps } from "../../store/dialog/with-dialog";
-import { TextField } from "../text-field/text-field";
 
 export interface ConfirmationDialogDataProps {
     title: string;
index 5ced213a3fb69435f42b1d3a8ba9bc9e93610df9..faf05f1ff32984d3b663ce5eaa296e0fdd28a306 100644 (file)
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from "react";
-import { mount, configure, shallow } from "enzyme";
+import { mount, configure } from "enzyme";
 import * as Adapter from "enzyme-adapter-react-16";
 import { ContextMenu } from "./context-menu";
 import { ListItem } from "@material-ui/core";
index 7acc1a835ac2997eddff27220f461318bcfc7f19..2811bd4d1f7e7fada857e6677e7f50c1c576fba6 100644 (file)
@@ -10,7 +10,7 @@ import { DataTable, DataColumns } from "../data-table/data-table";
 import { DataColumn } from "../data-table/data-column";
 import { DataTableFilterItem } from '../data-table-filters/data-table-filters';
 import { SearchInput } from '../search-input/search-input';
-import { ArvadosTheme } from "../../common/custom-theme";
+import { ArvadosTheme } from "~/common/custom-theme";
 import { DefaultView } from '../default-view/default-view';
 import { IconType } from '../icon/icon';
 
index b0a84b51760a50cef284c567bd24ddd1754a61ea..9a3fa4dc5ca4640e294871c6f389baeb691abf1e 100644 (file)
@@ -4,7 +4,7 @@
 
 import * as React from "react";
 import { mount, configure } from "enzyme";
-import { DataTableFilters, DataTableFilterItem } from "./data-table-filters";
+import { DataTableFilters } from "./data-table-filters";
 import * as Adapter from 'enzyme-adapter-react-16';
 import { Checkbox, ButtonBase, ListItem, Button, ListItemText } from "@material-ui/core";
 
index a5000b935bcea4b1420b14408516d03718dacb67..ac35c0239556b01692ae7a960eabb2257dd3e930 100644 (file)
@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { DataTableFilterItem } from "../data-table-filters/data-table-filters";
+import * as React from "react";
 
 export interface DataColumn<T, F extends DataTableFilterItem = DataTableFilterItem> {
     name: string;
index 99ed2daffb52ab5c1c0cf051205eb5ac28e96806..77c7825bc135079dd85bacce2beb42ddd728b1d7 100644 (file)
@@ -18,17 +18,20 @@ describe("<DataTable />", () => {
             {
                 name: "Column 1",
                 render: () => <span />,
-                selected: true
+                selected: true,
+                configurable: true
             },
             {
                 name: "Column 2",
                 render: () => <span />,
-                selected: true
+                selected: true,
+                configurable: true
             },
             {
                 name: "Column 3",
                 render: () => <span />,
-                selected: false
+                selected: false,
+                configurable: true
             }
         ];
         const dataTable = mount(<DataTable
@@ -47,7 +50,8 @@ describe("<DataTable />", () => {
             {
                 name: "Column 1",
                 render: () => <span />,
-                selected: true
+                selected: true,
+                configurable: true
             }
         ];
         const dataTable = mount(<DataTable
@@ -67,7 +71,8 @@ describe("<DataTable />", () => {
                 name: "Column 1",
                 renderHeader: () => <span>Column Header</span>,
                 render: () => <span />,
-                selected: true
+                selected: true,
+                configurable: true
             }
         ];
         const dataTable = mount(<DataTable
@@ -87,7 +92,8 @@ describe("<DataTable />", () => {
                 name: "Column 1",
                 key: "column-1-key",
                 render: () => <span />,
-                selected: true
+                selected: true,
+                configurable: true
             }
         ];
         const dataTable = mount(<DataTable
@@ -107,12 +113,14 @@ describe("<DataTable />", () => {
             {
                 name: "Column 1",
                 render: (item) => <Typography>{item}</Typography>,
-                selected: true
+                selected: true,
+                configurable: true
             },
             {
                 name: "Column 2",
                 render: (item) => <Button>{item}</Button>,
-                selected: true
+                selected: true,
+                configurable: true
             }
         ];
         const dataTable = mount(<DataTable
@@ -132,6 +140,7 @@ describe("<DataTable />", () => {
             name: "Column 1",
             sortDirection: SortDirection.ASC,
             selected: true,
+            configurable: true,
             render: (item) => <Typography>{item}</Typography>
         }];
         const onSortToggle = jest.fn();
@@ -153,6 +162,7 @@ describe("<DataTable />", () => {
             name: "Column 1",
             sortDirection: SortDirection.ASC,
             selected: true,
+            configurable: true,
             filters: [{ name: "Filter 1", selected: true }],
             render: (item) => <Typography>{item}</Typography>
         }];
index f92f97b72f94b74d7da7dc23ff175ceeec225829..34f8168a55b50fc206829114846b46d8a51ff323 100644 (file)
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from 'react';
-import { Table, TableBody, TableRow, TableCell, TableHead, TableSortLabel, StyleRulesCallback, Theme, WithStyles, withStyles, Typography } from '@material-ui/core';
+import { Table, TableBody, TableRow, TableCell, TableHead, TableSortLabel, StyleRulesCallback, Theme, WithStyles, withStyles } from '@material-ui/core';
 import { DataColumn, SortDirection } from './data-column';
 import { DataTableFilters,  DataTableFilterItem } from "../data-table-filters/data-table-filters";
 
index 9e58a3e4a0a12f1d8e3ac5eac54f7fb169729129..3888b04b67d596ea84f3e11cbfeba30999adbc03 100644 (file)
@@ -5,7 +5,7 @@
 import * as React from 'react';
 import Typography from '@material-ui/core/Typography';
 import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles';
-import { ArvadosTheme } from '../../common/custom-theme';
+import { ArvadosTheme } from '~/common/custom-theme';
 import * as classnames from "classnames";
 
 type CssRules = 'attribute' | 'label' | 'value' | 'link';
index da232bd288499810c827f7ac602796348758f3fe..32039939031290d018a34855db76d17664f7ec9f 100644 (file)
@@ -30,13 +30,13 @@ describe("<DropdownMenu />", () => {
     it("opens on menu icon click", () => {
         const dropdownMenu = shallow(<DropdownMenu id="test-menu" icon={<PaginationRightArrowIcon />} />);
         dropdownMenu.find(IconButton).simulate("click", {currentTarget: {}});
-        expect(dropdownMenu.state().anchorEl).toBeDefined();
+        expect((dropdownMenu.state() as any).anchorEl).toBeDefined();
     });
 
     it("closes on menu click", () => {
         const dropdownMenu = shallow(<DropdownMenu id="test-menu" icon={<PaginationRightArrowIcon />} />);
         dropdownMenu.find(Menu).simulate("click", {currentTarget: {}});
-        expect(dropdownMenu.state().anchorEl).toBeUndefined();
+        expect((dropdownMenu.state() as any).anchorEl).toBeUndefined();
     });
 
 });
index 5255ded1febb95b074e72c5e73f3d19ef55d0480..e2d6b26cb4117e913c396e5cb105bbb8dbc7a3e8 100644 (file)
@@ -6,7 +6,7 @@ import * as React from "react";
 import { TreeItem } from "../tree/tree";
 import { ProjectIcon, MoreOptionsIcon, DefaultIcon, CollectionIcon } from "../icon/icon";
 import { Typography, IconButton, StyleRulesCallback, withStyles, WithStyles } from "@material-ui/core";
-import { formatFileSize } from "../../common/formatters";
+import { formatFileSize } from "~/common/formatters";
 import { ListItemTextIcon } from "../list-item-text-icon/list-item-text-icon";
 import { FileTreeData } from "./file-tree-data";
 
index ec4fdc2070bbc0c93578253d849dd2dbd5bfa334..74efe009e9503a95576993985c776f9f2b396282 100644 (file)
@@ -13,8 +13,8 @@ import {
 import { withStyles } from '@material-ui/core';
 import Dropzone from 'react-dropzone';
 import { CloudUploadIcon } from "../icon/icon";
-import { formatFileSize, formatProgress, formatUploadSpeed } from "../../common/formatters";
-import { UploadFile } from "../../store/collections/uploader/collection-uploader-actions";
+import { formatFileSize, formatProgress, formatUploadSpeed } from "~/common/formatters";
+import { UploadFile } from "~/store/collections/uploader/collection-uploader-actions";
 
 type CssRules = "root" | "dropzone" | "container" | "uploadIcon";
 
index 6f8a2c4302e635bd9b4222801d0ddbb9ce5f82bb..b34c6ab5f9cab8784e525b6356963f4fad4b800c 100644 (file)
@@ -4,7 +4,7 @@
 
 import * as React from 'react';
 import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles';
-import { ArvadosTheme } from '../../common/custom-theme';
+import { ArvadosTheme } from '~/common/custom-theme';
 import { ListItemIcon, ListItemText, Typography } from '@material-ui/core';
 import { IconType } from '../icon/icon';
 import * as classnames from "classnames";
index 37007ab41eb4fd397b1653e29b2d0281b10e1e01..4bc2ebd49b073c2068408682ecd7a3098dbc1267 100644 (file)
@@ -15,7 +15,7 @@ describe("<Popover />", () => {
     it("opens on default trigger click", () => {
         const popover = mount(<Popover />);
         popover.find(DefaultTrigger).simulate("click");
-        expect(popover.state().anchorEl).toBeDefined();
+        expect((popover.state() as any).anchorEl).toBeDefined();
     });
 
     it("renders custom trigger", () => {
@@ -26,7 +26,7 @@ describe("<Popover />", () => {
     it("opens on custom trigger click", () => {
         const popover = mount(<Popover triggerComponent={CustomTrigger} />);
         popover.find(CustomTrigger).simulate("click");
-        expect(popover.state().anchorEl).toBeDefined();
+        expect((popover.state() as any).anchorEl).toBeDefined();
     });
 
     it("renders children when opened", () => {
@@ -47,7 +47,7 @@ describe("<Popover />", () => {
         );
         popover.find(DefaultTrigger).simulate("click");
         popover.find(CustomTrigger).simulate("click");
-        expect(popover.state().anchorEl).toBeDefined();
+        expect((popover.state() as any).anchorEl).toBeDefined();
     });
     it("closes on content click if closeOnContentClick is set", () => {
         const popover = mount(
@@ -57,7 +57,7 @@ describe("<Popover />", () => {
         );
         popover.find(DefaultTrigger).simulate("click");
         popover.find(CustomTrigger).simulate("click");
-        expect(popover.state().anchorEl).toBeUndefined();
+        expect((popover.state() as any).anchorEl).toBeUndefined();
     });
 
 });
index f70d857df36c036c8aa71a0e20e8dfad48f1c674..e025764848de03adae00bc14227764acff00c58b 100644 (file)
@@ -4,8 +4,8 @@
 
 import * as React from "react";
 import { InjectedFormProps, Field } from "redux-form";
-import { Dialog, DialogTitle, DialogContent, DialogActions, Button, Typography, DialogContentText, CircularProgress } from "@material-ui/core";
-import { WithDialogProps } from "../../store/dialog/with-dialog";
+import { Dialog, DialogTitle, DialogContent, DialogActions, Button, DialogContentText, CircularProgress } from "@material-ui/core";
+import { WithDialogProps } from "~/store/dialog/with-dialog";
 import { TextField } from "../text-field/text-field";
 
 export const RenameDialog = (props: WithDialogProps<string> & InjectedFormProps<{ name: string }>) =>
index c7649d4d8082edf81ac8d3a4235d035c72812620..206cb6322b84a1d181d451f76d8886328837a969 100644 (file)
@@ -5,7 +5,7 @@
 import * as React from 'react';
 import { ReactElement } from 'react';
 import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles';
-import { ArvadosTheme } from '../../common/custom-theme';
+import { ArvadosTheme } from '~/common/custom-theme';
 import { List, ListItem, ListItemIcon, Collapse } from "@material-ui/core";
 import { SidePanelRightArrowIcon, IconType } from '../icon/icon';
 import * as classnames from "classnames";
index d9f11f43322a5a9dcfe70e0e5a59692592c08c39..1fe77ca66c6de47c4516352cc54d9dfcfa4e659e 100644 (file)
@@ -4,7 +4,7 @@
 
 import * as React from 'react';
 import { WrappedFieldProps } from 'redux-form';
-import { ArvadosTheme } from '../../common/custom-theme';
+import { ArvadosTheme } from '~/common/custom-theme';
 import { TextField as MaterialTextField, StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core';
 
 type CssRules = 'textField';
@@ -25,4 +25,4 @@ export const TextField = withStyles(styles)((props: WrappedFieldProps & WithStyl
         autoComplete='off'
         fullWidth={true}
         {...props.input}
-    />);
\ No newline at end of file
+    />);
index 669b70c0e855c1d551bc4a4dedfeacbe35000814..3e8cf904cfaae2274d1273bb81f1f77048b34c2a 100644 (file)
@@ -9,7 +9,7 @@ import { ReactElement } from "react";
 import CircularProgress from '@material-ui/core/CircularProgress';
 import * as classnames from "classnames";
 
-import { ArvadosTheme } from '../../common/custom-theme';
+import { ArvadosTheme } from '~/common/custom-theme';
 import { SidePanelRightArrowIcon } from '../icon/icon';
 
 type CssRules = 'list'
index dd47662a5c86a82b84335f905fe05744e81bff2b..57915f70578f04be4afd19ef8d6de2543b1cdf3b 100644 (file)
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { User } from "../../models/user";
+import { User } from "~/models/user";
 import { AxiosInstance } from "axios";
 
 export const API_TOKEN_KEY = 'apiToken';
index 5e6891c8ed417254f451cd2e640bdf80ca510222..1d9a537f4a559cfdf06ab01d29eb9a011943f1ed 100644 (file)
@@ -5,7 +5,7 @@
 import { CollectionService } from "../collection-service/collection-service";
 import { parseKeepManifestText, stringifyKeepManifest } from "./collection-manifest-parser";
 import { mapManifestToCollectionFilesTree } from "./collection-manifest-mapper";
-import { CommonResourceService } from "../../common/api/common-resource-service";
+import { CommonResourceService } from "~/common/api/common-resource-service";
 import * as _ from "lodash";
 
 export class CollectionFilesService {
index 860308179c87927ade63dc67aff8386321225b0a..c3fd43ead1d0d4c013e066f0331712710af9f38f 100644 (file)
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { uniqBy, groupBy } from 'lodash';
-import { KeepManifestStream, KeepManifestStreamFile, KeepManifest } from "../../models/keep-manifest";
-import { TreeNode, setNode, createTree, getNodeDescendants, getNodeValue } from '../../models/tree';
+import { KeepManifestStream, KeepManifestStreamFile, KeepManifest } from "~/models/keep-manifest";
+import { TreeNode, setNode, createTree, getNodeDescendants, getNodeValue } from '~/models/tree';
 import { CollectionFilesTree, CollectionFile, CollectionDirectory, createCollectionDirectory, createCollectionFile, CollectionFileType } from '../../models/collection-file';
 
 export const mapCollectionFilesTreeToManifest = (tree: CollectionFilesTree): KeepManifest => {
index b0fc55a49ba0ec48017c26383272a82914a72b10..d564f33ec03a13634d11fb84052ef3e814ea6ba7 100644 (file)
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { KeepManifestStream, KeepManifestStreamFile, KeepManifest } from "../../models/keep-manifest";
+import { KeepManifestStream, KeepManifestStreamFile, KeepManifest } from "~/models/keep-manifest";
 
 /**
  * Documentation [http://doc.arvados.org/api/storage.html](http://doc.arvados.org/api/storage.html)
index 4d750362e3972c339d95ca27f18aff7d3bed82e0..f60e81f1975da8b4c37921f7490b9c0fb150c008 100644 (file)
@@ -2,15 +2,15 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { CommonResourceService } from "../../common/api/common-resource-service";
-import { CollectionResource } from "../../models/collection";
+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 { FilterBuilder } from "../../common/api/filter-builder";
-import { CollectionFile, createCollectionFile } from "../../models/collection-file";
+import { FilterBuilder } from "~/common/api/filter-builder";
+import { CollectionFile, createCollectionFile } from "~/models/collection-file";
 import { parseKeepManifestText, stringifyKeepManifest } from "../collection-files-service/collection-manifest-parser";
 import * as _ from "lodash";
-import { KeepManifestStream } from "../../models/keep-manifest";
+import { KeepManifestStream } from "~/models/keep-manifest";
 
 export type UploadProgress = (fileId: number, loaded: number, total: number, currentTime: number) => void;
 
index 0d9a75eb483053ddfc2858124302f958577a9de5..fc6cbdcfc24ee8a2983adab173a477e8c82398b2 100644 (file)
@@ -2,14 +2,14 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { LinkResource } from "../../models/link";
+import { LinkResource } from "~/models/link";
 import { GroupContentsResource, GroupContentsResourcePrefix } from "../groups-service/groups-service";
-import { OrderBuilder } from "../../common/api/order-builder";
+import { OrderBuilder } from "~/common/api/order-builder";
 
 export class FavoriteOrderBuilder {
 
     static create(
-        linkOrder = OrderBuilder.create<LinkResource>(), 
+        linkOrder = OrderBuilder.create<LinkResource>(),
         contentOrder = OrderBuilder.create<GroupContentsResource>()) {
         return new FavoriteOrderBuilder(linkOrder, contentOrder);
     }
@@ -45,4 +45,4 @@ export class FavoriteOrderBuilder {
         return this.contentOrder;
     }
 
-}
\ No newline at end of file
+}
index 3bc959df353e09b4a1bf3e0b3477390c4c74aac0..de59ff8d14e44f76b77d1c6e108947333d0978b7 100644 (file)
@@ -3,11 +3,11 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { LinkService } from "../link-service/link-service";
-import { GroupsService, GroupContentsResource } from "../groups-service/groups-service";
+import { GroupsService } from "../groups-service/groups-service";
 import { FavoriteService } from "./favorite-service";
-import { LinkClass, LinkResource } from "../../models/link";
-import { mockResourceService } from "../../common/api/common-resource-service.test";
-import { FilterBuilder } from "../../common/api/filter-builder";
+import { LinkClass } from "~/models/link";
+import { mockResourceService } from "~/common/api/common-resource-service.test";
+import { FilterBuilder } from "~/common/api/filter-builder";
 
 describe("FavoriteService", () => {
 
index 35dbbaf7ba1151ce5db0618c06142917095c73ad..d948819550f1b812c54c9341f1a6aa04c35eae2b 100644 (file)
@@ -4,11 +4,11 @@
 
 import { LinkService } from "../link-service/link-service";
 import { GroupsService, GroupContentsResource } from "../groups-service/groups-service";
-import { LinkResource, LinkClass } from "../../models/link";
-import { FilterBuilder } from "../../common/api/filter-builder";
-import { ListArguments, ListResults } from "../../common/api/common-resource-service";
+import { LinkResource, LinkClass } from "~/models/link";
+import { FilterBuilder } from "~/common/api/filter-builder";
+import { ListResults } from "~/common/api/common-resource-service";
 import { FavoriteOrderBuilder } from "./favorite-order-builder";
-import { OrderBuilder } from "../../common/api/order-builder";
+import { OrderBuilder } from "~/common/api/order-builder";
 
 export interface FavoriteListArguments {
     limit?: number;
index a0f27a4abbe27f26939e4d5be7c368f580eb9b32..e4c3167550990995ff0c3a3e1504b5383e883afa 100644 (file)
@@ -3,14 +3,14 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as _ from "lodash";
-import { CommonResourceService, ListResults } from "../../common/api/common-resource-service";
-import { FilterBuilder } from "../../common/api/filter-builder";
-import { OrderBuilder } from "../../common/api/order-builder";
+import { CommonResourceService, ListResults } from "~/common/api/common-resource-service";
+import { FilterBuilder } from "~/common/api/filter-builder";
+import { OrderBuilder } from "~/common/api/order-builder";
 import { AxiosInstance } from "axios";
-import { GroupResource } from "../../models/group";
-import { CollectionResource } from "../../models/collection";
-import { ProjectResource } from "../../models/project";
-import { ProcessResource } from "../../models/process";
+import { GroupResource } from "~/models/group";
+import { CollectionResource } from "~/models/collection";
+import { ProjectResource } from "~/models/project";
+import { ProcessResource } from "~/models/process";
 
 export interface ContentsArguments {
     limit?: number;
index 188e45af2ff6635098b01a3d704cb8ae20899c06..fd49823a4730a29b8a1c45e3271de991650d9d09 100644 (file)
@@ -2,9 +2,9 @@
 //\r
 // SPDX-License-Identifier: AGPL-3.0\r
 \r
-import { CommonResourceService } from "../../common/api/common-resource-service";\r
+import { CommonResourceService } from "~/common/api/common-resource-service";\r
 import { AxiosInstance } from "axios";\r
-import { KeepResource } from "../../models/keep";\r
+import { KeepResource } from "~/models/keep";\r
 \r
 export class KeepService extends CommonResourceService<KeepResource> {\r
     constructor(serverApi: AxiosInstance) {\r
index 4c12cd0ba9911f916b772ffcc3e9da925b6f9302..8724904ef2a5eb0d61ed9ba101f82d5eda3bff60 100644 (file)
@@ -2,12 +2,12 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { CommonResourceService } from "../../common/api/common-resource-service";
-import { LinkResource } from "../../models/link";
+import { CommonResourceService } from "~/common/api/common-resource-service";
+import { LinkResource } from "~/models/link";
 import { AxiosInstance } from "axios";
 
 export class LinkService extends CommonResourceService<LinkResource> {
     constructor(serverApi: AxiosInstance) {
         super(serverApi, "links");
     }
-}
\ No newline at end of file
+}
index eb7ea7438dd54776778515b6d51e2c463f1e8339..688a476b47c620ca4e04a75414b6d3221bbf7ab7 100644 (file)
@@ -4,8 +4,7 @@
 
 import axios from "axios";
 import { ProjectService } from "./project-service";
-import { FilterBuilder } from "../../common/api/filter-builder";
-import { ProjectResource } from "../../models/project";
+import { FilterBuilder } from "~/common/api/filter-builder";
 
 describe("CommonResourceService", () => {
     const axiosInstance = axios.create();
@@ -20,7 +19,6 @@ describe("CommonResourceService", () => {
         });
     });
 
-
     it("#list has groupClass filter set by default", async () => {
         axiosInstance.get = jest.fn(() => Promise.resolve({ data: {} }));
         const projectService = new ProjectService(axiosInstance);
@@ -34,5 +32,4 @@ describe("CommonResourceService", () => {
             }
         });
     });
-
 });
index 13c60ad3140168b499243f50a36c73c3681e7367..3ffaa35f8c9145fb6337f04c7bfb0ec868bd2f1f 100644 (file)
@@ -2,11 +2,11 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { GroupsService, ContentsArguments } from "../groups-service/groups-service";
-import { ProjectResource } from "../../models/project";
-import { GroupClass } from "../../models/group";
-import { ListArguments } from "../../common/api/common-resource-service";
-import { FilterBuilder } from "../../common/api/filter-builder";
+import { GroupsService } from "../groups-service/groups-service";
+import { ProjectResource } from "~/models/project";
+import { GroupClass } from "~/models/group";
+import { ListArguments } from "~/common/api/common-resource-service";
+import { FilterBuilder } from "~/common/api/filter-builder";
 
 export class ProjectService extends GroupsService<ProjectResource> {
 
index e77b5d3aa89b18a5fa8d4e1f3b2de2826f93f523..427148b41663753fdff62b0a1dd90a54b77b6934 100644 (file)
@@ -2,15 +2,14 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
+import Axios, { AxiosInstance } from "axios";
 import { AuthService } from "./auth-service/auth-service";
 import { GroupsService } from "./groups-service/groups-service";
 import { ProjectService } from "./project-service/project-service";
 import { LinkService } from "./link-service/link-service";
 import { FavoriteService } from "./favorite-service/favorite-service";
-import { AxiosInstance } from "axios";
 import { CollectionService } from "./collection-service/collection-service";
 import { TagService } from "./tag-service/tag-service";
-import Axios from "axios";
 import { CollectionFilesService } from "./collection-files-service/collection-files-service";
 import { KeepService } from "./keep-service/keep-service";
 
index 084603eb0833a9f64211598acc899e2d96a95288..78fdceed0443cc87df088e9c8883ccb36759ecb0 100644 (file)
@@ -3,10 +3,10 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { LinkService } from "../link-service/link-service";
-import { LinkClass } from "../../models/link";
-import { FilterBuilder } from "../../common/api/filter-builder";
-import { TagTailType, TagResource } from "../../models/tag";
-import { OrderBuilder } from "../../common/api/order-builder";
+import { LinkClass } from "~/models/link";
+import { FilterBuilder } from "~/common/api/filter-builder";
+import { TagTailType, TagResource } from "~/models/tag";
+import { OrderBuilder } from "~/common/api/order-builder";
 
 export class TagService {
 
@@ -41,5 +41,4 @@ export class TagService {
                 return results.items.map((tag => tag as TagResource ));
             });
     }
-
 }
index 6b81c31796a41dce91cce146f560978cd5510d56..9f429f0537034a2fc34c7a582b52e62378aafccf 100644 (file)
@@ -4,9 +4,9 @@
 
 import { ofType, default as unionize, UnionOf } from "unionize";
 import { Dispatch } from "redux";
-import { User } from "../../models/user";
+import { User } from "~/models/user";
 import { RootState } from "../store";
-import { ServiceRepository } from "../../services/services";
+import { ServiceRepository } from "~/services/services";
 import { AxiosInstance } from "axios";
 
 export const authActions = unionize({
index 1ded88ead6361fc28e5252ca92a5430a46219ee5..dd928e0a27a152c75b7a245c6cebcbdcba3cb3d6 100644 (file)
@@ -11,10 +11,10 @@ import {
     USER_LAST_NAME_KEY,
     USER_OWNER_UUID_KEY,
     USER_UUID_KEY
-} from "../../services/auth-service/auth-service";
+} from "~/services/auth-service/auth-service";
 
 import 'jest-localstorage-mock';
-import { createServices } from "../../services/services";
+import { createServices } from "~/services/services";
 import { configureStore, RootStore } from "../store";
 import createBrowserHistory from "history/createBrowserHistory";
 
index 0e05263d4301a7b3d94f0408670da9a9cc019fd5..bc9d34ee0ae5dde439e3332837867037669a96ba 100644 (file)
@@ -6,7 +6,7 @@ import { authReducer, AuthState } from "./auth-reducer";
 import { AuthAction, authActions } from "./auth-action";
 
 import 'jest-localstorage-mock';
-import { createServices } from "../../services/services";
+import { createServices } from "~/services/services";
 
 describe('auth-reducer', () => {
     let reducer: (state: AuthState | undefined, action: AuthAction) => any;
index 1546212b08fe846834bb84d61cf098dedf2c40c3..a4195322c867316ce201f8d03ea4c28bffd25825 100644 (file)
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { authActions, AuthAction } from "./auth-action";
-import { User } from "../../models/user";
-import { ServiceRepository } from "../../services/services";
+import { User } from "~/models/user";
+import { ServiceRepository } from "~/services/services";
 
 export interface AuthState {
     user?: User;
index f2774f6fb384f2d72256e57a93bd9cda92d71493..0772210c8497fae4655a7cc7a004fb8e4d3067b2 100644 (file)
@@ -4,13 +4,13 @@
 
 import { unionize, ofType, UnionOf } from "unionize";
 import { Dispatch } from "redux";
-import { ResourceKind } from "../../models/resource";
-import { CollectionResource } from "../../models/collection";
+import { ResourceKind } from "~/models/resource";
+import { CollectionResource } from "~/models/collection";
 import { collectionPanelFilesAction } from "./collection-panel-files/collection-panel-files-actions";
-import { createTree } from "../../models/tree";
+import { createTree } from "~/models/tree";
 import { RootState } from "../store";
-import { ServiceRepository } from "../../services/services";
-import { TagResource, TagProperty } from "../../models/tag";
+import { ServiceRepository } from "~/services/services";
+import { TagResource, TagProperty } from "~/models/tag";
 import { snackbarActions } from "../snackbar/snackbar-actions";
 
 export const collectionPanelActions = unionize({
@@ -43,7 +43,7 @@ export const loadCollection = (uuid: string, kind: ResourceKind) =>
             });
     };
 
-export const loadCollectionTags = (uuid: string) => 
+export const loadCollectionTags = (uuid: string) =>
     (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         dispatch(collectionPanelActions.LOAD_COLLECTION_TAGS({ uuid }));
         return services.tagService
@@ -54,7 +54,7 @@ export const loadCollectionTags = (uuid: string) =>
     };
 
 
-export const createCollectionTag = (data: TagProperty) => 
+export const createCollectionTag = (data: TagProperty) =>
     (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         dispatch(collectionPanelActions.CREATE_COLLECTION_TAG({ data }));
         const item = getState().collectionPanel.item;
@@ -70,7 +70,7 @@ export const createCollectionTag = (data: TagProperty) =>
             });
     };
 
-export const deleteCollectionTag = (uuid: string) => 
+export const deleteCollectionTag = (uuid: string) =>
     (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         dispatch(collectionPanelActions.DELETE_COLLECTION_TAG({ uuid }));
         return services.linkService
@@ -82,4 +82,4 @@ export const deleteCollectionTag = (uuid: string) =>
                     hideDuration: 2000
                 }));
             });
-    };
\ No newline at end of file
+    };
index 463d49c5ef9de106349e7bd22135fe2fb5aa8882..09821083ee4c5bda6fce5f6bb6faf1524dad6eb4 100644 (file)
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { default as unionize, ofType, UnionOf } from "unionize";
-import { CollectionFilesTree } from "../../../models/collection-file";
+import { CollectionFilesTree } from "~/models/collection-file";
 
 export const collectionPanelFilesAction = unionize({
     SET_COLLECTION_FILES: ofType<CollectionFilesTree>(),
@@ -13,4 +13,4 @@ export const collectionPanelFilesAction = unionize({
     UNSELECT_ALL_COLLECTION_FILES: ofType<{}>(),
 }, { tag: 'type', value: 'payload' });
 
-export type CollectionPanelFilesAction = UnionOf<typeof collectionPanelFilesAction>;
\ No newline at end of file
+export type CollectionPanelFilesAction = UnionOf<typeof collectionPanelFilesAction>;
index 94b71ffb249d729751b9b8e9486d9ce19ca75b8f..90dedaaaa4798dedf2d84e66a29c1fe6b75033ad 100644 (file)
@@ -4,8 +4,8 @@
 
 import { collectionPanelFilesReducer } from "./collection-panel-files-reducer";
 import { collectionPanelFilesAction } from "./collection-panel-files-actions";
-import { CollectionFile, CollectionDirectory, createCollectionFile, createCollectionDirectory } from "../../../models/collection-file";
-import { createTree, setNode, getNodeValue, mapTreeValues, Tree } from "../../../models/tree";
+import { CollectionFile, CollectionDirectory, createCollectionFile, createCollectionDirectory } from "~/models/collection-file";
+import { createTree, setNode, getNodeValue, mapTreeValues } from "~/models/tree";
 import { CollectionPanelFile, CollectionPanelDirectory } from "./collection-panel-files-state";
 
 describe('CollectionPanelFilesReducer', () => {
index ca518f0ea52e018f697eefe78de5b65937adb7e9..2a3aac744737691bbf6c2a472f002eca0ff363db 100644 (file)
@@ -4,8 +4,8 @@
 
 import { CollectionPanelFilesState, CollectionPanelFile, CollectionPanelDirectory, mapCollectionFileToCollectionPanelFile } from "./collection-panel-files-state";
 import { CollectionPanelFilesAction, collectionPanelFilesAction } from "./collection-panel-files-actions";
-import { createTree, mapTreeValues, getNode, setNode, getNodeAncestors, getNodeDescendants, setNodeValueWith, mapTree } from "../../../models/tree";
-import { CollectionFileType } from "../../../models/collection-file";
+import { createTree, mapTreeValues, getNode, setNode, getNodeAncestors, getNodeDescendants, setNodeValueWith, mapTree } from "~/models/tree";
+import { CollectionFileType } from "~/models/collection-file";
 
 export const collectionPanelFilesReducer = (state: CollectionPanelFilesState = createTree(), action: CollectionPanelFilesAction) => {
     return collectionPanelFilesAction.match(action, {
index d6f2fa4a98db7d340081c450a7a4c9e05be06bb0..f7955eb6d0fe8a544003095dce3de8bd4988fc63 100644 (file)
@@ -2,8 +2,8 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { CollectionFile, CollectionDirectory, CollectionFileType } from '../../../models/collection-file';
-import { Tree, TreeNode } from '../../../models/tree';
+import { CollectionFile, CollectionDirectory, CollectionFileType } from '~/models/collection-file';
+import { Tree, TreeNode } from '~/models/tree';
 
 export type CollectionPanelFilesState = Tree<CollectionPanelDirectory | CollectionPanelFile>;
 
@@ -23,4 +23,4 @@ export const mapCollectionFileToCollectionPanelFile = (node: TreeNode<Collection
             ? { ...node.value, selected: false, collapsed: true }
             : { ...node.value, selected: false }
     };
-};
\ No newline at end of file
+};
index 44b778980bafa68eade5afb259880b5a7e7bf1e2..2c3edf1a5afce13ec9059f523f042df3eef9751a 100644 (file)
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { collectionPanelActions, CollectionPanelAction } from "./collection-panel-action";
-import { CollectionResource } from "../../models/collection";
-import { TagResource } from "../../models/tag";
+import { CollectionResource } from "~/models/collection";
+import { TagResource } from "~/models/tag";
 
 export interface CollectionPanelState {
     item: CollectionResource | null;
index d0a66b4cc0f629cf60dc935beee2cf3c42aadfbd..323ba8d8e86a844a9dca026772a9058593687aba 100644 (file)
@@ -6,8 +6,8 @@ import { default as unionize, ofType, UnionOf } from "unionize";
 import { Dispatch } from "redux";
 
 import { RootState } from "../../store";
-import { CollectionResource } from '../../../models/collection';
-import { ServiceRepository } from "../../../services/services";
+import { CollectionResource } from '~/models/collection';
+import { ServiceRepository } from "~/services/services";
 import { collectionUploaderActions } from "../uploader/collection-uploader-actions";
 import { reset } from "redux-form";
 
index bb9f4d3072d47bdd7fda30ac5784aeaa4e259b40..25b2f37ac1f72ecaca4172a8a173553841253abe 100644 (file)
@@ -6,8 +6,8 @@ import { default as unionize, ofType, UnionOf } from "unionize";
 import { Dispatch } from "redux";
 
 import { RootState } from "../../store";
-import { ServiceRepository } from "../../../services/services";
-import { CollectionResource } from '../../../models/collection';
+import { ServiceRepository } from "~/services/services";
+import { CollectionResource } from '~/models/collection';
 import { initialize } from 'redux-form';
 import { collectionPanelActions } from "../../collection-panel/collection-panel-action";
 import { ContextMenuResource } from "../../context-menu/context-menu-reducer";
index 6dd7af92856a909b968fa328e0b9011df457a073..abb293fdcf2dd062cfdd0ffb20b6f6ed1ad5a0c0 100644 (file)
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { default as unionize, ofType, UnionOf } from "unionize";
-import { DataTableFilterItem } from "../../components/data-table-filters/data-table-filters";
-import { DataColumns } from "../../components/data-table/data-table";
+import { DataTableFilterItem } from "~/components/data-table-filters/data-table-filters";
+import { DataColumns } from "~/components/data-table/data-table";
 
 export const dataExplorerActions = unionize({
     RESET_PAGINATION: ofType<{ id: string }>(),
index 6b8297b0c8c3bb84afc55a4fe16e5e2772db9a06..d93ccbf446200a1eaafec7bf2304cde82cd625de 100644 (file)
@@ -5,12 +5,12 @@
 import { DataExplorerMiddlewareService } from "./data-explorer-middleware-service";
 import { dataExplorerMiddleware } from "./data-explorer-middleware";
 import { MiddlewareAPI } from "redux";
-import { DataColumns } from "../../components/data-table/data-table";
+import { DataColumns } from "~/components/data-table/data-table";
 import { dataExplorerActions } from "./data-explorer-action";
 
 
 describe("DataExplorerMiddleware", () => {
-    
+
     it("handles only actions that are identified by service id", () => {
         const config = {
             id: "ServiceId",
index c54a86af4aa6a44559d5b7f41624ac483ea6cd2b..6b1c90798962032ddc273005b1f1b0c7d41de123 100644 (file)
@@ -13,7 +13,8 @@ describe('data-explorer-reducer', () => {
         const columns: DataColumns<any> = [{
             name: "Column 1",
             render: jest.fn(),
-            selected: true
+            selected: true,
+            configurable: true
         }];
         const state = dataExplorerReducer(undefined,
             dataExplorerActions.SET_COLUMNS({ id: "Data explorer", columns }));
@@ -25,11 +26,13 @@ describe('data-explorer-reducer', () => {
             name: "Column 1",
             render: jest.fn(),
             selected: true,
+            configurable: true,
             sortDirection: SortDirection.ASC
         }, {
             name: "Column 2",
             render: jest.fn(),
             selected: true,
+            configurable: true,
             sortDirection: SortDirection.NONE,
         }];
         const state = dataExplorerReducer({ "Data explorer": { ...initialDataExplorer, columns } },
@@ -43,6 +46,7 @@ describe('data-explorer-reducer', () => {
             name: "Column 1",
             render: jest.fn(),
             selected: true,
+            configurable: true
         }];
 
         const filters: DataTableFilterItem[] = [{
@@ -55,7 +59,7 @@ describe('data-explorer-reducer', () => {
     });
 
     it('should set items', () => {
-        const state = dataExplorerReducer({ "Data explorer": undefined },
+        const state = dataExplorerReducer({},
             dataExplorerActions.SET_ITEMS({
                 id: "Data explorer",
                 items: ["Item 1", "Item 2"],
@@ -67,13 +71,13 @@ describe('data-explorer-reducer', () => {
     });
 
     it('should set page', () => {
-        const state = dataExplorerReducer({ "Data explorer": undefined },
+        const state = dataExplorerReducer({},
             dataExplorerActions.SET_PAGE({ id: "Data explorer", page: 2 }));
         expect(state["Data explorer"].page).toEqual(2);
     });
 
     it('should set rows per page', () => {
-        const state = dataExplorerReducer({ "Data explorer": undefined },
+        const state = dataExplorerReducer({},
             dataExplorerActions.SET_ROWS_PER_PAGE({ id: "Data explorer", rowsPerPage: 5 }));
         expect(state["Data explorer"].rowsPerPage).toEqual(5);
     });
index 1fde652d07b3941bfa9b02207352101a72a4ba4a..175cd0b2817fd0ea419f8474f1326bb16bd2dc20 100644 (file)
@@ -2,10 +2,10 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { DataColumn, toggleSortDirection, resetSortDirection } from "../../components/data-table/data-column";
+import { DataColumn, toggleSortDirection, resetSortDirection } from "~/components/data-table/data-column";
 import { dataExplorerActions, DataExplorerAction } from "./data-explorer-action";
-import { DataTableFilterItem } from "../../components/data-table-filters/data-table-filters";
-import { DataColumns } from "../../components/data-table/data-table";
+import { DataTableFilterItem } from "~/components/data-table-filters/data-table-filters";
+import { DataColumns } from "~/components/data-table/data-table";
 
 export interface DataExplorer {
     columns: DataColumns<any>;
index c4acf5aa9b3710fac0a3f61a905132651f8709da..cadf517ac2376f50f9b643ac0cc5f0519371caa4 100644 (file)
@@ -4,9 +4,9 @@
 
 import { unionize, ofType, UnionOf } from "unionize";
 import { Dispatch } from "redux";
-import { Resource, ResourceKind } from "../../models/resource";
+import { Resource, ResourceKind } from "~/models/resource";
 import { RootState } from "../store";
-import { ServiceRepository } from "../../services/services";
+import { ServiceRepository } from "~/services/services";
 
 export const detailsPanelActions = unionize({
     TOGGLE_DETAILS_PANEL: ofType<{}>(),
index 97de4a9a50b041b9583a2afa4231e446e1d3008b..adc31e4bd6f60f55eff6e6f45ea6cae0ac6b275f 100644 (file)
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { detailsPanelActions, DetailsPanelAction } from "./details-panel-action";
-import { Resource } from "../../models/resource";
+import { Resource } from "~/models/resource";
 
 export interface DetailsPanelState {
     item: Resource | null;
index be4b645cdea2424fdb522a6efa9fef6afc6d495e..653184104cd0f3383a9f8252ff8bba75636f7769 100644 (file)
@@ -3,15 +3,14 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { DataExplorerMiddlewareService } from "../data-explorer/data-explorer-middleware-service";
-import { FavoritePanelFilter, FavoritePanelColumnNames } from "../../views/favorite-panel/favorite-panel";
+import { FavoritePanelFilter, FavoritePanelColumnNames } from "~/views/favorite-panel/favorite-panel";
 import { RootState } from "../store";
-import { DataColumns } from "../../components/data-table/data-table";
-import { FavoritePanelItem, resourceToDataItem } from "../../views/favorite-panel/favorite-panel-item";
-import { FavoriteOrderBuilder } from "../../services/favorite-service/favorite-order-builder";
-import { ServiceRepository } from "../../services/services";
-import { SortDirection } from "../../components/data-table/data-column";
-import { FilterBuilder } from "../../common/api/filter-builder";
-import { LinkResource } from "../../models/link";
+import { DataColumns } from "~/components/data-table/data-table";
+import { FavoritePanelItem, resourceToDataItem } from "~/views/favorite-panel/favorite-panel-item";
+import { FavoriteOrderBuilder } from "~/services/favorite-service/favorite-order-builder";
+import { ServiceRepository } from "~/services/services";
+import { SortDirection } from "~/components/data-table/data-column";
+import { FilterBuilder } from "~/common/api/filter-builder";
 import { checkPresenceInFavorites } from "../favorites/favorites-actions";
 import { favoritePanelActions } from "./favorite-panel-action";
 import { Dispatch, MiddlewareAPI } from "redux";
index 38229dff8390424fd26686da2158d6f59b22ceea..9e1b3ef1c20a3d27fdd1f46be629cfed77f85f37 100644 (file)
@@ -7,7 +7,7 @@ import { Dispatch } from "redux";
 import { RootState } from "../store";
 import { checkFavorite } from "./favorites-reducer";
 import { snackbarActions } from "../snackbar/snackbar-actions";
-import { ServiceRepository } from "../../services/services";
+import { ServiceRepository } from "~/services/services";
 
 export const favoritesActions = unionize({
     TOGGLE_FAVORITE: ofType<{ resourceUuid: string }>(),
index dc680215c1cf680db7264e54c73292f02aae7aff..79d24471491fcd5e2ced64a8bdcd8edb6b38bd87 100644 (file)
@@ -5,18 +5,18 @@
 import { Dispatch } from "redux";
 import { projectActions, getProjectList } from "../project/project-action";
 import { push } from "react-router-redux";
-import { TreeItemStatus } from "../../components/tree/tree";
+import { TreeItemStatus } from "~/components/tree/tree";
 import { findTreeItem } from "../project/project-reducer";
 import { RootState } from "../store";
-import { Resource, ResourceKind } from "../../models/resource";
+import { Resource, ResourceKind } from "~/models/resource";
 import { projectPanelActions } from "../project-panel/project-panel-action";
-import { getCollectionUrl } from "../../models/collection";
-import { getProjectUrl, ProjectResource } from "../../models/project";
-import { ProjectService } from "../../services/project-service/project-service";
-import { ServiceRepository } from "../../services/services";
+import { getCollectionUrl } from "~/models/collection";
+import { getProjectUrl, ProjectResource } from "~/models/project";
+import { ProjectService } from "~/services/project-service/project-service";
+import { ServiceRepository } from "~/services/services";
 import { sidePanelActions } from "../side-panel/side-panel-action";
 import { SidePanelIdentifiers } from "../side-panel/side-panel-reducer";
-import { getUuidObjectType, ObjectTypes } from "../../models/object-types";
+import { getUuidObjectType, ObjectTypes } from "~/models/object-types";
 
 export const getResourceUrl = <T extends Resource>(resource: T): string => {
     switch (resource.kind) {
@@ -59,7 +59,6 @@ export const setProjectItem = (itemId: string, itemMode: ItemMode) =>
                     dispatch(projectPanelActions.RESET_PAGINATION());
                     dispatch(projectPanelActions.REQUEST_ITEMS());
                 }));
-
         } else {
             const uuid = services.authService.getUuid();
             if (itemId === uuid) {
index fd893a3c98c669eb499db444da0ecd3fb35af776..cc5207b8d1b2af4b6bf6d8ebc02ad01ccb669e37 100644 (file)
@@ -3,16 +3,15 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { DataExplorerMiddlewareService } from "../data-explorer/data-explorer-middleware-service";
-import { ProjectPanelColumnNames, ProjectPanelFilter } from "../../views/project-panel/project-panel";
+import { ProjectPanelColumnNames, ProjectPanelFilter } from "~/views/project-panel/project-panel";
 import { RootState } from "../store";
-import { DataColumns } from "../../components/data-table/data-table";
-import { ServiceRepository } from "../../services/services";
-import { ProjectPanelItem, resourceToDataItem } from "../../views/project-panel/project-panel-item";
-import { SortDirection } from "../../components/data-table/data-column";
-import { OrderBuilder } from "../../common/api/order-builder";
-import { FilterBuilder } from "../../common/api/filter-builder";
-import { ProcessResource } from "../../models/process";
-import { GroupContentsResourcePrefix, GroupContentsResource } from "../../services/groups-service/groups-service";
+import { DataColumns } from "~/components/data-table/data-table";
+import { ServiceRepository } from "~/services/services";
+import { ProjectPanelItem, resourceToDataItem } from "~/views/project-panel/project-panel-item";
+import { SortDirection } from "~/components/data-table/data-column";
+import { OrderBuilder } from "~/common/api/order-builder";
+import { FilterBuilder } from "~/common/api/filter-builder";
+import { GroupContentsResourcePrefix, GroupContentsResource } from "~/services/groups-service/groups-service";
 import { checkPresenceInFavorites } from "../favorites/favorites-actions";
 import { projectPanelActions } from "./project-panel-action";
 import { Dispatch, MiddlewareAPI } from "redux";
index 9777dc73641101970f9c99f3b6d8fa997bd4901c..bef50d1197f44939f9e547c577bb0e2f797e6647 100644 (file)
@@ -3,12 +3,12 @@
 // SPDX-License-Identifier: AGPL-3.0
 import { default as unionize, ofType, UnionOf } from "unionize";
 
-import { ProjectResource } from "../../models/project";
+import { ProjectResource } from "~/models/project";
 import { Dispatch } from "redux";
-import { FilterBuilder } from "../../common/api/filter-builder";
+import { FilterBuilder } from "~/common/api/filter-builder";
 import { RootState } from "../store";
 import { checkPresenceInFavorites } from "../favorites/favorites-actions";
-import { ServiceRepository } from "../../services/services";
+import { ServiceRepository } from "~/services/services";
 
 export const projectActions = unionize({
     OPEN_PROJECT_CREATOR: ofType<{ ownerUuid: string }>(),
index 92274b3d281efba4886f8aff65687e4d6625e426..cd96afce4a83241a60145d902188c955a800e191 100644 (file)
@@ -4,8 +4,8 @@
 
 import { projectsReducer, getTreePath } from "./project-reducer";
 import { projectActions } from "./project-action";
-import { TreeItem, TreeItemStatus } from "../../components/tree/tree";
-import { mockProjectResource } from "../../models/test-utils";
+import { TreeItem, TreeItemStatus } from "~/components/tree/tree";
+import { mockProjectResource } from "~/models/test-utils";
 
 describe('project-reducer', () => {
 
index f5af23ab3a3f6e5501bcd115ab0bf994b79ab0e1..424900780d9e40030dccd5d1584e530a35f4de58 100644 (file)
@@ -5,8 +5,8 @@
 import * as _ from "lodash";
 
 import { projectActions, ProjectAction } from "./project-action";
-import { TreeItem, TreeItemStatus } from "../../components/tree/tree";
-import { ProjectResource } from "../../models/project";
+import { TreeItem, TreeItemStatus } from "~/components/tree/tree";
+import { ProjectResource } from "~/models/project";
 
 export type ProjectState = {
     items: Array<TreeItem<ProjectResource>>,
index e517fc8509d4175859b6ed3381baf7868442c67d..4872a72cf750486565eeaee5f8a36b94f4dc9233 100644 (file)
@@ -4,7 +4,7 @@
 
 import { sidePanelReducer } from "./side-panel-reducer";
 import { sidePanelActions } from "./side-panel-action";
-import { ProjectsIcon } from "../../components/icon/icon";
+import { ProjectsIcon } from "~/components/icon/icon";
 
 describe('side-panel-reducer', () => {
 
index 7a27e5adbfd4ba9f845fd9f30b71de558afc44b5..8c73a8f596b6c9a96d0359dd804e7838ce307827 100644 (file)
@@ -4,8 +4,8 @@
 
 import * as _ from "lodash";
 import { sidePanelActions, SidePanelAction } from './side-panel-action';
-import { SidePanelItem } from '../../components/side-panel/side-panel';
-import { ProjectsIcon, ShareMeIcon, WorkflowIcon, RecentIcon, FavoriteIcon, TrashIcon } from "../../components/icon/icon";
+import { SidePanelItem } from '~/components/side-panel/side-panel';
+import { ProjectsIcon, ShareMeIcon, WorkflowIcon, RecentIcon, FavoriteIcon, TrashIcon } from "~/components/icon/icon";
 import { Dispatch } from "redux";
 import { push } from "react-router-redux";
 import { favoritePanelActions } from "../favorite-panel/favorite-panel-action";
index 0002a6d2fa00c7956fc83c8cf367c35d3649bca4..a4bf9d6e3b9692d00e92bfcdc59ec93fa66c89bb 100644 (file)
@@ -26,7 +26,7 @@ import { FavoritePanelMiddlewareService } from "./favorite-panel/favorite-panel-
 import { CollectionPanelState, collectionPanelReducer } from './collection-panel/collection-panel-reducer';
 import { DialogState, dialogReducer } from './dialog/dialog-reducer';
 import { CollectionsState, collectionsReducer } from './collections/collections-reducer';
-import { ServiceRepository } from "../services/services";
+import { ServiceRepository } from "~/services/services";
 import { treePickerReducer } from './tree-picker/tree-picker-reducer';
 import { TreePicker } from './tree-picker/tree-picker';
 
index 772d89dfed334651b7ab5fa2101092dab526c6eb..e3bebe1c858f6e9a6ef7017de35b6162e72a745d 100644 (file)
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { default as unionize, ofType, UnionOf } from "unionize";
-import { TreeNode } from "../../models/tree";
 import { TreePickerNode } from "./tree-picker";
 
 export const treePickerActions = unionize({
index ac4de0c015984078a261680ca122bfb0c8783ba6..3248cb2efba7f06af804c0b4f6a169de02170a67 100644 (file)
@@ -2,12 +2,11 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { createTree, getNodeValue, getNodeChildren } from "../../models/tree";
+import { createTree, getNodeValue, getNodeChildren } from "~/models/tree";
 import { TreePickerNode, createTreePickerNode } from "./tree-picker";
 import { treePickerReducer } from "./tree-picker-reducer";
 import { treePickerActions } from "./tree-picker-actions";
-import { TreeItemStatus } from "../../components/tree/tree";
-
+import { TreeItemStatus } from "~/components/tree/tree";
 
 describe('TreePickerReducer', () => {
     it('LOAD_TREE_PICKER_NODE - initial state', () => {
index d195a98a6836b3f861768b703494e4c7ec5a783b..8d61714cc9f744929587dd7f96f613ba18120f67 100644 (file)
@@ -2,11 +2,10 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { createTree, setNodeValueWith, TreeNode, setNode, mapTree, mapTreeValues } from "../../models/tree";
+import { createTree, setNodeValueWith, TreeNode, setNode, mapTreeValues } from "~/models/tree";
 import { TreePicker, TreePickerNode } from "./tree-picker";
 import { treePickerActions, TreePickerAction } from "./tree-picker-actions";
-import { TreeItemStatus } from "../../components/tree/tree";
-
+import { TreeItemStatus } from "~/components/tree/tree";
 
 export const treePickerReducer = (state: TreePicker = createTree(), action: TreePickerAction) =>
     treePickerActions.match(action, {
@@ -50,4 +49,4 @@ const createTreeNode = (parent: string) => (node: TreePickerNode): TreeNode<Tree
     id: node.id,
     parent,
     value: node
-});
\ No newline at end of file
+});
index ee45beccd5451b11621dd136ad41ec183a23b6fa..e19ce3a7a48c0d162c1fb462c00ddb26d8b30c57 100644 (file)
@@ -2,8 +2,8 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { Tree } from "../../models/tree";
-import { TreeItemStatus } from "../../components/tree/tree";
+import { Tree } from "~/models/tree";
+import { TreeItemStatus } from "~/components/tree/tree";
 
 export type TreePicker = Tree<TreePickerNode>;
 
@@ -20,4 +20,4 @@ export const createTreePickerNode = (data: {id: string, value: any}) => ({
     selected: false,
     collapsed: true,
     status: TreeItemStatus.INITIAL
-});
\ No newline at end of file
+});
index 0ae41c657e34b925acb909084b848b9bb4cce31c..3dc6d1a1acf51370c3c7b9c169745dd98ae184d8 100644 (file)
@@ -5,10 +5,10 @@
 import { Redirect, RouteProps } from "react-router";
 import * as React from "react";
 import { connect, DispatchProp } from "react-redux";
-import { getUserDetails, saveApiToken } from "../../store/auth/auth-action";
-import { getProjectList } from "../../store/project/project-action";
-import { getUrlParameter } from "../../common/url";
-import { AuthService } from "../../services/auth-service/auth-service";
+import { getUserDetails, saveApiToken } from "~/store/auth/auth-action";
+import { getProjectList } from "~/store/project/project-action";
+import { getUrlParameter } from "~/common/url";
+import { AuthService } from "~/services/auth-service/auth-service";
 
 interface ApiTokenProps {
     authService: AuthService;
index 0009fc0d54f760bc9b171aa9eadcc1a0ca4046f9..ae9b53e33034355dcafd0f48013f9ad761c78656 100644 (file)
@@ -3,17 +3,17 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { connect } from "react-redux";
-import { CollectionPanelFiles as Component, CollectionPanelFilesProps } from "../../components/collection-panel-files/collection-panel-files";
-import { RootState } from "../../store/store";
-import { TreeItemStatus, TreeItem } from "../../components/tree/tree";
-import { CollectionPanelFilesState, CollectionPanelDirectory, CollectionPanelFile } from "../../store/collection-panel/collection-panel-files/collection-panel-files-state";
-import { FileTreeData } from "../../components/file-tree/file-tree-data";
+import { CollectionPanelFiles as Component, CollectionPanelFilesProps } from "~/components/collection-panel-files/collection-panel-files";
+import { RootState } from "~/store/store";
+import { TreeItemStatus, TreeItem } from "~/components/tree/tree";
+import { CollectionPanelFilesState, CollectionPanelDirectory, CollectionPanelFile } from "~/store/collection-panel/collection-panel-files/collection-panel-files-state";
+import { FileTreeData } from "~/components/file-tree/file-tree-data";
 import { Dispatch } from "redux";
-import { collectionPanelFilesAction } from "../../store/collection-panel/collection-panel-files/collection-panel-files-actions";
-import { contextMenuActions } from "../../store/context-menu/context-menu-actions";
+import { collectionPanelFilesAction } from "~/store/collection-panel/collection-panel-files/collection-panel-files-actions";
+import { contextMenuActions } from "~/store/context-menu/context-menu-actions";
 import { ContextMenuKind } from "../context-menu/context-menu";
-import { Tree, getNodeChildren, getNode } from "../../models/tree";
-import { CollectionFileType } from "../../models/collection-file";
+import { Tree, getNodeChildren, getNode } from "~/models/tree";
+import { CollectionFileType } from "~/models/collection-file";
 
 const memoizedMapStateToProps = () => {
     let prevState: CollectionPanelFilesState;
index 10da9ef183448299f8a695f175be28fe1d4c4687..4561f9d308879b981c8a9a72dc32c29dc701ddcc 100644 (file)
@@ -4,10 +4,10 @@
 
 import { ContextMenuActionSet } from "../context-menu-action-set";
 import { ToggleFavoriteAction } from "../actions/favorite-action";
-import { toggleFavorite } from "../../../store/favorites/favorites-actions";
-import { RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon, ProvenanceGraphIcon, AdvancedIcon, RemoveIcon } from "../../../components/icon/icon";
-import { openUpdater } from "../../../store/collections/updater/collection-updater-action";
-import { favoritePanelActions } from "../../../store/favorite-panel/favorite-panel-action";
+import { toggleFavorite } from "~/store/favorites/favorites-actions";
+import { RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon, ProvenanceGraphIcon, AdvancedIcon, RemoveIcon } from "~/components/icon/icon";
+import { openUpdater } from "~/store/collections/updater/collection-updater-action";
+import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
 
 export const collectionActionSet: ContextMenuActionSet = [[
     {
index 91fa2b00f6d8e3f7e9ca2d4d3bbd1a7ffd933966..0bed68e917739eb875fc4e015c556547659f6dd8 100644 (file)
@@ -3,9 +3,9 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { ContextMenuActionSet } from "../context-menu-action-set";
-import { collectionPanelFilesAction } from "../../../store/collection-panel/collection-panel-files/collection-panel-files-actions";
-import { openMultipleFilesRemoveDialog } from "../../file-remove-dialog/multiple-files-remove-dialog";
-import { createCollectionWithSelected } from "../../create-collection-dialog-with-selected/create-collection-dialog-with-selected";
+import { collectionPanelFilesAction } from "~/store/collection-panel/collection-panel-files/collection-panel-files-actions";
+import { openMultipleFilesRemoveDialog } from "~/views-components/file-remove-dialog/multiple-files-remove-dialog";
+import { createCollectionWithSelected } from "~/views-components/create-collection-dialog-with-selected/create-collection-dialog-with-selected";
 
 
 export const collectionFilesActionSet: ContextMenuActionSet = [[{
index e24108f4d88754fa30e22760e2d993cde0ae6b7f..8728ad31e19702674fb718711855bc959c1000c3 100644 (file)
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { ContextMenuActionSet } from "../context-menu-action-set";
-import { RenameIcon, DownloadIcon, RemoveIcon } from "../../../components/icon/icon";
+import { RenameIcon, DownloadIcon, RemoveIcon } from "~/components/icon/icon";
 import { openRenameFileDialog } from "../../rename-file-dialog/rename-file-dialog";
 import { openFileRemoveDialog } from "../../file-remove-dialog/file-remove-dialog";
 
index e6356bbce093e3493099afaa750581e3f157d52a..7d8364bd70ea22b4c29bb69c5c11b95699f6765b 100644 (file)
@@ -4,10 +4,10 @@
 
 import { ContextMenuActionSet } from "../context-menu-action-set";
 import { ToggleFavoriteAction } from "../actions/favorite-action";
-import { toggleFavorite } from "../../../store/favorites/favorites-actions";
-import { RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon, RemoveIcon } from "../../../components/icon/icon";
-import { openUpdater } from "../../../store/collections/updater/collection-updater-action";
-import { favoritePanelActions } from "../../../store/favorite-panel/favorite-panel-action";
+import { toggleFavorite } from "~/store/favorites/favorites-actions";
+import { RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon, RemoveIcon } from "~/components/icon/icon";
+import { openUpdater } from "~/store/collections/updater/collection-updater-action";
+import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
 
 export const collectionResourceActionSet: ContextMenuActionSet = [[
     {
index 72c72fa9cb0c6f44eecc548399877eedccfb06ce..7942937fb3f42c736e1abc0842ec71c224bd2482 100644 (file)
@@ -4,8 +4,8 @@
 
 import { ContextMenuActionSet } from "../context-menu-action-set";
 import { ToggleFavoriteAction } from "../actions/favorite-action";
-import { toggleFavorite } from "../../../store/favorites/favorites-actions";
-import { favoritePanelActions } from "../../../store/favorite-panel/favorite-panel-action";
+import { toggleFavorite } from "~/store/favorites/favorites-actions";
+import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
 
 export const favoriteActionSet: ContextMenuActionSet = [[{
     component: ToggleFavoriteAction,
index 4e7a60028877f3d2fc0117a2d8a6e77c2f2073b0..89446850a3b8322346d31665db7c98d8235e7528 100644 (file)
@@ -5,11 +5,11 @@
 import { reset } from "redux-form";
 
 import { ContextMenuActionSet } from "../context-menu-action-set";
-import { projectActions } from "../../../store/project/project-action";
-import { NewProjectIcon } from "../../../components/icon/icon";
+import { projectActions } from "~/store/project/project-action";
+import { NewProjectIcon } from "~/components/icon/icon";
 import { ToggleFavoriteAction } from "../actions/favorite-action";
-import { toggleFavorite } from "../../../store/favorites/favorites-actions";
-import { favoritePanelActions } from "../../../store/favorite-panel/favorite-panel-action";
+import { toggleFavorite } from "~/store/favorites/favorites-actions";
+import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
 import { PROJECT_CREATE_DIALOG } from "../../dialog-create/dialog-project-create";
 
 export const projectActionSet: ContextMenuActionSet = [[{
index 9585a865e7405bed40b0725654bf0d9edd4fda69..f7d1c4e9bec62f1facc52495e6e6b6a35e93b800 100644 (file)
@@ -4,7 +4,7 @@
 
 import { ContextMenuActionSet } from "../context-menu-action-set";
 import { ToggleFavoriteAction } from "../actions/favorite-action";
-import { toggleFavorite } from "../../../store/favorites/favorites-actions";
+import { toggleFavorite } from "~/store/favorites/favorites-actions";
 
 export const resourceActionSet: ContextMenuActionSet = [[{
     component: ToggleFavoriteAction,
index c88b1b44bd699097da3eb6b08b4fb0d82c092280..fb380fc4f006201d324d36fadbea8724b3d16111 100644 (file)
@@ -5,7 +5,8 @@
 import { reset } from "redux-form";
 
 import { ContextMenuActionSet } from "../context-menu-action-set";
-import { projectActions } from "../../../store/project/project-action";
+import { projectActions } from "~/store/project/project-action";
+import { NewProjectIcon } from "~/components/icon/icon";
 import { collectionCreateActions } from "../../../store/collections/creator/collection-creator-action";
 import { PROJECT_CREATE_DIALOG } from "../../dialog-create/dialog-project-create";
 import { COLLECTION_CREATE_DIALOG } from "../../dialog-create/dialog-collection-create";
index 55fe8cfdba19efe1c42b088e7ccc87471aaea97f..21f037d9e5451fd3a0267ece7ddc1db6f9e3c8fc 100644 (file)
@@ -4,9 +4,9 @@
 
 import * as React from "react";
 import { ListItemIcon, ListItemText } from "@material-ui/core";
-import { AddFavoriteIcon, RemoveFavoriteIcon } from "../../../components/icon/icon";
+import { AddFavoriteIcon, RemoveFavoriteIcon } from "~/components/icon/icon";
 import { connect } from "react-redux";
-import { RootState } from "../../../store/store";
+import { RootState } from "~/store/store";
 
 const mapStateToProps = (state: RootState) => ({
     isFavorite: state.contextMenu.resource !== undefined && state.favorites[state.contextMenu.resource.uuid] === true
index 089580c2bdd38bdeac44eaa268700de18298c98f..cbcc0b72f201b76190ea4e7384af8d3433512ba6 100644 (file)
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { Dispatch } from "redux";
-import { ContextMenuItem } from "../../components/context-menu/context-menu";
-import { ContextMenuResource } from "../../store/context-menu/context-menu-reducer";
+import { ContextMenuItem } from "~/components/context-menu/context-menu";
+import { ContextMenuResource } from "~/store/context-menu/context-menu-reducer";
 
 export interface ContextMenuAction extends ContextMenuItem {
     execute(dispatch: Dispatch, resource: ContextMenuResource): void;
index 0a629b2e476360a5046d77a422249a377d350374..8036bb572859ee90a11fa94474a328ec69aca07f 100644 (file)
@@ -3,11 +3,11 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { connect } from "react-redux";
-import { RootState } from "../../store/store";
-import { contextMenuActions } from "../../store/context-menu/context-menu-actions";
-import { ContextMenu as ContextMenuComponent, ContextMenuProps, ContextMenuItem } from "../../components/context-menu/context-menu";
-import { createAnchorAt } from "../../components/popover/helpers";
-import { ContextMenuResource } from "../../store/context-menu/context-menu-reducer";
+import { RootState } from "~/store/store";
+import { contextMenuActions } from "~/store/context-menu/context-menu-actions";
+import { ContextMenu as ContextMenuComponent, ContextMenuProps, ContextMenuItem } from "~/components/context-menu/context-menu";
+import { createAnchorAt } from "~/components/popover/helpers";
+import { ContextMenuResource } from "~/store/context-menu/context-menu-reducer";
 import { ContextMenuActionSet, ContextMenuAction } from "./context-menu-action-set";
 import { Dispatch } from "redux";
 
index 8a2efca208c239bfdf14eeb759059b1da8fbd296..46bc724d7704fdaa067640f8a17675774788d4c7 100644 (file)
@@ -4,8 +4,8 @@
 
 import { Dispatch } from "redux";
 import { reduxForm, reset, startSubmit, stopSubmit } from "redux-form";
-import { withDialog } from "../../store/dialog/with-dialog";
-import { dialogActions } from "../../store/dialog/dialog-actions";
+import { withDialog } from "~/store/dialog/with-dialog";
+import { dialogActions } from "~/store/dialog/dialog-actions";
 import { DialogCollectionCreateWithSelected } from "../dialog-create/dialog-collection-create-selected";
 import { loadProjectTreePickerProjects } from "../project-tree-picker/project-tree-picker";
 
index 9bb469aac16f28841ef2df15a36c7c2e040b5620..94eb82f94e8c89b5aaf354c1c11930d4af8679a9 100644 (file)
@@ -6,12 +6,12 @@ import { connect } from "react-redux";
 import { Dispatch } from "redux";
 import { SubmissionError } from "redux-form";
 
-import { RootState } from "../../store/store";
+import { RootState } from "~/store/store";
 import { DialogCollectionCreate } from "../dialog-create/dialog-collection-create";
-import { collectionCreateActions, createCollection } from "../../store/collections/creator/collection-creator-action";
-import { snackbarActions } from "../../store/snackbar/snackbar-actions";
-import { UploadFile } from "../../store/collections/uploader/collection-uploader-actions";
-import { projectPanelActions } from "../../store/project-panel/project-panel-action";
+import { collectionCreateActions, createCollection } from "~/store/collections/creator/collection-creator-action";
+import { snackbarActions } from "~/store/snackbar/snackbar-actions";
+import { UploadFile } from "~/store/collections/uploader/collection-uploader-actions";
+import { projectPanelActions } from "~/store/project-panel/project-panel-action";
 
 const mapStateToProps = (state: RootState) => ({
     open: state.collections.creator.opened
index aa0dc7bc89a49ea3584806556d268435a05e737d..43f56ed8944b660ebd3d3f1544119605d90ec931 100644 (file)
@@ -6,11 +6,11 @@ import { connect } from "react-redux";
 import { Dispatch } from "redux";
 import { SubmissionError } from "redux-form";
 
-import { RootState } from "../../store/store";
+import { RootState } from "~/store/store";
 import { DialogProjectCreate } from "../dialog-create/dialog-project-create";
-import { projectActions, createProject, getProjectList } from "../../store/project/project-action";
-import { projectPanelActions } from "../../store/project-panel/project-panel-action";
-import { snackbarActions } from "../../store/snackbar/snackbar-actions";
+import { projectActions, createProject, getProjectList } from "~/store/project/project-action";
+import { projectPanelActions } from "~/store/project-panel/project-panel-action";
+import { snackbarActions } from "~/store/snackbar/snackbar-actions";
 
 const mapStateToProps = (state: RootState) => ({
     open: state.projects.creator.opened
index fe5f850c77fe75c757977bea6cba7d76453dd833..fca9f05982b6ed559875a7bfeb252e8d4b8f1e5c 100644 (file)
@@ -4,7 +4,7 @@
 
 import * as React from 'react';
 import { Dialog, DialogActions, DialogTitle, DialogContent, WithStyles, withStyles, StyleRulesCallback, Button, Typography, Paper } from '@material-ui/core';
-import { ArvadosTheme } from '../../common/custom-theme';
+import { ArvadosTheme } from '~/common/custom-theme';
 
 type CssRules = 'link' | 'paper' | 'button';
 
@@ -27,7 +27,7 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
 });
 
 interface CurrentTokenDataProps {
-    currentToken?: string; 
+    currentToken?: string;
     open: boolean;
 }
 
@@ -37,9 +37,9 @@ interface CurrentTokenActionProps {
 
 type CurrentTokenProps = CurrentTokenDataProps & CurrentTokenActionProps & WithStyles<CssRules>;
 
-export const CurrentTokenDialog = withStyles(styles)(    
+export const CurrentTokenDialog = withStyles(styles)(
     class extends React.Component<CurrentTokenProps> {
-        
+
         render() {
             const { classes, open, handleClose, currentToken } = this.props;
             return (
@@ -47,7 +47,7 @@ export const CurrentTokenDialog = withStyles(styles)(
                     <DialogTitle>Current Token</DialogTitle>
                     <DialogContent>
                         <Typography variant='body1' paragraph={true}>
-                            The Arvados API token is a secret key that enables the Arvados SDKs to access Arvados with the proper permissions. 
+                            The Arvados API token is a secret key that enables the Arvados SDKs to access Arvados with the proper permissions.
                             <Typography component='p'>
                                 For more information see
                                 <a href='http://doc.arvados.org/user/reference/api-tokens.html' target='blank' className={classes.link}>
@@ -56,13 +56,13 @@ export const CurrentTokenDialog = withStyles(styles)(
                             </Typography>
                         </Typography>
 
-                        <Typography variant='body1' paragraph={true}> 
+                        <Typography variant='body1' paragraph={true}>
                             Paste the following lines at a shell prompt to set up the necessary environment for Arvados SDKs to authenticate to your klingenc account.
                         </Typography>
 
                         <Paper className={classes.paper} elevation={0}>
                             <Typography variant='body1'>
-                                HISTIGNORE=$HISTIGNORE:'export ARVADOS_API_TOKEN=*'                            
+                                HISTIGNORE=$HISTIGNORE:'export ARVADOS_API_TOKEN=*'
                             </Typography>
                             <Typography variant='body1'>
                                 export ARVADOS_API_TOKEN={currentToken}
@@ -75,8 +75,8 @@ export const CurrentTokenDialog = withStyles(styles)(
                             </Typography>
                         </Paper>
                         <Typography variant='body1'>
-                            Arvados 
-                            <a href='http://doc.arvados.org/user/reference/api-tokens.html' target='blank' className={classes.link}>virtual machines</a> 
+                            Arvados
+                            <a href='http://doc.arvados.org/user/reference/api-tokens.html' target='blank' className={classes.link}>virtual machines</a>
                             do this for you automatically. This setup is needed only when you use the API remotely (e.g., from your own workstation).
                         </Typography>
                     </DialogContent>
@@ -87,4 +87,4 @@ export const CurrentTokenDialog = withStyles(styles)(
             );
         }
     }
-);
\ No newline at end of file
+);
index e13e8af0ec44934369a0ae5db0fdcb6b46987b2f..68eeb3c144210dbbb247e94f634014d8d3726a98 100644 (file)
@@ -3,14 +3,14 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { connect } from "react-redux";
-import { RootState } from "../../store/store";
-import { DataExplorer as DataExplorerComponent } from "../../components/data-explorer/data-explorer";
-import { getDataExplorer } from "../../store/data-explorer/data-explorer-reducer";
+import { RootState } from "~/store/store";
+import { DataExplorer as DataExplorerComponent } from "~/components/data-explorer/data-explorer";
+import { getDataExplorer } from "~/store/data-explorer/data-explorer-reducer";
 import { Dispatch } from "redux";
-import { dataExplorerActions } from "../../store/data-explorer/data-explorer-action";
-import { DataColumn } from "../../components/data-table/data-column";
-import { DataTableFilterItem } from "../../components/data-table-filters/data-table-filters";
-import { DataColumns } from "../../components/data-table/data-table";
+import { dataExplorerActions } from "~/store/data-explorer/data-explorer-action";
+import { DataColumn } from "~/components/data-table/data-column";
+import { DataTableFilterItem } from "~/components/data-table-filters/data-table-filters";
+import { DataColumns } from "~/components/data-table/data-table";
 
 interface Props {
     id: string;
index 2b99f023a92516ad670b0869f2f545dde02d823e..1b07642ab727da755b898553ebc29a768f6bc025 100644 (file)
@@ -5,10 +5,10 @@
 import * as React from 'react';
 import { Grid, Typography } from '@material-ui/core';
 import { FavoriteStar } from '../favorite-star/favorite-star';
-import { ResourceKind } from '../../models/resource';
-import { ProjectIcon, CollectionIcon, ProcessIcon, DefaultIcon } from '../../components/icon/icon';
-import { formatDate, formatFileSize } from '../../common/formatters';
-import { resourceLabel } from '../../common/labels';
+import { ResourceKind } from '~/models/resource';
+import { ProjectIcon, CollectionIcon, ProcessIcon, DefaultIcon } from '~/components/icon/icon';
+import { formatDate, formatFileSize } from '~/common/formatters';
+import { resourceLabel } from '~/common/labels';
 
 
 export const renderName = (item: {name: string; uuid: string, kind: string}) =>
@@ -64,4 +64,4 @@ export const renderType = (type: string) =>
 export const renderStatus = (item: {status?: string}) =>
     <Typography noWrap align="center" >
         {item.status || "-"}
-    </Typography>;
\ No newline at end of file
+    </Typography>;
index f0be4497ec6a2075b150c55657f59fca90da713a..c41e0b80ee1616af2b97f20d3d5c71e2311b0288 100644 (file)
@@ -3,13 +3,13 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from 'react';
-import { CollectionIcon } from '../../components/icon/icon';
-import { CollectionResource } from '../../models/collection';
-import { formatDate } from '../../common/formatters';
-import { resourceLabel } from '../../common/labels';
-import { ResourceKind } from '../../models/resource';
+import { CollectionIcon } from '~/components/icon/icon';
+import { CollectionResource } from '~/models/collection';
+import { formatDate } from '~/common/formatters';
+import { resourceLabel } from '~/common/labels';
+import { ResourceKind } from '~/models/resource';
 import { DetailsData } from "./details-data";
-import { DetailsAttribute } from "../../components/details-attribute/details-attribute";
+import { DetailsAttribute } from "~/components/details-attribute/details-attribute";
 
 export class CollectionDetails extends DetailsData<CollectionResource> {
 
index d20269cd77ca3e949a286a92fccd477b4be3a9b1..5c061883f9e0b6d57179cdc57a155f2a6fa90a3c 100644 (file)
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from 'react';
-import { DetailsResource } from "../../models/details";
+import { DetailsResource } from "~/models/details";
 
 export abstract class DetailsData<T extends DetailsResource = DetailsResource> {
     constructor(protected item: T) {}
index 20d3843f7787a8fbd4aa23bbe91b1abfaacd6b81..a298d670ee70de01e14ab58b03c9410aaccd4e69 100644 (file)
@@ -5,21 +5,21 @@
 import * as React from 'react';
 import { Drawer, IconButton, Tabs, Tab, Typography, Grid } from '@material-ui/core';
 import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles';
-import { ArvadosTheme } from '../../common/custom-theme';
+import { ArvadosTheme } from '~/common/custom-theme';
 import * as classnames from "classnames";
 import { connect } from 'react-redux';
-import { RootState } from '../../store/store';
-import { detailsPanelActions } from "../../store/details-panel/details-panel-action";
-import { CloseIcon } from '../../components/icon/icon';
-import { EmptyResource } from '../../models/empty';
+import { RootState } from '~/store/store';
+import { detailsPanelActions } from "~/store/details-panel/details-panel-action";
+import { CloseIcon } from '~/components/icon/icon';
+import { EmptyResource } from '~/models/empty';
 import { Dispatch } from "redux";
-import { ResourceKind } from "../../models/resource";
+import { ResourceKind } from "~/models/resource";
 import { ProjectDetails } from "./project-details";
 import { CollectionDetails } from "./collection-details";
 import { ProcessDetails } from "./process-details";
 import { EmptyDetails } from "./empty-details";
 import { DetailsData } from "./details-data";
-import { DetailsResource } from "../../models/details";
+import { DetailsResource } from "~/models/details";
 
 type CssRules = 'drawerPaper' | 'container' | 'opened' | 'headerContainer' | 'headerIcon' | 'tabContainer';
 
index 47cb4030eddad0f8e11c901d05b90e65072d686e..76778d72b45583b3c374b1bf3416e3528eef5e87 100644 (file)
@@ -3,10 +3,10 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from 'react';
-import { DefaultIcon, ProjectsIcon } from '../../components/icon/icon';
-import { EmptyResource } from '../../models/empty';
+import { DefaultIcon, ProjectsIcon } from '~/components/icon/icon';
+import { EmptyResource } from '~/models/empty';
 import { DetailsData } from "./details-data";
-import { DefaultView } from '../../components/default-view/default-view';
+import { DefaultView } from '~/components/default-view/default-view';
 
 export class EmptyDetails extends DetailsData<EmptyResource> {
     getIcon(className?: string) {
index e195d05f34d96fb2af1dad415c6852b604436830..dee6e8b0b9a20db979ca64cddda58b268c2535d1 100644 (file)
@@ -3,13 +3,13 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from 'react';
-import { ProcessIcon } from '../../components/icon/icon';
-import { ProcessResource } from '../../models/process';
-import { formatDate } from '../../common/formatters';
-import { ResourceKind } from '../../models/resource';
-import { resourceLabel } from '../../common/labels';
+import { ProcessIcon } from '~/components/icon/icon';
+import { ProcessResource } from '~/models/process';
+import { formatDate } from '~/common/formatters';
+import { ResourceKind } from '~/models/resource';
+import { resourceLabel } from '~/common/labels';
 import { DetailsData } from "./details-data";
-import { DetailsAttribute } from "../../components/details-attribute/details-attribute";
+import { DetailsAttribute } from "~/components/details-attribute/details-attribute";
 
 export class ProcessDetails extends DetailsData<ProcessResource> {
 
index b46bdcdbe85f312579169e816a172ea7a121f5de..154f0a2c906e908660d05d5d437c65ad7890911a 100644 (file)
@@ -3,13 +3,13 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from 'react';
-import { ProjectIcon } from '../../components/icon/icon';
-import { ProjectResource } from '../../models/project';
-import { formatDate } from '../../common/formatters';
-import { ResourceKind } from '../../models/resource';
-import { resourceLabel } from '../../common/labels';
+import { ProjectIcon } from '~/components/icon/icon';
+import { ProjectResource } from '~/models/project';
+import { formatDate } from '~/common/formatters';
+import { ResourceKind } from '~/models/resource';
+import { resourceLabel } from '~/common/labels';
 import { DetailsData } from "./details-data";
-import { DetailsAttribute } from "../../components/details-attribute/details-attribute";
+import { DetailsAttribute } from "~/components/details-attribute/details-attribute";
 
 export class ProjectDetails extends DetailsData<ProjectResource> {
 
index 5069db94b521999953524a3cffbdff1b2c5aacbc..0dc590ae04e5f3b61a42d97c404c1292a2b471d4 100644 (file)
@@ -4,10 +4,10 @@
 
 import * as React from "react";
 import { InjectedFormProps, Field, WrappedFieldProps } from "redux-form";
-import { Dialog, DialogTitle, DialogContent, DialogActions, Button, CircularProgress, FormHelperText } from "@material-ui/core";
-import { WithDialogProps } from "../../store/dialog/with-dialog";
-import { TextField } from "../../components/text-field/text-field";
-import { COLLECTION_NAME_VALIDATION, COLLECTION_DESCRIPTION_VALIDATION, COLLECTION_PROJECT_VALIDATION } from "../../validators/create-project/create-project-validator";
+import { Dialog, DialogTitle, DialogContent, DialogActions, Button, CircularProgress } from "@material-ui/core";
+import { WithDialogProps } from "~/store/dialog/with-dialog";
+import { TextField } from "~/components/text-field/text-field";
+import { COLLECTION_NAME_VALIDATION, COLLECTION_DESCRIPTION_VALIDATION, COLLECTION_PROJECT_VALIDATION } from "~/validators/create-project/create-project-validator";
 import { ProjectTreePicker } from "../project-tree-picker/project-tree-picker";
 
 export const DialogCollectionCreateWithSelected = (props: WithDialogProps<string> & InjectedFormProps<{ name: string }>) =>
index 226b6460e6e2e88485b9cec8a920883657071a57..7f2e411ed08f525ab94e8bf8b3d94b84e541142a 100644 (file)
@@ -5,15 +5,15 @@
 import * as React from 'react';
 import { reduxForm, Field } from 'redux-form';
 import { compose } from 'redux';
-import { TextField } from '../../components/text-field/text-field';
+import { TextField } from '~/components/text-field/text-field';
 import { Dialog, DialogActions, DialogContent, DialogTitle } from '@material-ui/core/';
 import { Button, StyleRulesCallback, WithStyles, withStyles, CircularProgress } from '@material-ui/core';
 
-import { COLLECTION_NAME_VALIDATION, COLLECTION_DESCRIPTION_VALIDATION } from '../../validators/create-collection/create-collection-validator';
-import { FileUpload } from "../../components/file-upload/file-upload";
+import { COLLECTION_NAME_VALIDATION, COLLECTION_DESCRIPTION_VALIDATION } from '~/validators/create-collection/create-collection-validator';
+import { FileUpload } from "~/components/file-upload/file-upload";
 import { connect, DispatchProp } from "react-redux";
-import { RootState } from "../../store/store";
-import { collectionUploaderActions, UploadFile } from "../../store/collections/uploader/collection-uploader-actions";
+import { RootState } from "~/store/store";
+import { collectionUploaderActions, UploadFile } from "~/store/collections/uploader/collection-uploader-actions";
 
 type CssRules = "button" | "lastButton" | "formContainer" | "textField" | "createProgress" | "dialogActions";
 
index 50e4c9807fac6efc91aabe2d985bd0325a6bc1c0..c3d8415c9a48dd77cd0cb608229cfb2d20cf9ee3 100644 (file)
@@ -5,11 +5,11 @@
 import * as React from 'react';
 import { reduxForm, Field } from 'redux-form';
 import { compose } from 'redux';
-import { TextField } from '../../components/text-field/text-field';
+import { TextField } from '~/components/text-field/text-field';
 import { Dialog, DialogActions, DialogContent, DialogTitle } from '@material-ui/core/';
 import { Button, StyleRulesCallback, WithStyles, withStyles, CircularProgress } from '@material-ui/core';
 
-import { PROJECT_NAME_VALIDATION, PROJECT_DESCRIPTION_VALIDATION } from '../../validators/create-project/create-project-validator';
+import { PROJECT_NAME_VALIDATION, PROJECT_DESCRIPTION_VALIDATION } from '~/validators/create-project/create-project-validator';
 
 type CssRules = "button" | "lastButton" | "formContainer" | "textField" | "dialog" | "dialogTitle" | "createProgress" | "dialogActions";
 
index f3f79fb62e1fad07b2936315cc5041dece75f3a9..d97ff41bea913e2d46531134a95feb0e57edf4bc 100644 (file)
@@ -5,10 +5,10 @@
 import * as React from 'react';
 import { reduxForm, Field } from 'redux-form';
 import { compose } from 'redux';
-import { ArvadosTheme } from '../../common/custom-theme';
+import { ArvadosTheme } from '~/common/custom-theme';
 import { Dialog, DialogActions, DialogContent, DialogTitle, TextField, StyleRulesCallback, withStyles, WithStyles, Button, CircularProgress } from '@material-ui/core';
-import { COLLECTION_NAME_VALIDATION, COLLECTION_DESCRIPTION_VALIDATION } from '../../validators/create-collection/create-collection-validator';
-import { COLLECTION_FORM_NAME } from '../../store/collections/updater/collection-updater-action';
+import { COLLECTION_NAME_VALIDATION, COLLECTION_DESCRIPTION_VALIDATION } from '~/validators/create-collection/create-collection-validator';
+import { COLLECTION_FORM_NAME } from '~/store/collections/updater/collection-updater-action';
 
 type CssRules = 'content' | 'actions' | 'textField' | 'buttonWrapper' | 'saveButton' | 'circularProgress';
 
index f896e304999380412326cd1f01f1ebf78d52edb3..755cc67c265b52e0b80c12b04561f6b081bb989a 100644 (file)
@@ -3,9 +3,9 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from "react";
-import { FavoriteIcon } from "../../components/icon/icon";
+import { FavoriteIcon } from "~/components/icon/icon";
 import { connect } from "react-redux";
-import { RootState } from "../../store/store";
+import { RootState } from "~/store/store";
 import { withStyles, StyleRulesCallback, WithStyles } from "@material-ui/core";
 
 type CssRules = "icon";
@@ -24,4 +24,4 @@ const mapStateToProps = (state: RootState, props: { resourceUuid: string; classN
 export const FavoriteStar = connect(mapStateToProps)(
     withStyles(styles)((props: { visible: boolean; className?: string; } & WithStyles<CssRules>) =>
         props.visible ? <FavoriteIcon className={props.className || props.classes.icon} /> : null
-    ));
\ No newline at end of file
+    ));
index 3678e535450932c8d7e428e9da7280b49e2b00d4..04497933c87effdbe6b81ba540bd4adf7ae90f52 100644 (file)
@@ -4,10 +4,10 @@
 
 import { Dispatch } from "redux";
 import { connect } from "react-redux";
-import { ConfirmationDialog } from "../../components/confirmation-dialog/confirmation-dialog";
-import { withDialog } from "../../store/dialog/with-dialog";
-import { dialogActions } from "../../store/dialog/dialog-actions";
-import { snackbarActions } from "../../store/snackbar/snackbar-actions";
+import { ConfirmationDialog } from "~/components/confirmation-dialog/confirmation-dialog";
+import { withDialog } from "~/store/dialog/with-dialog";
+import { dialogActions } from "~/store/dialog/dialog-actions";
+import { snackbarActions } from "~/store/snackbar/snackbar-actions";
 
 const FILE_REMOVE_DIALOG = 'fileRemoveDialog';
 
@@ -35,4 +35,4 @@ export const openFileRemoveDialog = (fileId: string) =>
 
 export const [FileRemoveDialog] = [ConfirmationDialog]
     .map(withDialog(FILE_REMOVE_DIALOG))
-    .map(connect(undefined, mapDispatchToProps));
\ No newline at end of file
+    .map(connect(undefined, mapDispatchToProps));
index 8810e23a9128a1ed933c37d698f680b68300edf6..1362de6b8ac424c479c460674cb1eb43fe5996a7 100644 (file)
@@ -4,10 +4,10 @@
 
 import { Dispatch } from "redux";
 import { connect } from "react-redux";
-import { ConfirmationDialog } from "../../components/confirmation-dialog/confirmation-dialog";
-import { withDialog } from "../../store/dialog/with-dialog";
-import { dialogActions } from "../../store/dialog/dialog-actions";
-import { snackbarActions } from "../../store/snackbar/snackbar-actions";
+import { ConfirmationDialog } from "~/components/confirmation-dialog/confirmation-dialog";
+import { withDialog } from "~/store/dialog/with-dialog";
+import { dialogActions } from "~/store/dialog/dialog-actions";
+import { snackbarActions } from "~/store/snackbar/snackbar-actions";
 
 const MULTIPLE_FILES_REMOVE_DIALOG = 'multipleFilesRemoveDialog';
 
@@ -34,4 +34,4 @@ export const openMultipleFilesRemoveDialog = () =>
 
 export const [MultipleFilesRemoveDialog] = [ConfirmationDialog]
     .map(withDialog(MULTIPLE_FILES_REMOVE_DIALOG))
-    .map(connect(undefined, mapDispatchToProps));
\ No newline at end of file
+    .map(connect(undefined, mapDispatchToProps));
index a634d43955e47f581a259d64eb192ca72fb95055..75a39fd57ac74ecb72634ab7aadb563176670aaf 100644 (file)
@@ -3,14 +3,14 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from "react";
-import { mount, configure, ReactWrapper } from "enzyme";
+import { mount, configure } from "enzyme";
 import * as Adapter from "enzyme-adapter-react-16";
 import { MainAppBar } from "./main-app-bar";
-import { SearchBar } from "../../components/search-bar/search-bar";
-import { Breadcrumbs } from "../../components/breadcrumbs/breadcrumbs";
-import { DropdownMenu } from "../../components/dropdown-menu/dropdown-menu";
+import { SearchBar } from "~/components/search-bar/search-bar";
+import { Breadcrumbs } from "~/components/breadcrumbs/breadcrumbs";
+import { DropdownMenu } from "~/components/dropdown-menu/dropdown-menu";
 import { Button, MenuItem, IconButton } from "@material-ui/core";
-import { User } from "../../models/user";
+import { User } from "~/models/user";
 
 configure({ adapter: new Adapter() });
 
index 9c031080a77d3a1c392fdf78383cb501d7c2934e..8bce325425f7c52a07cbbb958c8f316b48cdb29f 100644 (file)
@@ -4,11 +4,11 @@
 
 import * as React from "react";
 import { AppBar, Toolbar, Typography, Grid, IconButton, Badge, Button, MenuItem } from "@material-ui/core";
-import { User, getUserFullname } from "../../models/user";
-import { SearchBar } from "../../components/search-bar/search-bar";
-import { Breadcrumbs, Breadcrumb } from "../../components/breadcrumbs/breadcrumbs";
-import { DropdownMenu } from "../../components/dropdown-menu/dropdown-menu";
-import { DetailsIcon, NotificationIcon, UserPanelIcon, HelpIcon } from "../../components/icon/icon";
+import { User, getUserFullname } from "~/models/user";
+import { SearchBar } from "~/components/search-bar/search-bar";
+import { Breadcrumbs, Breadcrumb } from "~/components/breadcrumbs/breadcrumbs";
+import { DropdownMenu } from "~/components/dropdown-menu/dropdown-menu";
+import { DetailsIcon, NotificationIcon, UserPanelIcon, HelpIcon } from "~/components/icon/icon";
 
 export interface MainAppBarMenuItem {
     label: string;
index 1c343a2dde1d8a4acf364d95f6f0a451508f5fee..e09d78abf67098adfc917e296f31a521ae6e4e56 100644 (file)
@@ -7,15 +7,15 @@ import { Dispatch } from "redux";
 import { connect } from "react-redux";
 import { Typography } from "@material-ui/core";
 import { TreePicker } from "../tree-picker/tree-picker";
-import { TreeProps, TreeItem, TreeItemStatus } from "../../components/tree/tree";
-import { ProjectResource } from "../../models/project";
-import { treePickerActions } from "../../store/tree-picker/tree-picker-actions";
-import { ListItemTextIcon } from "../../components/list-item-text-icon/list-item-text-icon";
-import { ProjectIcon } from "../../components/icon/icon";
-import { createTreePickerNode } from "../../store/tree-picker/tree-picker";
-import { RootState } from "../../store/store";
-import { ServiceRepository } from "../../services/services";
-import { FilterBuilder } from "../../common/api/filter-builder";
+import { TreeProps, TreeItem, TreeItemStatus } from "~/components/tree/tree";
+import { ProjectResource } from "~/models/project";
+import { treePickerActions } from "~/store/tree-picker/tree-picker-actions";
+import { ListItemTextIcon } from "~/components/list-item-text-icon/list-item-text-icon";
+import { ProjectIcon } from "~/components/icon/icon";
+import { createTreePickerNode } from "~/store/tree-picker/tree-picker";
+import { RootState } from "~/store/store";
+import { ServiceRepository } from "~/services/services";
+import { FilterBuilder } from "~/common/api/filter-builder";
 
 type ProjectTreePickerProps = Pick<TreeProps<ProjectResource>, 'toggleItemActive' | 'toggleItemOpen'>;
 
@@ -72,4 +72,4 @@ const receiveProjectTreePickerData = (id: string, projects: ProjectResource[]) =
             nodes: projects.map(project => createTreePickerNode({ id: project.uuid, value: project }))
         }));
         dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_COLLAPSE({ id }));
-    };
\ No newline at end of file
+    };
index 98b4a67cb00049551f52da687981aa6a2258bd18..140119e17e6849ad57d397fa02f362b2f1d7111f 100644 (file)
@@ -11,9 +11,9 @@ import { Collapse } from '@material-ui/core';
 import CircularProgress from '@material-ui/core/CircularProgress';
 
 import { ProjectTree } from './project-tree';
-import { TreeItem } from '../../components/tree/tree';
-import { ProjectResource } from '../../models/project';
-import { mockProjectResource } from '../../models/test-utils';
+import { TreeItem } from '~/components/tree/tree';
+import { ProjectResource } from '~/models/project';
+import { mockProjectResource } from '~/models/test-utils';
 
 Enzyme.configure({ adapter: new Adapter() });
 
index c9d4c3e3a5e47d1a7f5b2971689b7e7203886db1..8c1ed33059b75bb1ad3056ad2c9f34414eae4374 100644 (file)
@@ -4,12 +4,12 @@
 
 import * as React from 'react';
 import { ReactElement } from 'react';
-import { StyleRulesCallback, Theme, WithStyles, withStyles } from '@material-ui/core/styles';
-import { Tree, TreeItem, TreeItemStatus } from '../../components/tree/tree';
-import { ProjectResource } from '../../models/project';
-import { ProjectIcon } from '../../components/icon/icon';
-import { ArvadosTheme } from '../../common/custom-theme';
-import { ListItemTextIcon } from '../../components/list-item-text-icon/list-item-text-icon';
+import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles';
+import { Tree, TreeItem, TreeItemStatus } from '~/components/tree/tree';
+import { ProjectResource } from '~/models/project';
+import { ProjectIcon } from '~/components/icon/icon';
+import { ArvadosTheme } from '~/common/custom-theme';
+import { ListItemTextIcon } from '~/components/list-item-text-icon/list-item-text-icon';
 
 type CssRules = 'root';
 
index f08727f64cd95e8143783b05cc23e13088da8909..1bf76e49eaa7fafc0bcebf3165ceb82947adf6e8 100644 (file)
@@ -4,8 +4,8 @@
 
 import * as React from "react";
 import { Dialog, DialogTitle, DialogContent, DialogActions, Button } from "@material-ui/core";
-import { withDialog } from "../../store/dialog/with-dialog";
-import { dialogActions } from "../../store/dialog/dialog-actions";
+import { withDialog } from "~/store/dialog/with-dialog";
+import { dialogActions } from "~/store/dialog/dialog-actions";
 
 export const REMOVE_DIALOG = 'removeCollectionFilesDialog';
 
index 5e2f7c44def1d38ecd584a80278f4f798d52ea38..37028f9db5adc5b4cffe7cfffa25b1d969a7fcee 100644 (file)
@@ -4,9 +4,9 @@
 
 import { Dispatch } from "redux";
 import { reduxForm, reset, startSubmit, stopSubmit } from "redux-form";
-import { withDialog } from "../../store/dialog/with-dialog";
-import { dialogActions } from "../../store/dialog/dialog-actions";
-import { RenameDialog } from "../../components/rename-dialog/rename-dialog";
+import { withDialog } from "~/store/dialog/with-dialog";
+import { dialogActions } from "~/store/dialog/dialog-actions";
+import { RenameDialog } from "~/components/rename-dialog/rename-dialog";
 
 export const RENAME_FILE_DIALOG = 'renameFileDialog';
 
index c65d3640473cd035cf9bb4edf4b90a88d3375307..535777e1bd4fd0765f1ac88914e592165f969258 100644 (file)
@@ -4,10 +4,10 @@
 
 import * as React from "react";
 import { connect } from "react-redux";
-import { RootState } from "../../store/store";
+import { RootState } from "~/store/store";
 import MaterialSnackbar, { SnackbarProps } from "@material-ui/core/Snackbar";
 import { Dispatch } from "redux";
-import { snackbarActions } from "../../store/snackbar/snackbar-actions";
+import { snackbarActions } from "~/store/snackbar/snackbar-actions";
 
 const mapStateToProps = (state: RootState): SnackbarProps => ({
     anchorOrigin: { vertical: "bottom", horizontal: "center" },
index 3e0fc6ed9407bf3c5b6e47da62708234daa65089..09a07443f26b9097ddcccfa9ded1b95d2dea5d85 100644 (file)
@@ -3,10 +3,10 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { connect } from "react-redux";
-import { Tree, TreeProps, TreeItem } from "../../components/tree/tree";
-import { RootState } from "../../store/store";
-import { TreePicker as TTreePicker, TreePickerNode, createTreePickerNode } from "../../store/tree-picker/tree-picker";
-import { getNodeValue, getNodeChildren } from "../../models/tree";
+import { Tree, TreeProps, TreeItem } from "~/components/tree/tree";
+import { RootState } from "~/store/store";
+import { TreePicker as TTreePicker, TreePickerNode, createTreePickerNode } from "~/store/tree-picker/tree-picker";
+import { getNodeValue, getNodeChildren } from "~/models/tree";
 
 const memoizedMapStateToProps = () => {
     let prevState: TTreePicker;
index 1374ac41bad7feb8f827b1055d63e5c56b50ff80..239df58952febb4f45c6a5609f6f0b6129691fe3 100644 (file)
@@ -5,11 +5,11 @@
 import { connect } from "react-redux";
 import { Dispatch } from "redux";
 import { SubmissionError } from "redux-form";
-import { RootState } from "../../store/store";
-import { snackbarActions } from "../../store/snackbar/snackbar-actions";
-import { collectionUpdaterActions, updateCollection } from "../../store/collections/updater/collection-updater-action";
-import { dataExplorerActions } from "../../store/data-explorer/data-explorer-action";
-import { PROJECT_PANEL_ID } from "../../views/project-panel/project-panel";
+import { RootState } from "~/store/store";
+import { snackbarActions } from "~/store/snackbar/snackbar-actions";
+import { collectionUpdaterActions, updateCollection } from "~/store/collections/updater/collection-updater-action";
+import { dataExplorerActions } from "~/store/data-explorer/data-explorer-action";
+import { PROJECT_PANEL_ID } from "~/views/project-panel/project-panel";
 import { DialogCollectionUpdate } from "../dialog-update/dialog-collection-update";
 
 const mapStateToProps = (state: RootState) => ({
index 489d28473b0803fe3887380c850186f05c707680..5baa6d18753fd7e1f6a0198eb942d7c922538a59 100644 (file)
@@ -9,16 +9,16 @@ import {
 } from '@material-ui/core';
 import { connect, DispatchProp } from "react-redux";
 import { RouteComponentProps } from 'react-router';
-import { ArvadosTheme } from '../../common/custom-theme';
-import { RootState } from '../../store/store';
-import { MoreOptionsIcon, CollectionIcon, CopyIcon } from '../../components/icon/icon';
-import { DetailsAttribute } from '../../components/details-attribute/details-attribute';
-import { CollectionResource } from '../../models/collection';
-import { CollectionPanelFiles } from '../../views-components/collection-panel-files/collection-panel-files';
+import { ArvadosTheme } from '~/common/custom-theme';
+import { RootState } from '~/store/store';
+import { MoreOptionsIcon, CollectionIcon, CopyIcon } from '~/components/icon/icon';
+import { DetailsAttribute } from '~/components/details-attribute/details-attribute';
+import { CollectionResource } from '~/models/collection';
+import { CollectionPanelFiles } from '~/views-components/collection-panel-files/collection-panel-files';
 import * as CopyToClipboard from 'react-copy-to-clipboard';
-import { TagResource } from '../../models/tag';
+import { TagResource } from '~/models/tag';
 import { CollectionTagForm } from './collection-tag-form';
-import { deleteCollectionTag } from '../../store/collection-panel/collection-panel-action';
+import { deleteCollectionTag } from '~/store/collection-panel/collection-panel-action';
 
 type CssRules = 'card' | 'iconHeader' | 'tag' | 'copyIcon' | 'value';
 
@@ -60,11 +60,11 @@ type CollectionPanelProps = CollectionPanelDataProps & CollectionPanelActionProp
 
 
 export const CollectionPanel = withStyles(styles)(
-    connect((state: RootState) => ({ 
-        item: state.collectionPanel.item, 
-        tags: state.collectionPanel.tags 
+    connect((state: RootState) => ({
+        item: state.collectionPanel.item,
+        tags: state.collectionPanel.tags
     }))(
-        class extends React.Component<CollectionPanelProps> { 
+        class extends React.Component<CollectionPanelProps> {
 
             render() {
                 const { classes, item, tags, onContextMenu } = this.props;
@@ -84,8 +84,8 @@ export const CollectionPanel = withStyles(styles)(
                             <CardContent>
                                 <Grid container direction="column">
                                     <Grid item xs={6}>
-                                    <DetailsAttribute classValue={classes.value} 
-                                            label='Collection UUID' 
+                                    <DetailsAttribute classValue={classes.value}
+                                            label='Collection UUID'
                                             value={item && item.uuid}>
                                         <CopyToClipboard text={item && item.uuid}>
                                             <CopyIcon className={classes.copyIcon} />
index 89cf880afab32a28d08d6b935b41f1964c91873c..8f2540412edbbd6318c9716d400e921e6086b9b8 100644 (file)
@@ -5,17 +5,17 @@
 import * as React from 'react';
 import { reduxForm, Field, reset } from 'redux-form';
 import { compose, Dispatch } from 'redux';
-import { ArvadosTheme } from '../../common/custom-theme';
+import { ArvadosTheme } from '~/common/custom-theme';
 import { StyleRulesCallback, withStyles, WithStyles, TextField, Button, CircularProgress } from '@material-ui/core';
-import { TagProperty } from '../../models/tag';
-import { createCollectionTag, COLLECTION_TAG_FORM_NAME } from '../../store/collection-panel/collection-panel-action';
-import { TAG_VALUE_VALIDATION, TAG_KEY_VALIDATION } from '../../validators/validators';
+import { TagProperty } from '~/models/tag';
+import { createCollectionTag, COLLECTION_TAG_FORM_NAME } from '~/store/collection-panel/collection-panel-action';
+import { TAG_VALUE_VALIDATION, TAG_KEY_VALIDATION } from '~/validators/validators';
 
 type CssRules = 'form' | 'textField' | 'buttonWrapper' | 'saveButton' | 'circularProgress';
 
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     form: {
-        marginBottom: theme.spacing.unit * 4 
+        marginBottom: theme.spacing.unit * 4
     },
     textField: {
         marginRight: theme.spacing.unit
@@ -58,15 +58,15 @@ interface TextFieldProps {
 type CollectionTagFormProps = CollectionTagFormDataProps & CollectionTagFormActionProps & WithStyles<CssRules>;
 
 export const CollectionTagForm = compose(
-    reduxForm({ 
-        form: COLLECTION_TAG_FORM_NAME, 
+    reduxForm({
+        form: COLLECTION_TAG_FORM_NAME,
         onSubmit: (data: TagProperty, dispatch: Dispatch) => {
             dispatch<any>(createCollectionTag(data));
             dispatch(reset(COLLECTION_TAG_FORM_NAME));
-        } 
+        }
     }),
     withStyles(styles))(
-        
+
     class CollectionTagForm extends React.Component<CollectionTagFormProps> {
 
             render() {
@@ -115,4 +115,4 @@ export const CollectionTagForm = compose(
 
         }
 
-    );
\ No newline at end of file
+    );
index da48298aa7ec6d2dd14fd6d44b3d0209e25ba4d7..842b6d6bbcc05469aa0566dbee43f6e4cbd608cd 100644 (file)
@@ -2,8 +2,8 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { GroupContentsResource } from "../../services/groups-service/groups-service";
-import { ResourceKind } from "../../models/resource";
+import { GroupContentsResource } from "~/services/groups-service/groups-service";
+import { ResourceKind } from "~/models/resource";
 
 export interface FavoritePanelItem {
     uuid: string;
@@ -16,7 +16,6 @@ export interface FavoritePanelItem {
     status?: string;
 }
 
-
 export function resourceToDataItem(r: GroupContentsResource): FavoritePanelItem {
     return {
         uuid: r.uuid,
@@ -28,4 +27,3 @@ export function resourceToDataItem(r: GroupContentsResource): FavoritePanelItem
         status:  r.kind === ResourceKind.PROCESS ? r.state : undefined
     };
 }
-
index a48395d4b2d03f83557f4ce46631580c96930689..618f0aba426b1ec6d44c00189437414ef5a2e901 100644 (file)
@@ -5,20 +5,20 @@
 import * as React from 'react';
 import { FavoritePanelItem } from './favorite-panel-item';
 import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core';
-import { DataExplorer } from "../../views-components/data-explorer/data-explorer";
+import { DataExplorer } from "~/views-components/data-explorer/data-explorer";
 import { DispatchProp, connect } from 'react-redux';
-import { DataColumns } from '../../components/data-table/data-table';
+import { DataColumns } from '~/components/data-table/data-table';
 import { RouteComponentProps } from 'react-router';
-import { RootState } from '../../store/store';
-import { DataTableFilterItem } from '../../components/data-table-filters/data-table-filters';
-import { ContainerRequestState } from '../../models/container-request';
-import { SortDirection } from '../../components/data-table/data-column';
-import { ResourceKind } from '../../models/resource';
-import { resourceLabel } from '../../common/labels';
-import { ArvadosTheme } from '../../common/custom-theme';
-import { renderName, renderStatus, renderType, renderOwner, renderFileSize, renderDate } from '../../views-components/data-explorer/renderers';
-import { FAVORITE_PANEL_ID } from "../../store/favorite-panel/favorite-panel-action";
-import { FavoriteIcon } from '../../components/icon/icon';
+import { RootState } from '~/store/store';
+import { DataTableFilterItem } from '~/components/data-table-filters/data-table-filters';
+import { ContainerRequestState } from '~/models/container-request';
+import { SortDirection } from '~/components/data-table/data-column';
+import { ResourceKind } from '~/models/resource';
+import { resourceLabel } from '~/common/labels';
+import { ArvadosTheme } from '~/common/custom-theme';
+import { renderName, renderStatus, renderType, renderOwner, renderFileSize, renderDate } from '~/views-components/data-explorer/renderers';
+import { FAVORITE_PANEL_ID } from "~/store/favorite-panel/favorite-panel-action";
+import { FavoriteIcon } from '~/components/icon/icon';
 
 type CssRules = "toolbar" | "button";
 
index d81ef5022cea599b174e4a4980b05ab738b4b633..f0318591f5066d388286040ea6ccd96fe1b431d0 100644 (file)
@@ -2,8 +2,8 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { GroupContentsResource } from "../../services/groups-service/groups-service";
-import { ResourceKind } from "../../models/resource";
+import { GroupContentsResource } from "~/services/groups-service/groups-service";
+import { ResourceKind } from "~/models/resource";
 
 export interface ProjectPanelItem {
     uuid: string;
@@ -17,7 +17,6 @@ export interface ProjectPanelItem {
     status?: string;
 }
 
-
 export function resourceToDataItem(r: GroupContentsResource): ProjectPanelItem {
     return {
         uuid: r.uuid,
@@ -30,4 +29,3 @@ export function resourceToDataItem(r: GroupContentsResource): ProjectPanelItem {
         status:  r.kind === ResourceKind.PROCESS ? r.state : undefined
     };
 }
-
index cf4aca5b6aacf074ebb7490a298d75f689a4903c..e9179a118ddc759de11d4fccba3109c6309fc600 100644 (file)
@@ -5,20 +5,20 @@
 import * as React from 'react';
 import { ProjectPanelItem } from './project-panel-item';
 import { Button, StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core';
-import { DataExplorer } from "../../views-components/data-explorer/data-explorer";
+import { DataExplorer } from "~/views-components/data-explorer/data-explorer";
 import { DispatchProp, connect } from 'react-redux';
-import { DataColumns } from '../../components/data-table/data-table';
+import { DataColumns } from '~/components/data-table/data-table';
 import { RouteComponentProps } from 'react-router';
-import { RootState } from '../../store/store';
-import { DataTableFilterItem } from '../../components/data-table-filters/data-table-filters';
-import { ContainerRequestState } from '../../models/container-request';
-import { SortDirection } from '../../components/data-table/data-column';
-import { ResourceKind } from '../../models/resource';
-import { resourceLabel } from '../../common/labels';
-import { ArvadosTheme } from '../../common/custom-theme';
-import { renderName, renderStatus, renderType, renderOwner, renderFileSize, renderDate } from '../../views-components/data-explorer/renderers';
-import { restoreBranch } from '../../store/navigation/navigation-action';
-import { ProjectIcon } from '../../components/icon/icon';
+import { RootState } from '~/store/store';
+import { DataTableFilterItem } from '~/components/data-table-filters/data-table-filters';
+import { ContainerRequestState } from '~/models/container-request';
+import { SortDirection } from '~/components/data-table/data-column';
+import { ResourceKind } from '~/models/resource';
+import { resourceLabel } from '~/common/labels';
+import { ArvadosTheme } from '~/common/custom-theme';
+import { renderName, renderStatus, renderType, renderOwner, renderFileSize, renderDate } from '~/views-components/data-explorer/renderers';
+import { restoreBranch } from '~/store/navigation/navigation-action';
+import { ProjectIcon } from '~/components/icon/icon';
 
 type CssRules = 'root' | "toolbar" | "button";
 
index 588b6d9b8ca7f98db074e7fffb359d7630b633b2..d03e1172fb4fc963c99fcaaeb9ea014c9dda6751 100644 (file)
@@ -4,30 +4,27 @@
 
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-import { Workbench } from '../../views/workbench/workbench';
+import { Workbench } from './workbench';
 import { Provider } from "react-redux";
-import { configureStore } from "../../store/store";
+import { configureStore } from "~/store/store";
 import createBrowserHistory from "history/createBrowserHistory";
 import { ConnectedRouter } from "react-router-redux";
 import { MuiThemeProvider } from '@material-ui/core/styles';
-import { CustomTheme } from '../../common/custom-theme';
-import { createServices } from "../../services/services";
-import { AuthService } from "../../services/auth-service/auth-service";
-import Axios from "axios";
+import { CustomTheme } from '~/common/custom-theme';
+import { createServices } from "~/services/services";
 
 const history = createBrowserHistory();
-const authService = new AuthService(Axios.create(), '/arvados/v1');
-
-authService.getUuid = jest.fn().mockReturnValueOnce('test');
 
 it('renders without crashing', () => {
     const div = document.createElement('div');
-    const store = configureStore(createBrowserHistory(), createServices("/arvados/v1"));
+    const services = createServices("/arvados/v1");
+       services.authService.getUuid = jest.fn().mockReturnValueOnce('test');
+    const store = configureStore(createBrowserHistory(), services);
     ReactDOM.render(
         <MuiThemeProvider theme={CustomTheme}>
             <Provider store={store}>
                 <ConnectedRouter history={history}>
-                    <Workbench authService={authService} />
+                    <Workbench authService={services.authService}/>
                 </ConnectedRouter>
             </Provider>
         </MuiThemeProvider>,
index 356a6706c65014d4e61a634052059800d13c9778..a0be3729964eb87a33b33d802cedbc265a4376d1 100644 (file)
@@ -6,49 +6,49 @@ import * as React from 'react';
 import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles';
 import Drawer from '@material-ui/core/Drawer';
 import { connect, DispatchProp } from "react-redux";
-import { Route, Switch, RouteComponentProps, Redirect } from "react-router";
-import { login, logout } from "../../store/auth/auth-action";
-import { User } from "../../models/user";
-import { RootState } from "../../store/store";
-import { MainAppBar, MainAppBarActionProps, MainAppBarMenuItem } from '../../views-components/main-app-bar/main-app-bar';
-import { Breadcrumb } from '../../components/breadcrumbs/breadcrumbs';
+import { Route, RouteComponentProps, Switch, Redirect } from "react-router";
+import { login, logout } from "~/store/auth/auth-action";
+import { User } from "~/models/user";
+import { RootState } from "~/store/store";
+import { MainAppBar, MainAppBarActionProps, MainAppBarMenuItem } from '~/views-components/main-app-bar/main-app-bar';
+import { Breadcrumb } from '~/components/breadcrumbs/breadcrumbs';
 import { push } from 'react-router-redux';
 import { reset } from 'redux-form';
-import { ProjectTree } from '../../views-components/project-tree/project-tree';
-import { TreeItem } from "../../components/tree/tree";
-import { getTreePath } from '../../store/project/project-reducer';
-import { sidePanelActions } from '../../store/side-panel/side-panel-action';
-import { SidePanel, SidePanelItem } from '../../components/side-panel/side-panel';
-import { ItemMode, setProjectItem } from "../../store/navigation/navigation-action";
-import { projectActions } from "../../store/project/project-action";
-import { collectionCreateActions } from '../../store/collections/creator/collection-creator-action';
-import { ProjectPanel } from "../project-panel/project-panel";
-import { DetailsPanel } from '../../views-components/details-panel/details-panel';
-import { ArvadosTheme } from '../../common/custom-theme';
-import { CreateProjectDialog } from "../../views-components/create-project-dialog/create-project-dialog";
+import { ProjectTree } from '~/views-components/project-tree/project-tree';
+import { TreeItem } from "~/components/tree/tree";
+import { getTreePath } from '~/store/project/project-reducer';
+import { sidePanelActions } from '~/store/side-panel/side-panel-action';
+import { SidePanel, SidePanelItem } from '~/components/side-panel/side-panel';
+import { ItemMode, setProjectItem } from "~/store/navigation/navigation-action";
+import { projectActions } from "~/store/project/project-action";
+import { collectionCreateActions } from '~/store/collections/creator/collection-creator-action';
+import { ProjectPanel } from "~/views/project-panel/project-panel";
+import { DetailsPanel } from '~/views-components/details-panel/details-panel';
+import { ArvadosTheme } from '~/common/custom-theme';
+import { CreateProjectDialog } from "~/views-components/create-project-dialog/create-project-dialog";
 
-import { detailsPanelActions, loadDetails } from "../../store/details-panel/details-panel-action";
-import { contextMenuActions } from "../../store/context-menu/context-menu-actions";
-import { SidePanelIdentifiers } from '../../store/side-panel/side-panel-reducer';
-import { ProjectResource } from '../../models/project';
-import { ResourceKind } from '../../models/resource';
-import { ContextMenu, ContextMenuKind } from "../../views-components/context-menu/context-menu";
+import { detailsPanelActions, loadDetails } from "~/store/details-panel/details-panel-action";
+import { contextMenuActions } from "~/store/context-menu/context-menu-actions";
+import { SidePanelIdentifiers } from '~/store/side-panel/side-panel-reducer';
+import { ProjectResource } from '~/models/project';
+import { ResourceKind } from '~/models/resource';
+import { ContextMenu, ContextMenuKind } from "~/views-components/context-menu/context-menu";
 import { FavoritePanel } from "../favorite-panel/favorite-panel";
-import { CurrentTokenDialog } from '../../views-components/current-token-dialog/current-token-dialog';
-import { Snackbar } from '../../views-components/snackbar/snackbar';
-import { favoritePanelActions } from '../../store/favorite-panel/favorite-panel-action';
-import { CreateCollectionDialog } from '../../views-components/create-collection-dialog/create-collection-dialog';
+import { CurrentTokenDialog } from '~/views-components/current-token-dialog/current-token-dialog';
+import { Snackbar } from '~/views-components/snackbar/snackbar';
+import { favoritePanelActions } from '~/store/favorite-panel/favorite-panel-action';
+import { CreateCollectionDialog } from '~/views-components/create-collection-dialog/create-collection-dialog';
 import { CollectionPanel } from '../collection-panel/collection-panel';
-import { loadCollection, loadCollectionTags } from '../../store/collection-panel/collection-panel-action';
-import { getCollectionUrl } from '../../models/collection';
-import { UpdateCollectionDialog } from '../../views-components/update-collection-dialog/update-collection-dialog.';
-import { AuthService } from "../../services/auth-service/auth-service";
-import { RenameFileDialog } from '../../views-components/rename-file-dialog/rename-file-dialog';
-import { FileRemoveDialog } from '../../views-components/file-remove-dialog/file-remove-dialog';
-import { MultipleFilesRemoveDialog } from '../../views-components/file-remove-dialog/multiple-files-remove-dialog';
-import { DialogCollectionCreateWithSelectedFile } from '../../views-components/create-collection-dialog-with-selected/create-collection-dialog-with-selected';
-import { COLLECTION_CREATE_DIALOG } from '../../views-components/dialog-create/dialog-collection-create';
-import { PROJECT_CREATE_DIALOG } from '../../views-components/dialog-create/dialog-project-create';
+import { loadCollection, loadCollectionTags } from '~/store/collection-panel/collection-panel-action';
+import { getCollectionUrl } from '~/models/collection';
+import { UpdateCollectionDialog } from '~/views-components/update-collection-dialog/update-collection-dialog.';
+import { AuthService } from "~/services/auth-service/auth-service";
+import { RenameFileDialog } from '~/views-components/rename-file-dialog/rename-file-dialog';
+import { FileRemoveDialog } from '~/views-components/file-remove-dialog/file-remove-dialog';
+import { MultipleFilesRemoveDialog } from '~/views-components/file-remove-dialog/multiple-files-remove-dialog';
+import { DialogCollectionCreateWithSelectedFile } from '~/views-components/create-collection-dialog-with-selected/create-collection-dialog-with-selected';
+import { COLLECTION_CREATE_DIALOG } from '~/views-components/dialog-create/dialog-collection-create';
+import { PROJECT_CREATE_DIALOG } from '~/views-components/dialog-create/dialog-project-create';
 
 const DRAWER_WITDH = 240;
 const APP_BAR_HEIGHT = 100;
@@ -253,7 +253,7 @@ export const Workbench = withStyles(styles)(
                 );
             }
 
-            renderCollectionPanel = (props: RouteComponentProps<{ id: string }>) => <CollectionPanel 
+            renderCollectionPanel = (props: RouteComponentProps<{ id: string }>) => <CollectionPanel
                 onItemRouteChange={(collectionId) => {
                     this.props.dispatch<any>(loadCollection(collectionId, ResourceKind.COLLECTION));
                     this.props.dispatch<any>(loadCollectionTags(collectionId));
@@ -280,7 +280,7 @@ export const Workbench = withStyles(styles)(
                     } else {
                         kind = ContextMenuKind.RESOURCE;
                     }
-                    
+
                     this.openContextMenu(event, {
                         uuid: item.uuid,
                         name: item.name,
@@ -298,7 +298,7 @@ export const Workbench = withStyles(styles)(
                         case ResourceKind.COLLECTION:
                             this.props.dispatch(loadCollection(item.uuid, item.kind as ResourceKind));
                             this.props.dispatch(push(getCollectionUrl(item.uuid)));
-                        default: 
+                        default:
                             this.props.dispatch(setProjectItem(item.uuid, ItemMode.ACTIVE));
                             this.props.dispatch(loadDetails(item.uuid, item.kind as ResourceKind));
                     }
index af933d9fa9a09755a64da1f8f3f8c4c5b54c1d68..b0e2455281bd09f74171637f30e6e7b22b351319 100644 (file)
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "baseUrl": ".",
+    "baseUrl": "./",
     "outDir": "build/dist",
     "module": "esnext",
     "target": "es5",
     "suppressImplicitAnyIndexErrors": true,
     "noUnusedLocals": false,
     "experimentalDecorators": true,
-    "emitDecoratorMetadata": true
-    //  waits for moduleNameMapper being able to override
-    //    "paths": {
-    //      "~/*": ["src/*"]
-    //    }
+    "emitDecoratorMetadata": true,
+    "paths": {
+      "~/*": ["src/*"]
+    }
   },
   "exclude": [
     "node_modules",
index 700f4ad2b107eaa3d5ce8f1728a448d64f157343..ae2b1c571627921abf4fc87cee07613423376134 100644 (file)
--- a/yarn.lock
+++ b/yarn.lock
@@ -6226,9 +6226,9 @@ react-router@4.3.1, react-router@^4.2.0, react-router@^4.3.1:
     prop-types "^15.6.1"
     warning "^4.0.1"
 
-react-scripts-ts@2.16.0:
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/react-scripts-ts/-/react-scripts-ts-2.16.0.tgz#45f831a12139c3b59d6bb729c1b6ef51e0f22908"
+react-scripts-ts@2.17.0:
+  version "2.17.0"
+  resolved "https://registry.yarnpkg.com/react-scripts-ts/-/react-scripts-ts-2.17.0.tgz#398bae19a30c9b39b3dfe0720ebb40c60c2f6574"
   dependencies:
     autoprefixer "7.1.6"
     babel-jest "^22.1.0"