[DIR-1444] [DIR-724] [DIR-1506] migrate to new instances api

ui/e2e/explorer/consumer/index.spec.ts

@@ -49,7 +49,7 @@ test("it is possible to create a consumer", async ({ page }) => {
 
   await expect(
     page,
-    "it creates the service and opens the file in the explorer"
+    "it creates the consumer and opens the file in the explorer"
   ).toHaveURL(`/n/${namespace}/explorer/consumer/${filename}`);
 
   /* fill in form */

ui/e2e/explorer/workflow/run.spec.ts

@@ -10,7 +10,7 @@ import { noop as basicWorkflow } from "~/pages/namespace/Explorer/Tree/component
 import { createFile } from "e2e/utils/files";
 import { decode } from "js-base64";
 import { faker } from "@faker-js/faker";
-import { getInput } from "~/api/instances/query/input";
+import { getInstanceInput } from "~/api/instances/query/input";
 import { headers } from "e2e/utils/testutils";
 import { prettifyJsonString } from "~/util/helpers";
 
@@ -150,7 +150,7 @@ test("it is possible to run the workflow by setting an input JSON via the editor
   }
 
   // check the server state of the input
-  const res = await getInput({
+  const res = await getInstanceInput({
     urlParams: {
       baseUrl: process.env.PLAYWRIGHT_UI_BASE_URL,
       instanceId,
@@ -159,7 +159,7 @@ test("it is possible to run the workflow by setting an input JSON via the editor
     headers,
   });
 
-  const inputResponseString = decode(res.data);
+  const inputResponseString = decode(res.data.input);
 
   expect(
     inputResponseString,
@@ -331,7 +331,7 @@ test("it is possible to provide the input via generated form", async ({
   }
 
   // check the server state of the input
-  const res = await getInput({
+  const res = await getInstanceInput({
     urlParams: {
       baseUrl: process.env.PLAYWRIGHT_UI_BASE_URL,
       instanceId,
@@ -348,7 +348,7 @@ test("it is possible to provide the input via generated form", async ({
     select: "guest",
     file: `data:text/plain;base64,SSBhbSBqdXN0IGEgdGVzdGZpbGUgdGhhdCBjYW4gYmUgdXNlZCB0byB0ZXN0IGFuIHVwbG9hZCBmb3JtIHdpdGhpbiBhIHBsYXl3cmlnaHQgdGVzdA==`,
   };
-  const inputResponseAsJson = JSON.parse(decode(res.data));
+  const inputResponseAsJson = JSON.parse(decode(res.data.input));
   expect(inputResponseAsJson).toEqual(expectedJson);
 });
 
@@ -424,7 +424,7 @@ test("it is possible to provide the input via generated form and resolve form er
   }
 
   // check the server state of the input
-  const res = await getInput({
+  const res = await getInstanceInput({
     urlParams: {
       baseUrl: process.env.PLAYWRIGHT_UI_BASE_URL,
       instanceId,
@@ -438,7 +438,7 @@ test("it is possible to provide the input via generated form and resolve form er
     lastName: "McFly",
     select: "guest",
   };
-  const inputResponseAsJson = JSON.parse(decode(res.data));
+  const inputResponseAsJson = JSON.parse(decode(res.data.input));
   expect(inputResponseAsJson).toEqual(expectedJson);
 });
 

ui/e2e/explorer/workflow/settings.spec.ts

@@ -4,13 +4,13 @@ import { waitForSuccessToast, workflowThatCreatesVariable } from "./utils";
 
 import { noop as basicWorkflow } from "~/pages/namespace/Explorer/Tree/components/modals/CreateNew/Workflow/templates";
 import { createFile } from "e2e/utils/files";
+import { createInstance } from "~/api/instances/mutate/create";
 import { createVar } from "~/api/variables/mutate/create";
 import { createWorkflowVariables } from "e2e/utils/variables";
 import { encode } from "js-base64";
 import { faker } from "@faker-js/faker";
 import { forceLeadingSlash } from "~/api/files/utils";
 import { headers } from "e2e/utils/testutils";
-import { runWorkflow } from "~/api/tree/mutate/runWorkflow";
 
 let namespace = "";
 let workflow = "";
@@ -260,7 +260,7 @@ test("it is possible to rename a variable that doesn't have a mimeType", async (
     yaml: workflowThatCreatesVariable,
   });
 
-  await runWorkflow({
+  await createInstance({
     urlParams: {
       baseUrl: process.env.PLAYWRIGHT_UI_BASE_URL,
       namespace,

ui/e2e/instances/details/index.spec.ts

@@ -47,7 +47,7 @@ test("the header of the instance page shows the relevant data for the workflow",
       namespace,
       path: simpleWorkflowName,
     })
-  ).instance;
+  ).data.id;
   await page.goto(`/n/${namespace}/instances/${instanceId}`);
 
   const header = page.getByTestId("instance-header-container");
@@ -80,8 +80,8 @@ test("the header of the instance page shows the relevant data for the workflow",
     "It renders the category 'started at'"
   ).toBeVisible();
   await expect(
-    header.getByText("last updated"),
-    "It renders the category 'last updated'"
+    header.getByText("finished at"),
+    "It renders the category 'finished at'"
   ).toBeVisible();
 
   await expect(
@@ -110,7 +110,7 @@ test("the diagram panel on the instance page responds to user interaction", asyn
       namespace,
       path: simpleWorkflowName,
     })
-  ).instance;
+  ).data.id;
   await page.goto(`/n/${namespace}/instances/${instanceId}`);
 
   const diagramPanel = page.getByTestId("rf__wrapper");
@@ -172,7 +172,7 @@ test("the diagram on the instance page changes appearance dynamically", async ({
       namespace,
       path: delayedWorkflowName,
     })
-  ).instance;
+  ).data.id;
   await page.goto(`/n/${namespace}/instances/${instanceId}`);
 
   const diagramPanel = page.getByTestId("rf__wrapper");
@@ -268,7 +268,7 @@ test("the input/output panel responds to user interaction", async ({
       namespace,
       path: simpleWorkflowName,
     })
-  ).instance;
+  ).data.id;
   await page.goto(`/n/${namespace}/instances/${instanceId}`);
 
   const inputOutputPanel = page.getByTestId("inputOutputPanel");
@@ -363,7 +363,7 @@ test("The output is shown when the workflow finished running", async ({
       namespace,
       path: delayedWorkflowName,
     })
-  ).instance;
+  ).data.id;
   await page.goto(`/n/${namespace}/instances/${instanceId}`);
 
   const inputOutputPanel = page.getByTestId("inputOutputPanel");
@@ -407,7 +407,7 @@ test("after a running instance finishes, the output tab is automatically selecte
       namespace,
       path: delayedWorkflowName,
     })
-  ).instance;
+  ).data.id;
   await page.goto(`/n/${namespace}/instances/${instanceId}`);
 
   const inputOutputPanel = page.getByTestId("inputOutputPanel");

ui/e2e/instances/filter/index.spec.ts

@@ -9,8 +9,6 @@ import {
 import { createFile } from "e2e/utils/files";
 import { createInstance } from "../utils";
 import { faker } from "@faker-js/faker";
-import { headers } from "e2e/utils/testutils";
-import { runWorkflow } from "~/api/tree/mutate/runWorkflow";
 
 let namespace = "";
 const simpleWorkflowName = faker.system.commonFileName("yaml");
@@ -62,14 +60,7 @@ const createTriggerFilterInstances = async () => {
     }),
   });
 
-  await runWorkflow({
-    urlParams: {
-      baseUrl: process.env.PLAYWRIGHT_UI_BASE_URL,
-      namespace,
-      path: parentWorkflowName,
-    },
-    headers,
-  });
+  await createInstance({ namespace, path: parentWorkflowName });
 };
 
 test("it is possible to navigate to the instances list, it renders and paginates instances", async ({

ui/e2e/instances/list/index.spec.ts

@@ -12,9 +12,8 @@ import { faker } from "@faker-js/faker";
 import { getInstances } from "~/api/instances/query/get";
 import { headers } from "e2e/utils/testutils";
 import moment from "moment";
-import { runWorkflow } from "~/api/tree/mutate/runWorkflow";
 
-type Instance = Awaited<ReturnType<typeof runWorkflow>>;
+type Instance = Awaited<ReturnType<typeof createInstance>>;
 
 let namespace = "";
 const simpleWorkflowName = faker.system.commonFileName("yaml");
@@ -76,20 +75,20 @@ test("it renders the instance item correctly for failed and success status", asy
       headers,
     });
 
-    const instanceDetail = instancesList.instances.results.find(
-      (x) => x.id === instance.instance
+    const instanceDetail = instancesList.data.find(
+      (x) => x.id === instance.data.id
     );
 
-    if (!instanceDetail?.status) {
-      throw new Error("instanceDetail?.status is not defined");
+    if (!instanceDetail) {
+      throw new Error("instance not found");
     }
 
-    const workflowName = instanceDetail?.as.split(":")[0];
+    const workflowName = instanceDetail?.path.split(":")[0];
 
     if (!workflowName) throw new Error("workflowName is not defined");
 
     const instanceItemRow = page.getByTestId(
-      `instance-row-${instance.instance}`
+      `instance-row-${instance.data.id}`
     );
 
     await expect(
@@ -103,14 +102,14 @@ test("it renders the instance item correctly for failed and success status", asy
     await expect(
       instanceItemIdColumn.getByTestId(`tooltip-copy-trigger`),
       "id badge shows the first 8 digits of the id"
-    ).toContainText(instance.instance.slice(0, 8));
+    ).toContainText(instance.data.id.slice(0, 8));
 
     await instanceItemIdColumn.getByTestId(`tooltip-copy-trigger`).hover();
 
     await expect(
       instanceItemIdColumn.getByTestId("tooltip-copy-content"),
       "on hover, a tooltip reveals full id"
-    ).toContainText(instance.instance);
+    ).toContainText(instance.data.id);
 
     await page
       .getByRole("heading", { name: "Recently executed instances" })
@@ -166,21 +165,21 @@ test("it renders the instance item correctly for failed and success status", asy
       .click(); // click on header to close all tooltips opened
 
     await expect(
-      instanceItemRow.getByTestId("instance-column-updated-time"),
-      `the "last updated" column should display a relative time of the updatedAt api response`
-    ).toContainText(moment(instanceDetail.updatedAt).fromNow(true));
+      instanceItemRow.getByTestId("instance-column-ended-time"),
+      `the "endedAt" column should display a relative time of the endedAt api response`
+    ).toContainText(moment(instanceDetail.endedAt).fromNow(true));
 
     await instanceItemRow
-      .getByTestId("instance-column-updated-time")
+      .getByTestId("instance-column-ended-time")
       .getByTestId("tooltip-trigger")
       .hover();
 
     await expect(
       instanceItemRow
-        .getByTestId("instance-column-updated-time")
+        .getByTestId("instance-column-ended-time")
         .getByTestId("tooltip-content"),
       "on hover, the absolute time should appear"
-    ).toContainText(instanceDetail.updatedAt);
+    ).toContainText(instanceDetail.endedAt ?? "no endedAt");
 
     await instanceItemRow
       .getByTestId("instance-column-name")
@@ -198,7 +197,7 @@ test("it renders the instance item correctly for failed and success status", asy
     await expect(
       page,
       "on click row, page should navigate to the instance detail page"
-    ).toHaveURL(`/n/${namespace}/instances/${instance.instance}`);
+    ).toHaveURL(`/n/${namespace}/instances/${instance.data.id}`);
     await page.goBack();
   };
 
@@ -234,21 +233,13 @@ test("it provides a proper pagination", async ({ page }) => {
     yaml,
   });
 
-  await runWorkflow({
-    urlParams: {
-      baseUrl: process.env.PLAYWRIGHT_UI_BASE_URL,
-      namespace,
-      path: parentWorkflow,
-    },
-    headers,
-  });
-
-  /**
-   * child workflows are spawned asynchronously in the backend and the page
-   * does not refresh, so we need to wait until they are initialized before
-   * visiting the page.
-   */
-  await page.waitForTimeout(500);
+  await createInstance({ namespace, path: parentWorkflow }),
+    /**
+     * child workflows are spawned asynchronously in the backend and the page
+     * does not refresh, so we need to wait until they are initialized before
+     * visiting the page.
+     */
+    await page.waitForTimeout(500);
 
   await page.goto(`/n/${namespace}/instances/`, { waitUntil: "networkidle" });
 
@@ -304,7 +295,7 @@ test("it provides a proper pagination", async ({ page }) => {
     headers,
   });
 
-  const firstInstance = instancesListPage3.instances.results[0];
+  const firstInstance = instancesListPage3.data[0];
   if (!firstInstance) throw new Error("there should be at least one instance");
 
   const instanceItemRow = page.getByTestId(`instance-row-${firstInstance.id}`);
@@ -328,13 +319,9 @@ test("It will display child instances as well", async ({ page }) => {
     }),
   });
 
-  const parentInstance = await runWorkflow({
-    urlParams: {
-      baseUrl: process.env.PLAYWRIGHT_UI_BASE_URL,
-      namespace,
-      path: parentWorkflow,
-    },
-    headers,
+  const parentInstance = await createInstance({
+    namespace,
+    path: parentWorkflow,
   });
 
   await page.goto(`/n/${namespace}/instances/`, { waitUntil: "networkidle" });
@@ -349,8 +336,8 @@ test("It will display child instances as well", async ({ page }) => {
     headers,
   });
 
-  const childInstanceDetail = instancesList.instances.results.find(
-    (x) => x.id !== parentInstance.instance
+  const childInstanceDetail = instancesList.data.find(
+    (x) => x.id !== parentInstance.data.id
   );
 
   if (!childInstanceDetail)

ui/e2e/instances/utils/index.ts

@@ -1,5 +1,5 @@
+import { createInstance as createInstanceRequest } from "~/api/instances/mutate/create";
 import { headers } from "e2e/utils/testutils";
-import { runWorkflow } from "~/api/tree/mutate/runWorkflow";
 
 export const createInstance = async ({
   namespace,
@@ -10,7 +10,7 @@ export const createInstance = async ({
   path: string;
   payload?: string;
 }) =>
-  await runWorkflow({
+  await createInstanceRequest({
     urlParams: {
       baseUrl: process.env.PLAYWRIGHT_UI_BASE_URL,
       namespace,

ui/public/locales/en/translation.json

@@ -528,6 +528,7 @@
     "instances": {
       "list": {
         "title": "Recently executed instances",
+        "refetchLabel": "Refetch instances",
         "empty": {
           "noInstances": "There are no recently executed instances",
           "noFilterResults": "No recently executed instances found with these filter criteria"
@@ -538,7 +539,7 @@
           "invoker": "trigger",
           "state": "state",
           "startedAt": "started at",
-          "updatedAt": "last updated",
+          "finishedAt": "finished at",
           "childInstances": {
             "label": "spawned",
             "instanceCount": "{{count}} instances",
@@ -584,7 +585,7 @@
           "invoker": "trigger",
           "state": "state",
           "startedAt": "started at",
-          "updatedAt": "last updated",
+          "finishedAt": "finished at",
           "realtiveTime": "{{relativeTime}} ago"
         },
         "logs": {
@@ -1532,4 +1533,4 @@
       }
     }
   }
-}
+}