Issue/6174 instance query [DRAFT]

changelogs/unreleased/6174-instance-query.yml

@@ -0,0 +1,6 @@
+description: Improve Query Management for service and service instance queries with replacement of v1 queries with react-query implementation
+issue-nr: 6178
+change-type: patch
+destination-branches: [master, iso8]
+sections:
+  minor-improvement: "{{description}}"

cypress/e2e/scenario-2.2-child-parent-service.cy.js

@@ -139,7 +139,7 @@ if (Cypress.env("edition") === "iso") {
       cy.get("#parent-service").contains("Show inventory").click();
       cy.get('[data-label="State"]')
         .eq(0)
-        .should("have.text", "up", { timeout: 90000 });
+        .should("have.text", "up", { timeout: 120000 });
 
       // try delete item (Should not be possible)
       cy.get('[aria-label="row actions toggle"]', { timeout: 60000 }).click();

cypress/e2e/scenario-8-instance-composer.cy.js

@@ -425,13 +425,14 @@ if (Cypress.env("edition") === "iso") {
 
       //Drag extra_embedded onto canvas and assert that is highlighted as loose element
       cy.get('[aria-labelledby="bodyTwo_extra_embedded"]')
-        .trigger("mouseover")
-        .trigger("mousedown")
+        .trigger("mouseover", { force: true }) // sometimes cypress doesn't trigger the event as text in that element is in front of the component
+        .trigger("mousedown", { force: true })
         .trigger("mousemove", {
+          force: true,
           clientX: 800,
           clientY: 500,
         })
-        .trigger("mouseup");
+        .trigger("mouseup", { force: true });
 
       cy.get(".joint-loose_element-highlight").should("be.visible");
 
@@ -450,13 +451,14 @@ if (Cypress.env("edition") === "iso") {
 
       //Drag once again extra_embedded onto canvas and assert that is highlighted as loose element
       cy.get('[aria-labelledby="bodyTwo_extra_embedded"]')
-        .trigger("mouseover")
-        .trigger("mousedown")
+        .trigger("mouseover", { force: true }) // sometimes cypress doesn't trigger the event as text in that element is in front of the component
+        .trigger("mousedown", { force: true })
         .trigger("mousemove", {
+          force: true,
           clientX: 800,
           clientY: 500,
         })
-        .trigger("mouseup");
+        .trigger("mouseup", { force: true });
 
       cy.get(".joint-loose_element-highlight").should("be.visible");
 
@@ -516,13 +518,14 @@ if (Cypress.env("edition") === "iso") {
       cy.get("#inventory-tab").click();
 
       cy.get('[aria-labelledby="bodyTwo_test_name"]')
-        .trigger("mouseover")
-        .trigger("mousedown")
+        .trigger("mouseover", { force: true }) // sometimes cypress doesn't trigger the event as text in that element is in front of the component
+        .trigger("mousedown", { force: true })
         .trigger("mousemove", {
+          force: true,
           clientX: 800,
           clientY: 500,
         })
-        .trigger("mouseup");
+        .trigger("mouseup", { force: true });
 
       //highlighted loose element should be visible
       cy.get(".joint-loose_element-highlight").should("be.visible");
@@ -537,7 +540,7 @@ if (Cypress.env("edition") === "iso") {
           clientX: 800,
           clientY: 500,
         })
-        .trigger("mouseup");
+        .trigger("mouseup", { force: true });
 
       //highlighted loose element should be removed
       cy.get(".joint-loose_element-highlight").should("not.exist");
@@ -548,13 +551,14 @@ if (Cypress.env("edition") === "iso") {
       cy.get('[data-name="fit-to-screen"]').click();
 
       cy.get('[aria-labelledby="bodyTwo_test_name2"]')
-        .trigger("mouseover")
-        .trigger("mousedown")
+        .trigger("mouseover", { force: true }) // sometimes cypress doesn't trigger the event as text in that element is in front of the component
+        .trigger("mousedown", { force: true })
         .trigger("mousemove", {
+          force: true,
           clientX: 600,
           clientY: 400,
         })
-        .trigger("mouseup");
+        .trigger("mouseup", { force: true });
       cy.get('[data-name="fit-to-screen"]').click();
       cy.get('[data-type="app.ServiceEntityBlock"')
         .contains("embedded")
@@ -828,13 +832,14 @@ if (Cypress.env("edition") === "iso") {
       cy.get("#inventory-tab").click();
 
       cy.get('[aria-labelledby="bodyTwo_test_name"]')
-        .trigger("mouseover")
-        .trigger("mousedown")
+        .trigger("mouseover", { force: true }) // sometimes cypress doesn't trigger the event as text in that element is in front of the component
+        .trigger("mousedown", { force: true })
         .trigger("mousemove", {
+          force: true,
           clientX: 800,
           clientY: 600,
         })
-        .trigger("mouseup");
+        .trigger("mouseup", { force: true });
 
       cy.get('[data-type="app.ServiceEntityBlock"')
         .contains("child-service")
@@ -851,6 +856,8 @@ if (Cypress.env("edition") === "iso") {
       cy.get('[data-type="Link"]').should("have.length", 1);
 
       cy.get("button").contains("Deploy").click();
+
+      cy.wait(500); //sometimes the navigation is too fast and the redirect isn't being received properly
       cy.get('[aria-label="Sidebar-Navigation-Item"]')
         .contains("Service Catalog")
         .click();
@@ -903,13 +910,14 @@ if (Cypress.env("edition") === "iso") {
         .click();
 
       cy.get('[aria-labelledby="bodyTwo_test_name2"]')
-        .trigger("mouseover")
-        .trigger("mousedown")
+        .trigger("mouseover", { force: true }) // sometimes cypress doesn't trigger the event as text in that element is in front of the component
+        .trigger("mousedown", { force: true })
         .trigger("mousemove", {
+          force: true,
           clientX: 800,
           clientY: 500,
         })
-        .trigger("mouseup");
+        .trigger("mouseup", { force: true });
 
       cy.get('[data-type="app.ServiceEntityBlock"')
         .contains("child-service")
@@ -921,7 +929,7 @@ if (Cypress.env("edition") === "iso") {
           clientX: 800,
           clientY: 500,
         })
-        .trigger("mouseup");
+        .trigger("mouseup", { force: true });
 
       cy.get('[data-testid="Error-container"]').should("not.exist");
 
@@ -936,6 +944,11 @@ if (Cypress.env("edition") === "iso") {
         .contains("Show inventory")
         .click();
 
+      // await until parent_service is deployed and up
+      cy.get('[data-label="State"]', { timeout: 90000 }).should(
+        "have.text",
+        "update_start",
+      );
       // await until parent_service is deployed and up
       cy.get('[data-label="State"]', { timeout: 90000 }).should(
         "have.text",
@@ -1014,13 +1027,14 @@ if (Cypress.env("edition") === "iso") {
 
       //add first inter-service relation
       cy.get('[aria-labelledby="bodyTwo_test_name"]')
-        .trigger("mouseover")
-        .trigger("mousedown")
+        .trigger("mouseover", { force: true }) // sometimes cypress doesn't trigger the event as text in that element is in front of the component
+        .trigger("mousedown", { force: true })
         .trigger("mousemove", {
+          force: true,
           clientX: 800,
           clientY: 500,
         })
-        .trigger("mouseup");
+        .trigger("mouseup", { force: true });
 
       cy.get('[data-type="app.ServiceEntityBlock"')
         .contains("child-with-many")
@@ -1036,13 +1050,14 @@ if (Cypress.env("edition") === "iso") {
 
       //add second inter-service relation
       cy.get('[aria-labelledby="bodyTwo_test_name2"]')
-        .trigger("mouseover")
-        .trigger("mousedown")
+        .trigger("mouseover", { force: true }) // sometimes cypress doesn't trigger the event as text in that element is in front of the component
+        .trigger("mousedown", { force: true })
         .trigger("mousemove", {
+          force: true,
           clientX: 800,
           clientY: 700,
         })
-        .trigger("mouseup");
+        .trigger("mouseup", { force: true });
 
       cy.get('[data-type="app.ServiceEntityBlock"')
         .contains("child-with-many")

src/Core/Command/Command.ts

@@ -2,19 +2,7 @@ import {
   ControlAgent,
   ControlAgentManifest,
 } from "@/Data/Managers/ControlAgent/interface";
-import {
-  DeleteInstance,
-  DeleteInstanceManifest,
-} from "@/Data/Managers/DeleteInstance/interface";
-import {
-  DeleteService,
-  DeleteServiceManifest,
-} from "@/Data/Managers/DeleteService/interface";
 import { Deploy, DeployManifest } from "@/Data/Managers/Deploy/interface";
-import {
-  DestroyInstance,
-  DestroyInstanceManifest,
-} from "@/Data/Managers/DestroyInstance/interface";
 import {
   ResetEnvironmentSetting,
   ResetEnvironmentSettingManifest,
@@ -35,10 +23,6 @@ import {
   HaltEnvironment,
   HaltEnvironmentManifest,
 } from "@/Data/Managers/HaltEnvironment/interface";
-import {
-  UpdateInstanceConfig,
-  UpdateInstanceConfigManifest,
-} from "@/Data/Managers/InstanceConfig/interfaces";
 import {
   ModifyEnvironment,
   ModifyEnvironmentManifest,
@@ -48,10 +32,6 @@ import {
   ResumeEnvironment,
   ResumeEnvironmentManifest,
 } from "@/Data/Managers/ResumeEnvironment/interface";
-import {
-  UpdateServiceConfig,
-  UpdateServiceConfigManifest,
-} from "@/Data/Managers/ServiceConfig/interfaces";
 import {
   TriggerCompile,
   TriggerCompileManifest,
@@ -60,22 +40,6 @@ import {
   TriggerDryRun,
   TriggerDryRunManifest,
 } from "@/Data/Managers/TriggerDryRun/interface";
-import {
-  TriggerForceState,
-  TriggerForceStateManifest,
-} from "@/Data/Managers/TriggerForceState/interface";
-import {
-  TriggerSetState,
-  TriggerSetStateManifest,
-} from "@/Data/Managers/TriggerSetState/interface";
-import {
-  UpdateCatalog,
-  UpdateCatalogManifest,
-} from "@/Data/Managers/UpdateCatalog/interface";
-import {
-  UpdateInstanceAttribute,
-  UpdateInstanceAttributeManifest,
-} from "@/Data/Managers/UpdateInstanceAttribute/interface";
 
 import * as CreateEnvironment from "@S/CreateEnvironment/Core/CreateEnvironmentCommand";
 import * as CreateProject from "@S/CreateEnvironment/Core/CreateProjectCommand";
@@ -96,28 +60,19 @@ export type Command =
   | CreateProject.Command
   | DeleteCallback.Command
   | DeleteEnvironment.Command
-  | DeleteInstance
-  | DestroyInstance
-  | DeleteService
   | Deploy
   | GenerateToken
   | GetSupportArchive
   | HaltEnvironment
   | ModifyEnvironment
-  | UpdateCatalog
   | Repair
   | ResetEnvironmentSetting
   | ResumeEnvironment
   | TriggerCompile
   | TriggerDryRun
   | TriggerInstanceUpdate.Command
-  | TriggerSetState
-  | TriggerForceState
   | UpdateEnvironmentSetting
-  | UpdateInstanceAttribute
-  | UpdateInstanceConfig
-  | UpdateNotification.Command
-  | UpdateServiceConfig;
+  | UpdateNotification.Command;
 
 export type Type = Command;
 
@@ -134,28 +89,19 @@ interface Manifest {
   CreateProject: CreateProject.Manifest;
   DeleteCallback: DeleteCallback.Manifest;
   DeleteEnvironment: DeleteEnvironment.Manifest;
-  DeleteInstance: DeleteInstanceManifest;
-  DestroyInstance: DestroyInstanceManifest;
-  DeleteService: DeleteServiceManifest;
   Deploy: DeployManifest;
   GenerateToken: GenerateTokenManifest;
   GetSupportArchive: GetSupportArchiveManifest;
   HaltEnvironment: HaltEnvironmentManifest;
   ModifyEnvironment: ModifyEnvironmentManifest;
-  UpdateCatalog: UpdateCatalogManifest;
   Repair: RepairManifest;
   ResetEnvironmentSetting: ResetEnvironmentSettingManifest;
   ResumeEnvironment: ResumeEnvironmentManifest;
   TriggerCompile: TriggerCompileManifest;
   TriggerDryRun: TriggerDryRunManifest;
   TriggerInstanceUpdate: TriggerInstanceUpdate.Manifest;
-  TriggerSetState: TriggerSetStateManifest;
-  TriggerForceState: TriggerForceStateManifest;
   UpdateEnvironmentSetting: UpdateEnvironmentSettingManifest;
-  UpdateInstanceAttribute: UpdateInstanceAttributeManifest;
-  UpdateInstanceConfig: UpdateInstanceConfigManifest;
   UpdateNotification: UpdateNotification.Manifest;
-  UpdateServiceConfig: UpdateServiceConfigManifest;
 }
 
 /**

src/Core/Query/Query.ts

@@ -23,14 +23,6 @@ import {
   GetEnvironmentsContinuous,
   GetEnvironmentsContinuousManifest,
 } from "@/Data/Managers/GetEnvironmentsContinuous/interface";
-import {
-  GetServiceInstance,
-  GetServiceInstanceManifest,
-} from "@/Data/Managers/GetInstance/interface";
-import {
-  GetInstanceResources,
-  GetInstanceResourcesManifest,
-} from "@/Data/Managers/GetInstanceResources/interface";
 import {
   GetServerStatus,
   GetServerStatusManifest,
@@ -39,26 +31,7 @@ import {
   GetVersionFile,
   GetVersionFileManifest,
 } from "@/Data/Managers/GetVersionFile/interface";
-import {
-  GetInstanceConfig,
-  GetInstanceConfigManifest,
-} from "@/Data/Managers/InstanceConfig/interfaces";
-import {
-  GetService,
-  GetServiceManifest,
-} from "@/Data/Managers/Service/interface";
-import {
-  GetServiceConfig,
-  GetServiceConfigManifest,
-} from "@/Data/Managers/ServiceConfig/interfaces";
-import {
-  GetServiceInstances,
-  GetServiceInstancesManifest,
-} from "@/Data/Managers/ServiceInstances/interface";
-import {
-  GetServices,
-  GetServicesManifest,
-} from "@/Data/Managers/Services/interface";
+
 import * as GetAgents from "@S/Agents/Core/Query";
 import * as GetCompileDetails from "@S/CompileDetails/Core/Query";
 import * as GetCompileReports from "@S/CompileReports/Core/Query";
@@ -87,14 +60,7 @@ import * as GetEnvironmentDetails from "@S/Settings/Core/GetEnvironmentDetailsQu
 import * as GetProjects from "@S/Settings/Core/GetProjectsQuery";
 
 export type Query =
-  | GetServices
-  | GetService
-  | GetServiceInstance
-  | GetServiceInstances
-  | GetServiceConfig
-  | GetInstanceResources
   | GetInstanceEvents.Query
-  | GetInstanceConfig
   | GetMetrics.Query
   | GetDiagnostics.Query
   | GetDiscoveredResources.Query
@@ -136,14 +102,7 @@ export type Type = Query;
  * types related to all the sub queries.
  */
 interface Manifest {
-  GetServices: GetServicesManifest;
-  GetService: GetServiceManifest;
-  GetServiceInstance: GetServiceInstanceManifest;
-  GetServiceInstances: GetServiceInstancesManifest;
-  GetServiceConfig: GetServiceConfigManifest;
-  GetInstanceResources: GetInstanceResourcesManifest;
   GetInstanceEvents: GetInstanceEvents.Manifest;
-  GetInstanceConfig: GetInstanceConfigManifest;
   GetDiagnostics: GetDiagnostics.Manifest;
   GetDiscoveredResources: GetDiscoveredResources.Manifest;
   GetMetrics: GetMetrics.Manifest;