From: Lucas Di Pentima <lucas.dipentima@curii.com>
Date: Thu, 1 Jul 2021 22:06:14 +0000 (-0300)
Subject: 17782: Further imports fixing.
X-Git-Tag: 2.2.2~29^2~19
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/72c96df2084737a996e863ac3efbc714858862a0

17782: Further imports fixing.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima@curii.com>
---

diff --git a/src/services/api/order-builder.ts b/src/services/api/order-builder.ts
index a624605f..3fc49009 100644
--- a/src/services/api/order-builder.ts
+++ b/src/services/api/order-builder.ts
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { snakeCase } from "lodash";
-import { Resource } from "src/models/resource";
+import { Resource } from "models/resource";
 
 export enum OrderDirection { ASC, DESC }
 
diff --git a/src/services/auth-service/auth-service.ts b/src/services/auth-service/auth-service.ts
index de960070..362f7b51 100644
--- a/src/services/auth-service/auth-service.ts
+++ b/src/services/auth-service/auth-service.ts
@@ -5,7 +5,7 @@
 import { User, UserPrefs, getUserDisplayName } from 'models/user';
 import { AxiosInstance } from "axios";
 import { ApiActions } from "services/api/api-actions";
-import * as uuid from "uuid/v4";
+import uuid from "uuid/v4";
 import { Session, SessionStatus } from "models/session";
 import { Config } from "common/config";
 import { uniqBy } from "lodash";
diff --git a/src/services/common-service/common-resource-service.test.ts b/src/services/common-service/common-resource-service.test.ts
index a64fb029..b94756ae 100644
--- a/src/services/common-service/common-resource-service.test.ts
+++ b/src/services/common-service/common-resource-service.test.ts
@@ -5,7 +5,7 @@
 import { CommonResourceService } from "./common-resource-service";
 import axios, { AxiosInstance } from "axios";
 import MockAdapter from "axios-mock-adapter";
