Delete code smells

Feature #14102

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

diff --git a/src/common/api/common-resource-service.ts b/src/common/api/common-resource-service.ts
index fe7494b4460faf57ee2b5e47f2691c208961ce76..2c9bfb51679f16bef721b4499f0cf00181ddc3f4 100644 (file)
--- a/src/common/api/common-resource-service.ts
+++ b/src/common/api/common-resource-service.ts
@@ -111,7 +111,6 @@ export class CommonResourceService<T extends Resource> {
                 .put<T>(this.resourceType + uuid, data && CommonResourceService.mapKeys(_.snakeCase)(data)));
 
     }
-
 }
 
 export const getCommonResourceServiceError = (errorResponse: any) => {

diff --git a/src/index.tsx b/src/index.tsx
index ecc616629c47616728e0e5a7f1e540c81544d622..ad77162986e01978a1c3cc30f58c002f627388bf 100644 (file)
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -29,6 +29,7 @@ import { collectionActionSet } from './views-components/context-menu/action-sets
 import { collectionResourceActionSet } from './views-components/context-menu/action-sets/collection-resource-action-set';
 import { addRouteChangeHandlers } from './routes/routes';
 import { loadWorkbench } from './store/navigation/navigation-action';
+import { Routes } from '~/routes/routes';
 
 const getBuildNumber = () => "BN-" + (process.env.REACT_APP_BUILD_NUMBER || "dev");
 const getGitCommit = () => "GIT-" + (process.env.REACT_APP_GIT_COMMIT || "latest").substr(0, 7);
@@ -48,7 +49,7 @@ addMenuActionSet(ContextMenuKind.COLLECTION, collectionActionSet);
 addMenuActionSet(ContextMenuKind.COLLECTION_RESOURCE, collectionResourceActionSet);
 
 fetchConfig()
-    .then(async (config) => {
+    .then((config) => {
         const history = createBrowserHistory();
         const services = createServices(config);
         const store = configureStore(history, services);
@@ -65,8 +66,8 @@ fetchConfig()
                 <Provider store={store}>
                     <ConnectedRouter history={history}>
                         <div>
-                            <Route path="/token" component={TokenComponent} />
-                            <Route path="/" component={WorkbenchComponent} />
+                            <Route path={Routes.TOKEN} component={TokenComponent} />
+                            <Route path={Routes.ROOT} component={WorkbenchComponent} />
                         </div>
                     </ConnectedRouter>
                 </Provider>

diff --git a/src/routes/routes.ts b/src/routes/routes.ts
index 2bdd17a5a2eec12f06bce983aa336d6904d9d89d..7ad7389976555a234fc4027fb11a990e5c94e27a 100644 (file)
--- a/src/routes/routes.ts
+++ b/src/routes/routes.ts
@@ -12,6 +12,7 @@ import { loadProject, loadFavorites, loadCollection } from '../store/navigation/
 
 export const Routes = {
     ROOT: '/',
+    TOKEN: '/token',
     PROJECTS: `/projects/:id(${RESOURCE_UUID_PATTERN})`,
     COLLECTIONS: `/collections/:id(${RESOURCE_UUID_PATTERN})`,
     FAVORITES: '/favorites',

diff --git a/src/services/ancestors-service/ancestors-service.ts b/src/services/ancestors-service/ancestors-service.ts
index 5eab8421992760538b35af9761717e575c69a650..1cd42fb523945c3a6a5918b24b0474780dabe908 100644 (file)
--- a/src/services/ancestors-service/ancestors-service.ts
+++ b/src/services/ancestors-service/ancestors-service.ts
@@ -1,13 +1,13 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 import { GroupsService } from "~/services/groups-service/groups-service";
 import { UserService } from '../user-service/user-service';
 import { GroupResource } from '~/models/group';
-import { UserResource } from '../../models/user';
+import { UserResource } from '~/models/user';
 import { extractUuidObjectType, ResourceObjectType } from "~/models/resource";
 
-// Copyright (C) The Arvados Authors. All rights reserved.
-//
-// SPDX-License-Identifier: AGPL-3.0
-
 export class AncestorService {
     constructor(
         private groupsService: GroupsService,

diff --git a/src/store/auth/auth-action.ts b/src/store/auth/auth-action.ts
index 07426b754445a73d9dcb255e17d1adec2e38d392..ac2e0b7e2f68c6e699e294710d582582701b5fc2 100644 (file)
--- a/src/store/auth/auth-action.ts
+++ b/src/store/auth/auth-action.ts
@@ -31,17 +31,16 @@ function removeAuthorizationHeader(client: AxiosInstance) {
     delete client.defaults.headers.common.Authorization;
 }
 
-export const initAuth = () =>
-    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
-        const user = services.authService.getUser();
-        const token = services.authService.getApiToken();
-        if (token) {
-            setAuthorizationHeader(services, token);
-        }
-        if (token && user) {
-            dispatch(authActions.INIT({ user, token }));
-        }
-    };
+export const initAuth = () => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+    const user = services.authService.getUser();
+    const token = services.authService.getApiToken();
+    if (token) {
+        setAuthorizationHeader(services, token);
+    }
+    if (token && user) {
+        dispatch(authActions.INIT({ user, token }));
+    }
+};
 
 export const saveApiToken = (token: string) => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
     services.authService.saveApiToken(token);

diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index a4defc14448ac544d39314bf5d78ed762cb46e5d..a3ee07ee63758978df4cf38d133b015c7fed8632 100644 (file)
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -13,7 +13,6 @@ import { MainAppBar, MainAppBarActionProps, MainAppBarMenuItem } from '~/views-c
 import { Breadcrumb } from '~/components/breadcrumbs/breadcrumbs';
 import { push } from 'react-router-redux';
 import { TreeItem } from "~/components/tree/tree";
-import { getTreePath } from '~/store/project/project-reducer';
 import { ProjectPanel } from "~/views/project-panel/project-panel";
 import { DetailsPanel } from '~/views-components/details-panel/details-panel';
 import { ArvadosTheme } from '~/common/custom-theme';
@@ -161,15 +160,6 @@ export const Workbench = withStyles(styles)(
             };
 
             render() {
-                const path = getTreePath(this.props.projects, this.props.currentProjectId);
-                const breadcrumbs = path.map(item => ({
-                    label: item.data.name,
-                    itemId: item.data.uuid,
-                    status: item.status
-                }));
-
-                const rootProjectUuid = this.props.authService.getUuid();
-
                 const { classes, user } = this.props;
                 return (
                     <div className={classes.root}>