Extra merge corrections in Lineage part

src/app/api/mock/dataset.mock.ts

@@ -238,8 +238,7 @@ export const MOCK_NODES = [
         data: {
             id: "did:odf:z4k88e8qmphemqz8ZfEio3bGRrAjoKtP83U22XidbGtHrUcEghj",
             name: "com.naturalearthdata.admin0.countries.50m",
-            kind: "ROOT",
-            isRoot: true,
+            kind: DatasetKind.Root,
             isCurrent: true,
             color: "#7aa3e5",
             accountName: "kamu",
@@ -263,8 +262,7 @@ export const MOCK_NODES = [
         data: {
             id: "did:odf:z4k88e8h7woj2Njge7MpGneHHEo8nuSA6npPrAroFpETcukCenC",
             name: "com.naturalearthdata.admin0.countries",
-            kind: "DERIVATIVE",
-            isRoot: false,
+            kind: DatasetKind.Derivative,
             isCurrent: false,
             color: "#a8385d",
             accountName: "kamu",

src/app/auth/login/login.component.scss

@@ -1,3 +1,5 @@
+@import 'var';
+
 a {
     text-decoration: none;
     color: $app-dark;

src/app/auth/login/login.component.ts

@@ -12,6 +12,7 @@ import { Observable, shareReplay } from "rxjs";
 @Component({
     selector: "app-login",
     templateUrl: "./login.component.html",
+    styleUrls: ["./login.component.scss"],
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class LoginComponent implements OnInit {

src/app/components/lineage-graph/lineage-graph.component.html

@@ -36,7 +36,7 @@
                 [attr.width]="node.dimension.width"
                 [attr.height]="node.dimension.height * 1.1"
                 [attr.rx]="5"
-                [attr.fill]="node.data.isRoot ? '#ffa500' : '#add8e6'"
+                [attr.fill]="node.data.kind === DatasetKind.Root ? '#ffa500' : '#add8e6'"
                 [attr.cursor]="'pointer'"
                 [attr.stroke]="'black'"
                 [attr.stroke-width]="node.data.isCurrent ? 2 : 1"
@@ -70,14 +70,18 @@
                     [attr.y]="-12"
                     [attr.width]="20"
                     [attr.height]="20"
-                    [attr.href]="node.data.isRoot ? '../assets/images/public.png' : '../assets/images/private.png'"
+                    [attr.href]="
+                        node.data.kind === DatasetKind.Root
+                            ? '../assets/images/public.png'
+                            : '../assets/images/private.png'
+                    "
                 />
             </svg:g>
             <svg:g [attr.transform]="'translate(' + node.dimension.width + ', 0)'">
                 <svg:rect
-                    [attr.x]="node.data.isRoot ? -20 : -40"
+                    [attr.x]="node.data.kind === DatasetKind.Root ? -20 : -40"
                     y="-12"
-                    [attr.width]="node.data.isRoot ? 40 : 80"
+                    [attr.width]="node.data.kind === DatasetKind.Root ? 40 : 80"
                     height="24"
                     rx="10"
                     [attr.stroke]="'#262626'"
@@ -91,7 +95,7 @@
                     fill="black"
                     style="font-size: 12px"
                 >
-                    {{ node.data.isRoot ? "Root" : "Derivative" }}
+                    {{ node.data.kind }}
                 </svg:text>
             </svg:g>
         </svg:g>

src/app/components/lineage-graph/lineage-graph.component.ts

@@ -12,7 +12,7 @@ import {
 import { Edge, MiniMapPosition } from "@swimlane/ngx-graph";
 import { ClusterNode, Node } from "@swimlane/ngx-graph/lib/models/node.model";
 import { Observable } from "rxjs";
-import { AccountDetailsFragment } from "src/app/api/kamu.graphql.interface";
+import { AccountDetailsFragment, DatasetKind } from "src/app/api/kamu.graphql.interface";
 import AppValues from "src/app/common/app.values";
 import { AccountService } from "src/app/services/account.service";
 
@@ -42,7 +42,9 @@ export class LineageGraphComponent implements OnChanges, OnInit {
     public miniMapPosition: MiniMapPosition;
     public graphClusters: ClusterNode[];
     public graphNodes: Node[];
+
     public readonly DEFAULT_AVATAR_URL = AppValues.DEFAULT_AVATAR_URL;
+    public readonly DatasetKind: typeof DatasetKind = DatasetKind;
 
     constructor(private accountService: AccountService) {}
 

src/app/dataset-view/additional-components/lineage-component/lineage-model.ts

@@ -1,10 +1,15 @@
 import { DatasetKind } from "src/app/api/kamu.graphql.interface";
 
+export enum LineageNodeAccess {
+    PRIVATE = "private",
+    PUBLIC = "public",
+}
+
 export interface LineageNodeData {
     id: string;
     name: string;
     kind: DatasetKind;
-    isRoot: boolean;
     isCurrent: boolean;
-    owner: string;
+    access: LineageNodeAccess;
+    accountName: string;
 }

src/app/dataset-view/additional-components/lineage-component/lineage.component.ts

@@ -13,6 +13,7 @@ import { DatasetBasicsFragment, DatasetKind } from "src/app/api/kamu.graphql.int
 import { BaseComponent } from "src/app/common/base.component";
 import { LineageUpdate } from "../../dataset.subscriptions.interface";
 import { DatasetSubscriptionsService } from "../../dataset.subscriptions.service";
+import { LineageNodeAccess, LineageNodeData } from "./lineage-model";
 
 @Component({
     selector: "app-lineage",
@@ -104,11 +105,10 @@ export class LineageComponent extends BaseComponent implements OnInit {
                     id: dataset.id,
                     name: dataset.name,
                     kind: dataset.kind,
-                    isRoot: dataset.kind === DatasetKind.Root,
                     isCurrent: dataset.id === currentDataset.id,
-                    access: "private",
+                    access: LineageNodeAccess.PRIVATE,
                     accountName: dataset.owner.name,
-                },
+                } as LineageNodeData,
             });
         }
 

src/app/dataset-view/dataset.component.spec.ts

@@ -257,7 +257,7 @@ describe("DatasetComponent", () => {
         component.onClickLineageNode(mockNode);
 
         const mockNodeData: LineageNodeData = mockNode.data as LineageNodeData;
-        expect(selectDatasetSpy).toHaveBeenCalledWith(mockNodeData.owner, mockNodeData.name);
+        expect(selectDatasetSpy).toHaveBeenCalledWith(mockNodeData.accountName, mockNodeData.name);
     });
 
     it("should check navigate to overview tab", () => {

src/app/dataset-view/dataset.component.ts

@@ -163,7 +163,7 @@ export class DatasetComponent extends BaseProcessingComponent implements OnInit,
 
     public onClickLineageNode(node: Node): void {
         const nodeData: LineageNodeData = node.data as LineageNodeData;
-        this.onSelectDataset(nodeData.owner, nodeData.name);
+        this.onSelectDataset(nodeData.accountName, nodeData.name);
     }
 
     private initDatasetViewByType(datasetInfo: DatasetInfo, currentPage: number): void {

src/app/search/mock.data.ts

@@ -29,6 +29,10 @@ import {
     MergeKind,
 } from "../dataset-view/additional-components/metadata-component/components/add-polling-source/add-polling-source-form.types";
 import { DatasetHistoryUpdate } from "../dataset-view/dataset.subscriptions.interface";
+import {
+    LineageNodeAccess,
+    LineageNodeData,
+} from "../dataset-view/additional-components/lineage-component/lineage-model";
 
 export const mockPageBasedInfo: PageBasedInfo = {
     currentPage: 1,
@@ -954,5 +958,12 @@ export const mockHistoryEditPollingSourceService: DatasetHistoryUpdate = {
 export const mockNode: Node = {
     id: "testId",
     label: "british-columbia.case-details.hm",
-    data: mockDatasetBasicsDerivedFragment,
+    data: {
+        id: mockDatasetBasicsDerivedFragment.id,
+        name: mockDatasetBasicsDerivedFragment.name,
+        kind: mockDatasetBasicsDerivedFragment.kind,
+        isCurrent: false,
+        access: LineageNodeAccess.PUBLIC,
+        accountName: mockDatasetBasicsDerivedFragment.owner.name,
+    } as LineageNodeData,
 };