-import { Resource } from "src/models/resource";
+import { Resource } from "models/resource";
 import { ApiActions } from "services/api/api-actions";
 
 const actions: ApiActions = {
diff --git a/src/services/common-service/common-resource-service.ts b/src/services/common-service/common-resource-service.ts
index f2048c6b..66e694a0 100644
--- a/src/services/common-service/common-resource-service.ts
+++ b/src/services/common-service/common-resource-service.ts
@@ -4,7 +4,7 @@
 
 import { AxiosInstance } from "axios";
 import { snakeCase } from "lodash";
-import { Resource } from "src/models/resource";
+import { Resource } from "models/resource";
 import { ApiActions } from "services/api/api-actions";
 import { CommonService } from "services/common-service/common-service";
 
diff --git a/src/services/common-service/trashable-resource-service.ts b/src/services/common-service/trashable-resource-service.ts
index f0555299..4d6b130b 100644
--- a/src/services/common-service/trashable-resource-service.ts
+++ b/src/services/common-service/trashable-resource-service.ts
@@ -4,7 +4,7 @@
 
 import { snakeCase } from "lodash";
 import { AxiosInstance } from "axios";
-import { TrashableResource } from "src/models/resource";
+import { TrashableResource } from "models/resource";
 import { CommonResourceService } from "services/common-service/common-resource-service";
 import { ApiActions } from "services/api/api-actions";
 
diff --git a/src/store/all-processes-panel/all-processes-panel-middleware-service.ts b/src/store/all-processes-panel/all-processes-panel-middleware-service.ts
index cee6c36a..88b64e62 100644
--- a/src/store/all-processes-panel/all-processes-panel-middleware-service.ts
+++ b/src/store/all-processes-panel/all-processes-panel-middleware-service.ts
@@ -10,7 +10,7 @@ import { allProcessesPanelActions } from "./all-processes-panel-action";
 import { Dispatch, MiddlewareAPI } from "redux";
 import { resourcesActions } from "store/resources/resources-actions";
 import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions';
-import { progressIndicatorActions } from 'store/progress-indicator/progress-indicator-actions.ts';
+import { progressIndicatorActions } from 'store/progress-indicator/progress-indicator-actions';
 import { getDataExplorer, DataExplorer, getSortColumn } from "store/data-explorer/data-explorer-reducer";
 import { loadMissingProcessesInformation } from "store/project-panel/project-panel-middleware-service";
 import { DataColumns } from "components/data-table/data-table";
diff --git a/src/store/favorite-panel/favorite-panel-middleware-service.ts b/src/store/favorite-panel/favorite-panel-middleware-service.ts
index b3bba27d..cb45e68e 100644
--- a/src/store/favorite-panel/favorite-panel-middleware-service.ts
+++ b/src/store/favorite-panel/favorite-panel-middleware-service.ts
@@ -18,7 +18,7 @@ import { LinkResource } from "models/link";
 import { GroupContentsResource, GroupContentsResourcePrefix } from "services/groups-service/groups-service";
 import { resourcesActions } from "store/resources/resources-actions";
 import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions';
-import { progressIndicatorActions } from 'store/progress-indicator/progress-indicator-actions.ts';
+import { progressIndicatorActions } from 'store/progress-indicator/progress-indicator-actions';
 import { getDataExplorer } from "store/data-explorer/data-explorer-reducer";
 import { loadMissingProcessesInformation } from "store/project-panel/project-panel-middleware-service";
 import { getSortColumn } from "store/data-explorer/data-explorer-reducer";
diff --git a/src/store/open-in-new-tab/open-in-new-tab.actions.ts b/src/store/open-in-new-tab/open-in-new-tab.actions.ts
index 92d1a45f..94aec140 100644
--- a/src/store/open-in-new-tab/open-in-new-tab.actions.ts
+++ b/src/store/open-in-new-tab/open-in-new-tab.actions.ts
@@ -2,12 +2,12 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import * as copy from 'copy-to-clipboard';
+import copy from 'copy-to-clipboard';
 import { ResourceKind } from 'models/resource';
 import { getClipboardUrl } from 'views-components/context-menu/actions/helpers';
 
 const getUrl = (resource: any) => {
-    let url = null;
+    let url: string | null = null;
     const { uuid, kind } = resource;
 
     if (kind === ResourceKind.COLLECTION) {
diff --git a/src/store/sharing-dialog/sharing-dialog-actions.ts b/src/store/sharing-dialog/sharing-dialog-actions.ts
index 2f624399..54ad6791 100644
--- a/src/store/sharing-dialog/sharing-dialog-actions.ts
+++ b/src/store/sharing-dialog/sharing-dialog-actions.ts
@@ -17,7 +17,7 @@ import { getPublicGroupUuid } from "store/workflow-panel/workflow-panel-actions"
 import { PermissionResource } from 'models/permission';
 import { differenceWith } from "lodash";
 import { withProgress } from "store/progress-indicator/with-progress";
-import { progressIndicatorActions } from 'store/progress-indicator/progress-indicator-actions.ts';
+import { progressIndicatorActions } from 'store/progress-indicator/progress-indicator-actions';
 import { snackbarActions, SnackbarKind } from "../snackbar/snackbar-actions";
 import { extractUuidKind, ResourceKind } from "models/resource";
 
diff --git a/src/views-components/resource-properties-form/property-key-field.tsx b/src/views-components/resource-properties-form/property-key-field.tsx
index 2c047e58..029d44cc 100644
--- a/src/views-components/resource-properties-form/property-key-field.tsx
+++ b/src/views-components/resource-properties-form/property-key-field.tsx
@@ -16,7 +16,7 @@ import {
     buildProps
 } from 'views-components/resource-properties-form/property-field-common';
 import { TAG_KEY_VALIDATION } from 'validators/validators';
-import { escapeRegExp } from 'common/regexp.ts';
+import { escapeRegExp } from 'common/regexp';
 import { ChangeEvent } from 'react';
 
 export const PROPERTY_KEY_FIELD_NAME = 'key';
diff --git a/src/views-components/resource-properties-form/property-value-field.tsx b/src/views-components/resource-properties-form/property-value-field.tsx
index 5b09e148..a2b53b3c 100644
--- a/src/views-components/resource-properties-form/property-value-field.tsx
+++ b/src/views-components/resource-properties-form/property-value-field.tsx
@@ -17,7 +17,7 @@ import {
     buildProps
 } from 'views-components/resource-properties-form/property-field-common';
 import { TAG_VALUE_VALIDATION } from 'validators/validators';
-import { escapeRegExp } from 'common/regexp.ts';
+import { escapeRegExp } from 'common/regexp';
 import { ChangeEvent } from 'react';
 
 interface PropertyKeyProp {
diff --git a/src/views-components/webdav-s3-dialog/webdav-s3-dialog.test.tsx b/src/views-components/webdav-s3-dialog/webdav-s3-dialog.test.tsx
index 67d5aa2e..ec0a9c8a 100644
--- a/src/views-components/webdav-s3-dialog/webdav-s3-dialog.test.tsx
+++ b/src/views-components/webdav-s3-dialog/webdav-s3-dialog.test.tsx
@@ -12,9 +12,6 @@ import { WithDialogProps } from 'store/dialog/with-dialog';
 import { WebDavS3InfoDialogData, COLLECTION_WEBDAV_S3_DIALOG_NAME } from 'store/collections/collection-info-actions';
 import { Provider } from "react-redux";
 import { createStore, combineReducers } from 'redux';
-// import { configureStore, RootStore } from 'store/store';
-// import { createBrowserHistory } from "history";
-// import { createServices } from "services/services";
 
 configure({ adapter: new Adapter() });