Issue/5868 right sidebar

changelogs/unreleased/5938-dependabot.yml

@@ -0,0 +1,5 @@
+change-type: patch
+description: 'Build(deps-dev): Bump eslint-plugin-testing-library from 6.2.2 to 6.3.0'
+destination-branches:
+- master
+sections: {}

package.json

@@ -98,7 +98,7 @@
     "eslint-plugin-prettier": "5.2.1",
     "eslint-plugin-react": "^7.35.0",
     "eslint-plugin-react-hooks": "^4.6.2",
-    "eslint-plugin-testing-library": "^6.2.2",
+    "eslint-plugin-testing-library": "^6.3.0",
     "fetch-mock": "^9.11.0",
     "file-loader": "^6.2.0",
     "git-revision-webpack-plugin": "^5.0.0",

src/Core/Domain/Field.ts

@@ -23,6 +23,7 @@ export type FieldLikeWithFormState = Field;
 interface BaseField {
   name: string;
   description?: string;
+  id?: string;
   isOptional: boolean;
   isDisabled: boolean;
   suggestion?: FormSuggestion | null;

src/Data/Managers/V2/GetInstanceWithRelations/useGetInstanceWithRelations.ts

@@ -1,5 +1,10 @@
 import { UseQueryResult, useQuery } from "@tanstack/react-query";
-import { ServiceInstanceModel } from "@/Core";
+import {
+  EmbeddedEntity,
+  InstanceAttributeModel,
+  ServiceInstanceModel,
+  ServiceModel,
+} from "@/Core";
 import { PrimaryBaseUrlManager } from "@/UI";
 import { useFetchHelpers } from "../helpers";
 
@@ -28,6 +33,7 @@ interface GetInstanceWithRelationsHook {
  */
 export const useGetInstanceWithRelations = (
   instanceId: string,
+  serviceModel: ServiceModel | undefined,
   environment: string,
 ): GetInstanceWithRelationsHook => {
   //extracted headers to avoid breaking rules of Hooks
@@ -61,6 +67,63 @@ export const useGetInstanceWithRelations = (
     return await response.json();
   };
 
+  const getAllRelations = (
+    serviceModel: ServiceModel | EmbeddedEntity,
+  ): string[] => {
+    const relations =
+      serviceModel.inter_service_relations?.map((relation) => relation.name) ||
+      [];
+
+    const nestedRelations = serviceModel.embedded_entities?.flatMap((entity) =>
+      getAllRelations(entity),
+    );
+
+    return [...relations, ...nestedRelations];
+  };
+
+  const getAllEmbeddedEntities = (
+    serviceModel: ServiceModel | EmbeddedEntity,
+  ): string[] => {
+    const embedded = serviceModel.embedded_entities.map(
+      (entity) => entity.name,
+    );
+    const nestedEmbedded = serviceModel.embedded_entities?.flatMap((entity) =>
+      getAllEmbeddedEntities(entity),
+    );
+
+    return [...embedded, ...nestedEmbedded];
+  };
+
+  const findAllRelatedIds = (
+    attributes: InstanceAttributeModel,
+    relationNames: string[],
+    embeddedNames: string[],
+  ): string[] => {
+    const relationIDs = relationNames.map(
+      (relationName) => (attributes[relationName] as string) || "",
+    );
+
+    const embeddedRelationsIDs = embeddedNames.flatMap((embeddedName) => {
+      if (!attributes[embeddedName]) {
+        return "";
+      }
+      if (Array.isArray(attributes[embeddedName])) {
+        return (attributes[embeddedName] as InstanceAttributeModel[]).flatMap(
+          (embedded) =>
+            findAllRelatedIds(embedded, relationNames, embeddedNames),
+        );
+      } else {
+        return findAllRelatedIds(
+          attributes[embeddedName] as InstanceAttributeModel,
+          relationNames,
+          embeddedNames,
+        );
+      }
+    });
+
+    return [...relationIDs, ...embeddedRelationsIDs];
+  };
+
   /**
    * Fetches a service instance with its related instances.
    * @param {string} id - The ID of the instance to fetch.
@@ -70,21 +133,38 @@ export const useGetInstanceWithRelations = (
   const fetchInstances = async (id: string): Promise<InstanceWithRelations> => {
     const relatedInstances: ServiceInstanceModel[] = [];
     const instance = (await fetchInstance(id)).data;
+    let serviceIDs: string[] = [];
 
-    if (instance.referenced_by !== null) {
-      await Promise.all(
-        instance.referenced_by.map(async (relatedId) => {
-          const relatedInstance = await fetchInstance(relatedId);
-
-          if (relatedInstance) {
-            relatedInstances.push(relatedInstance.data);
-          }
+    if (serviceModel) {
+      const whatAttributesToFetch = getAllRelations(serviceModel);
+      const uniqueAttributes = [...new Set(whatAttributesToFetch)];
+      const allEmbedded = getAllEmbeddedEntities(serviceModel);
+      const attributes =
+        instance.active_attributes || instance.candidate_attributes || {}; //we don't operate on rollback attributes
 
-          return relatedInstance;
-        }),
-      );
+      serviceIDs = [
+        ...new Set(
+          findAllRelatedIds(attributes, uniqueAttributes, allEmbedded),
+        ),
+      ].filter((id) => id !== "");
     }
 
+    const allIDs = [
+      ...new Set([...serviceIDs, ...(instance.referenced_by || [])]),
+    ];
+
+    await Promise.all(
+      allIDs.map(async (relatedId) => {
+        const relatedInstance = await fetchInstance(relatedId);
+
+        if (relatedInstance) {
+          relatedInstances.push(relatedInstance.data);
+        }
+
+        return relatedInstance;
+      }),
+    );
+
     return {
       instance,
       relatedInstances,
@@ -105,6 +185,7 @@ export const useGetInstanceWithRelations = (
         ],
         queryFn: () => fetchInstances(instanceId),
         retry: false,
+        enabled: serviceModel !== undefined,
       }),
     useContinuous: (): UseQueryResult<InstanceWithRelations, Error> =>
       useQuery({
@@ -115,6 +196,7 @@ export const useGetInstanceWithRelations = (
         ],
         queryFn: () => fetchInstances(instanceId),
         refetchInterval: 5000,
+        enabled: serviceModel !== undefined,
       }),
   };
 };

src/Slices/CompileDetails/Core/Mock.ts

@@ -20,7 +20,7 @@ export const data: CompileDetails = {
       started: "2021-09-10T09:05:25.000000",
       completed: "2021-09-10T09:05:30.000000",
       command:
-        "/opt/inmanta/bin/python3 -m inmanta.app -vvv export -X -e f7e84432-855c-4d04-b422-50c3ab925a4a",
+        "/opt/inmanta/bin/python3 -m inmanta.app -vvv export  -e f7e84432-855c-4d04-b422-50c3ab925a4a",
       name: "Recompiling configuration model",
       errstream: "error",
       outstream: "success",

src/UI/Components/Diagram/Canvas.test.tsx

@@ -87,7 +87,10 @@ const setup = (
                 instance: instance || null,
                 serviceModels,
                 mainService: mainService,
-                relatedInventories: {} as UseQueryResult<Inventories, Error>,
+                relatedInventories: { data: {} } as UseQueryResult<
+                  Inventories,
+                  Error
+                >,
               }}
             >
               <CanvasProvider>
@@ -284,16 +287,12 @@ beforeAll(() => {
 //   });
 
 it("renders shapes dict Value that can be viewed in dict Modal", async () => {
-  const component = setup(mockedInstanceTwoServiceModel, mockedInstanceTwo, []);
+  const component = setup(mockedInstanceTwoServiceModel, mockedInstanceTwo, [
+    mockedInstanceTwoServiceModel,
+  ]);
 
   render(component);
 
-  const button = await screen.findByJointSelector("toggleButton");
-
-  await act(async () => {
-    await user.click(button);
-  });
-
   const dictValue = await screen.findByJointSelector("itemLabel_dictOne_value");
 
   await act(async () => {
@@ -324,7 +323,6 @@ it("renders shapes dict Value that can be viewed in dict Modal", async () => {
   const blob = await clipboardItems[0].getType(clipboardItems[0].types[0]);
   const clipboardText = await blob.text();
 
-  console.log(clipboardText);
   expect(clipboardText).toEqual("{}");
 
   const closeButton = await screen.findByLabelText("Close");