remarks + tsc fix

inmanta · Nov 7, 2024 · ab9be97 · ab9be97
1 parent ce03415
commit ab9be97
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/src/Data/Managers/V2/GETTERS/GetInstanceWithRelations/useGetInstanceWithRelations.test.tsx b/src/Data/Managers/V2/GETTERS/GetInstanceWithRelations/useGetInstanceWithRelations.test.tsx
@@ -178,7 +178,12 @@ test("if the fetched instance has inter-service relation(s) in the model, and th
   );
   const { result } = renderHook(
     () =>
-      useGetInstanceWithRelations("child_id", "env", childModel).useOneTime(),
+      useGetInstanceWithRelations(
+        "child_id",
+        "env",
+        false,
+        childModel,
+      ).useOneTime(),
     {
       wrapper: createWrapper(),
     },

diff --git a/src/UI/Components/Diagram/Context/ComposerEditorProvider.test.tsx b/src/UI/Components/Diagram/Context/ComposerEditorProvider.test.tsx
@@ -26,7 +26,7 @@ import {
 import { defineObjectsForJointJS } from "../testSetup";
 import { ComposerEditorProvider } from "./ComposerEditorProvider";
 
-const setup = (editable: boolean = false, instanceId: string) => {
+const setup = (instanceId: string, editable: boolean = true) => {
   const queryClient = new QueryClient({
     defaultOptions: {
       queries: {
@@ -126,7 +126,7 @@ describe("ComposerEditorProvider", () => {
       }),
     );
 
-    render(setup(true, "13920268-cce0-4491-93b5-11316aa2fc37"));
+    render(setup("13920268-cce0-4491-93b5-11316aa2fc37"));
 
     expect(
       await screen.findByRole("region", {
@@ -146,7 +146,7 @@ describe("ComposerEditorProvider", () => {
   });
 
   it("if there is error when fetching related inventories the error view is shown", async () => {
-    render(setup(true, "13920268-cce0-4491-93b5-11316aa2fc37"));
+    render(setup("13920268-cce0-4491-93b5-11316aa2fc37"));
 
     server.use(
       http.get("/lsm/v1/service_inventory/parent-service", async () => {
@@ -175,7 +175,7 @@ describe("ComposerEditorProvider", () => {
   });
 
   it("if there is error when fetching instance with relations the error view is shown", async () => {
-    render(setup(true, "13920268-cce0-4491-93b5-11316aa2fc37"));
+    render(setup("13920268-cce0-4491-93b5-11316aa2fc37"));
 
     server.use(
       http.get("/lsm/v1/service_inventory", async () => {
@@ -212,7 +212,7 @@ describe("ComposerEditorProvider", () => {
       }),
     );
 
-    render(setup(true, "13920268-cce0-4491-93b5-11316aa2fc37"));
+    render(setup("13920268-cce0-4491-93b5-11316aa2fc37"));
 
     expect(
       await screen.findByRole("region", {
@@ -236,22 +236,22 @@ describe("ComposerEditorProvider", () => {
   });
 
   it("if provider is editable show Instance Composer Editor title ", async () => {
-    render(setup(true, "13920268-cce0-4491-93b5-11316aa2fc37"));
+    render(setup("13920268-cce0-4491-93b5-11316aa2fc37"));
 
     const title = await screen.findByText("Instance Composer Editor");
 
     expect(title).toBeInTheDocument();
   });
   it("if provider is editable show Instance Composer Editor title ", async () => {
-    render(setup(false, "13920268-cce0-4491-93b5-11316aa2fc37"));
+    render(setup("13920268-cce0-4491-93b5-11316aa2fc37", false));
 
     const title = await screen.findByText("Instance Composer Viewer");
 
     expect(title).toBeInTheDocument();
   });
 
   it("navigating out of the View works correctly", async () => {
-    render(setup(true, "13920268-cce0-4491-93b5-11316aa2fc37"));
+    render(setup("13920268-cce0-4491-93b5-11316aa2fc37"));
 
     expect(window.location.pathname).toEqual("/");
 

diff --git a/src/UI/Components/Diagram/Context/ComposerEditorProvider.tsx b/src/UI/Components/Diagram/Context/ComposerEditorProvider.tsx
@@ -1,6 +1,5 @@
 import React, { useContext, useEffect, useMemo, useState } from "react";
 import { Flex, FlexItem } from "@patternfly/react-core";
-import { ServiceModel } from "@/Core";
 import { useGetAllServiceModels } from "@/Data/Managers/V2/GETTERS/GetAllServiceModels";
 import { useGetInstanceWithRelations } from "@/Data/Managers/V2/GETTERS/GetInstanceWithRelations";
 import { useGetInventoryList } from "@/Data/Managers/V2/GETTERS/GetInventoryList";
@@ -136,11 +135,16 @@ export const ComposerEditorProvider: React.FC<Props> = ({
     return renderErrorView(message, ariaLabel, retry);
   }
 
-  if (serviceModelsQuery.isSuccess && instanceWithRelationsQuery.isSuccess) {
+  if (
+    serviceModelsQuery.isSuccess &&
+    instanceWithRelationsQuery.isSuccess &&
+    mainService
+  ) {
+    // there is no possibility to instanceWithRelationsQuery be in success state without mainService, and there is assertion above the if services are fetch but there is no mainService to display errorView
     return (
       <InstanceComposerContext.Provider
         value={{
-          mainService: mainService as ServiceModel, // there is no possibility to instanceWithRelationsQuery be in success state without mainService, and there is assertion above the if services are fetch but there is no mainService to display errorView
+          mainService: mainService,
           serviceModels: serviceModelsQuery.data,
           instance: instanceWithRelationsQuery.data,
           relatedInventoriesQuery: relatedInventoriesQuery,