Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions frontend/src/app/common/util/predicate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,13 @@
export function isDefined<T>(val: T | undefined | null): val is T {
return val !== undefined && val != null;
}

/**
* checks that the given value is a non-null object in the `typeof` sense,
* guarding against the JavaScript quirk that `typeof null === "object"`.
* @param x
* @returns {boolean}
*/
export function isNonNullObject(x: unknown): x is object {
return typeof x === "object" && x !== null;
}
11 changes: 6 additions & 5 deletions frontend/src/app/dashboard/type/type-predicates.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,24 @@ import { DashboardProject } from "./dashboard-project.interface";
import { DashboardFile } from "./dashboard-file.interface";
import { DashboardDataset } from "./dashboard-dataset.interface";
import { DashboardWorkflowComputingUnit } from "../../common/type/workflow-computing-unit";
import { isNonNullObject } from "../../common/util/predicate";

export function isDashboardWorkflow(value: any): value is DashboardWorkflow {
return value && typeof value.workflow === "object";
return !!value && isNonNullObject(value.workflow);
}

export function isDashboardProject(value: any): value is DashboardProject {
return value && typeof value.name === "string" && !value.workflow;
return !!value && typeof value.name === "string" && !value.workflow;
}

export function isDashboardFile(value: any): value is DashboardFile {
return value && typeof value.ownerEmail === "string" && typeof value.file === "object";
return !!value && typeof value.ownerEmail === "string" && isNonNullObject(value.file);
}

export function isDashboardDataset(value: any): value is DashboardDataset {
return value && typeof value.dataset === "object";
return !!value && isNonNullObject(value.dataset);
}

export function isDashboardWorkflowComputingUnit(value: any): value is DashboardWorkflowComputingUnit {
return value && typeof value.computingUnit === "object";
return !!value && isNonNullObject(value.computingUnit);
}
Loading