From: Daniel Kos <daniel.kos@contractors.roche.com>
Date: Fri, 17 Aug 2018 06:55:56 +0000 (+0200)
Subject: refs #master Merge branch 'origin/master' into 13986-projects-list-and-default-routing
X-Git-Tag: 1.3.0~152^2~6
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/eb4491eea9ba873845f7a5796d139d19977f8112

refs #master Merge branch 'origin/master' into 13986-projects-list-and-default-routing

# Conflicts:
#	src/store/navigation/navigation-action.ts

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

eb4491eea9ba873845f7a5796d139d19977f8112
diff --cc src/store/navigation/navigation-action.ts
index dfffb9cf,79d24471..981b852f
--- a/src/store/navigation/navigation-action.ts
+++ b/src/store/navigation/navigation-action.ts
@@@ -3,27 -3,26 +3,27 @@@
  // SPDX-License-Identifier: AGPL-3.0
  
  import { Dispatch } from "redux";
 -import { projectActions, getProjectList } from "../project/project-action";
 +import { getProjectList, projectActions } 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 { 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) {
 -        case ResourceKind.PROJECT: return getProjectUrl(resource.uuid);
 -        case ResourceKind.COLLECTION: return getCollectionUrl(resource.uuid);
 -        default: return resource.href;
 +export const getResourceUrl = (resourceKind: ResourceKind, resourceUuid: string): string => {
 +    switch (resourceKind) {
 +        case ResourceKind.PROJECT: return getProjectUrl(resourceUuid);
 +        case ResourceKind.COLLECTION: return getCollectionUrl(resourceUuid);
 +        default:
 +            return '';
      }
  };