diff --git a/frontend/src/app/dashboard/type/type-predicates.ts b/frontend/src/app/dashboard/type/type-predicates.ts index 8c128b2c113..ae4217d79e9 100644 --- a/frontend/src/app/dashboard/type/type-predicates.ts +++ b/frontend/src/app/dashboard/type/type-predicates.ts @@ -22,24 +22,23 @@ 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 && isNonNullObject(value.workflow); + return value && typeof value.workflow === "object"; } 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" && isNonNullObject(value.file); + return value && typeof value.ownerEmail === "string" && typeof value.file === "object"; } export function isDashboardDataset(value: any): value is DashboardDataset { - return !!value && isNonNullObject(value.dataset); + return value && typeof value.dataset === "object"; } export function isDashboardWorkflowComputingUnit(value: any): value is DashboardWorkflowComputingUnit { - return !!value && isNonNullObject(value.computingUnit); + return value && typeof value.computingUnit === "object"; }