update page redirection to Desired State on OSS

changelogs/unreleased/4835-redirect-OSS.yml

@@ -0,0 +1,6 @@
+description: "Redirect the user to the Desired State page on Environment Creation on OSS, instead of Compile Reports page."
+issue-nr: 4835
+change-type: patch
+destination-branches: [master, iso6]
+sections:
+  minor-improvement: "{{description}}"

changelogs/unreleased/5269-dependabot.yml

@@ -0,0 +1,6 @@
+change-type: patch
+description: 'Build(deps-dev): Bump @types/react-dom from 18.2.8 to 18.2.15'
+destination-branches:
+- master
+- iso6
+sections: {}

cypress/e2e/scenario-1-environment.cy.js

@@ -121,7 +121,16 @@ describe("Environment", () => {
 
     cy.get("button").contains("Submit").click();
     cy.wait(1000);
-    // TODO : Add test to check redirection to right page.
+    // test to check redirection to right page. OSS it should be the Desired state page instead of the service catalog.
+    if (Cypress.env("edition") === "iso") {
+      cy.get(".pf-v5-c-title")
+        .contains("Service Catalog")
+        .should("to.be.visible");
+    } else {
+      cy.get(".pf-v5-c-title")
+        .contains("Desired State")
+        .should("to.be.visible");
+    }
 
     //go back to home and check if env is visible
     cy.get(".pf-v5-c-breadcrumb__item").eq(0).click();

cypress/e2e/scenario-6-resources.cy.js

@@ -228,6 +228,10 @@ describe("Scenario 6 : Resources", () => {
         8,
       );
 
+      // make sure the default is 100 instead of 20 like on other pages with pagination.
+      cy.get('[aria-label="PaginationWidget"] .pf-v5-c-menu-toggle').click();
+      cy.get(".pf-v5-c-menu__list-item:last-child svg").should("exist");
+
       // Expect last log message to be "Setting deployed due to known good status"
       cy.get('[aria-label="ResourceLogRow"]')
         .eq(0)
@@ -557,7 +561,8 @@ describe("Scenario 6 : Resources", () => {
       );
 
       // make sure the default is 100 instead of 20 like on other pages with pagination.
-      cy.get('[aria-label="PaginationWidget"]').should("contain", "1 - 100");
+      cy.get('[aria-label="PaginationWidget"] .pf-v5-c-menu-toggle').click();
+      cy.get(".pf-v5-c-menu__list-item:last-child svg").should("exist");
 
       // Expect last log message to be "Setting deployed due to known good status"
       cy.get('[aria-label="ResourceLogRow"]')

package.json

@@ -63,7 +63,7 @@
     "@types/lodash-es": "^4.17.8",
     "@types/node": "^20.8.4",
     "@types/qs": "^6.9.8",
-    "@types/react-dom": "^18.2.8",
+    "@types/react-dom": "^18.2.15",
     "@types/react-router-dom": "^5.3.3",
     "@types/react-syntax-highlighter": "^15.5.9",
     "@types/styled-components": "^5.1.26",

src/Slices/CreateEnvironment/UI/CreateEnvironmentForm.tsx

@@ -75,7 +75,7 @@ export const CreateEnvironmentForm: React.FC<Props> = ({
         if (Either.isLeft(result)) {
           setErrorMessage(result.value);
         } else {
-          const target = isLsmEnabled ? "Catalog" : "CompileReports";
+          const target = isLsmEnabled ? "Catalog" : "DesiredState";
           navigateTo(target, undefined, `?env=${result.value.data.id}`);
         }
       }

yarn.lock

@@ -1337,7 +1337,7 @@ __metadata:
     "@types/lodash-es": ^4.17.8
     "@types/node": ^20.8.4
     "@types/qs": ^6.9.8
-    "@types/react-dom": ^18.2.8
+    "@types/react-dom": ^18.2.15
     "@types/react-router-dom": ^5.3.3
     "@types/react-syntax-highlighter": ^15.5.9
     "@types/styled-components": ^5.1.26
@@ -2800,12 +2800,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-dom@npm:^18.2.8":
-  version: 18.2.8
-  resolution: "@types/react-dom@npm:18.2.8"
+"@types/react-dom@npm:^18.2.15":
+  version: 18.2.15
+  resolution: "@types/react-dom@npm:18.2.15"
   dependencies:
     "@types/react": "*"
-  checksum: d36264631028d021b73cd9e015f10b95c4959ae1ce8f7a7419f318d1f05b1d063e6afffcd2a349a6bccd64ccc9ee9d2d976e1f0437643f0e7db621fa035bca65
+  checksum: 8e9631600c21ff561328e38a951d1991b3b3b20f538af4c0efbd1327c883a5573a63f50e1b945c34fa51b114b30e1ca5e62317bd54f21e063d6697b4be843a03
   languageName: node
   linkType: hard