@red-hat-developer-hub/e2e-test-utils 2.1.16 → 2.1.18

package/dist/deployment/rhdh/config/common/dynamic-plugins.yaml

@@ -1,5 +1,10 @@
 includes:
   - dynamic-plugins.default.yaml
+# TODO: switch these plugins to their quay.io {{inherit}} references once published.
 plugins:
+  - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-app-auth:bs_1.54.6__1.1.0
+    disabled: false
+  - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-app-integrations:bs_1.54.6__1.1.0
+    disabled: false
   - package: oci://quay.io/rhdh/red-hat-developer-hub-backstage-plugin-quickstart:{{inherit}}
     disabled: true

package/dist/deployment/rhdh/constants.d.ts

@@ -4,11 +4,6 @@ export declare const DEFAULT_CONFIG_PATHS: {
     appConfig: string;
     secrets: string;
     dynamicPlugins: string;
-    /** New frontend system (app-next): paths merged when the deployment uses NFS layers (explicit flag, `-app-next` namespace, or `USE_NEW_FRONTEND_SYSTEM`). */
-    newFrontendSystem: {
-        dynamicPlugins: string;
-        valueFile: string;
-    };
     helm: {
         valueFile: string;
     };

package/dist/deployment/rhdh/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/deployment/rhdh/constants.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAK1D,eAAO,MAAM,oBAAoB;;;;IAa/B,6JAA6J;;;;;;;;;;;CAuB9J,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,MAAM,CACpC,YAAY,EACZ;IACE,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,YAAY,CAAC;CAC9B,CA0CF,CAAC;AAEF,eAAO,MAAM,SAAS,6BAA6B,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/deployment/rhdh/constants.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAK1D,eAAO,MAAM,oBAAoB;;;;;;;;;;CAyBhC,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,MAAM,CACpC,YAAY,EACZ;IACE,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,YAAY,CAAC;CAC9B,CA0CF,CAAC;AAEF,eAAO,MAAM,SAAS,6BAA6B,CAAC"}

package/dist/deployment/rhdh/constants.js

@@ -5,11 +5,6 @@ export const DEFAULT_CONFIG_PATHS = {
     appConfig: path.join(PACKAGE_ROOT, "dist/deployment/rhdh/config/common/app-config-rhdh.yaml"),
     secrets: path.join(PACKAGE_ROOT, "dist/deployment/rhdh/config/common/rhdh-secrets.yaml"),
     dynamicPlugins: path.join(PACKAGE_ROOT, "dist/deployment/rhdh/config/common/dynamic-plugins.yaml"),
-    /** New frontend system (app-next): paths merged when the deployment uses NFS layers (explicit flag, `-app-next` namespace, or `USE_NEW_FRONTEND_SYSTEM`). */
-    newFrontendSystem: {
-        dynamicPlugins: path.join(PACKAGE_ROOT, "dist/deployment/rhdh/config/new-frontend-system/dynamic-plugins.yaml"),
-        valueFile: path.join(PACKAGE_ROOT, "dist/deployment/rhdh/config/new-frontend-system/value_file.yaml"),
-    },
     helm: {
         valueFile: path.join(PACKAGE_ROOT, "dist/deployment/rhdh/config/helm/value_file.yaml"),
     },

package/dist/deployment/rhdh/deployment.d.ts

@@ -13,8 +13,8 @@ export declare class RHDHDeployment {
     /** Shared merge strategy for dynamic plugin arrays. */
     private static readonly pluginMergeOpts;
     /**
-     * Merges package defaults + auth + optional new-frontend-system defaults +
-     * optional user config into a single dynamic plugins configuration.
+     * Merges package defaults, auth, and optional user config into a single
+     * dynamic plugins configuration.
      */
     private _mergeBaseConfigs;
     /**

package/dist/deployment/rhdh/deployment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../src/deployment/rhdh/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAwB1E,OAAO,KAAK,EACV,iBAAiB,EACjB,gBAAgB,EAGjB,MAAM,YAAY,CAAC;AAEpB,qBAAa,cAAc;IAClB,SAAS,yBAAgC;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,gBAAgB,CAAC;gBAE9B,SAAS,EAAE,MAAM;IAKvB,MAAM,CAAC,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;YA0CpD,eAAe;YAmBf,aAAa;IAwB3B,uDAAuD;IACvD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAE5B;IAEX;;;OAGG;YACW,iBAAiB;IAe/B;;OAEG;YACW,uBAAuB;IAgBrC;;;;;;;;OAQG;YACW,0BAA0B;YAsC1B,oBAAoB;YAWpB,eAAe;YAuEf,mBAAmB;IAmCjC,OAAO,KAAK,cAAc,GAIzB;IAEK,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAWrC;;;;OAIG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAOpC,cAAc,CAAC,OAAO,GAAE,MAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BpD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YAIjB,iBAAiB;YASjB,oBAAoB;IAsClC;;;OAGG;YACW,0BAA0B;IAwCxC,OAAO,CAAC,sBAAsB;IA2CxB,SAAS,CAAC,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAUrE,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,IAAI;IAIZ,OAAO,CAAC,SAAS;CAMlB"}
+{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../src/deployment/rhdh/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAyB1E,OAAO,KAAK,EACV,iBAAiB,EACjB,gBAAgB,EAGjB,MAAM,YAAY,CAAC;AAEpB,qBAAa,cAAc;IAClB,SAAS,yBAAgC;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,gBAAgB,CAAC;gBAE9B,SAAS,EAAE,MAAM;IAKvB,MAAM,CAAC,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;YA0CpD,eAAe;YAmBf,aAAa;IAwB3B,uDAAuD;IACvD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAM5B;IAEX;;;OAGG;YACW,iBAAiB;IAY/B;;OAEG;YACW,uBAAuB;IAgBrC;;;;;;;;OAQG;YACW,0BAA0B;YAoC1B,oBAAoB;YAWpB,eAAe;YA6Df,mBAAmB;IAmCjC,OAAO,KAAK,cAAc,GAIzB;IAEK,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAWrC;;;;OAIG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAOpC,cAAc,CAAC,OAAO,GAAE,MAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BpD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YAIjB,iBAAiB;YASjB,oBAAoB;IAsClC;;;OAGG;YACW,0BAA0B;IAwCxC,OAAO,CAAC,sBAAsB;IAsCxB,SAAS,CAAC,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAUrE,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,IAAI;IAIZ,OAAO,CAAC,SAAS;CAMlB"}

package/dist/deployment/rhdh/deployment.js

@@ -6,7 +6,7 @@ import os from "os";
 import path from "path";
 import { test, request, expect } from "@playwright/test";
 import { mergeYamlFilesIfExists, deepMerge } from "../../utils/merge-yamls.js";
-import { generatePluginsFromMetadata, processPluginsForDeployment, getNormalizedPluginMergeKey, disablePlugins, } from "../../utils/plugin-metadata.js";
+import { generatePluginsFromMetadata, processPluginsForDeployment, getNormalizedPluginMergeKey, disablePlugins, applyDisabledPlugins, } from "../../utils/plugin-metadata.js";
 import { envsubst } from "../../utils/common.js";
 import { runOnce } from "../../playwright/run-once.js";
 import cloneDeepWith from "lodash.clonedeepwith";
@@ -79,20 +79,20 @@ export class RHDHDeployment {
     }
     /** Shared merge strategy for dynamic plugin arrays. */
     static pluginMergeOpts = {
-        arrayMergeStrategy: { byKey: "package" },
+        arrayMergeStrategy: {
+            byKey: "package",
+            normalizeKey: (item) => getNormalizedPluginMergeKey(item),
+        },
     };
     /**
-     * Merges package defaults + auth + optional new-frontend-system defaults +
-     * optional user config into a single dynamic plugins configuration.
+     * Merges package defaults, auth, and optional user config into a single
+     * dynamic plugins configuration.
      */
     async _mergeBaseConfigs(userConfigPath) {
         const authConfig = AUTH_CONFIG_PATHS[this.deploymentConfig.auth];
         const paths = [
             DEFAULT_CONFIG_PATHS.dynamicPlugins,
             authConfig.dynamicPlugins,
-            ...(this.deploymentConfig.useNewFrontendSystem
-                ? [DEFAULT_CONFIG_PATHS.newFrontendSystem.dynamicPlugins]
-                : []),
             ...(userConfigPath ? [userConfigPath] : []),
         ];
         return await mergeYamlFilesIfExists(paths, RHDHDeployment.pluginMergeOpts);
@@ -139,9 +139,7 @@ export class RHDHDeployment {
         let result = await processPluginsForDeployment(config, WorkspacePaths.metadataDir);
         // Disable default plugins (PR builds only) — covers wrapper + OCI DPDY forms
         if (process.env.GIT_PR_NUMBER) {
-            result = deepMerge(result, disabledPlugins, {
-                arrayMergeStrategy: "concat",
-            });
+            result = applyDisabledPlugins(result, disabledPlugins);
         }
         return result;
     }
@@ -153,17 +151,7 @@ export class RHDHDeployment {
     async _deployWithHelm(valueFile) {
         const chartVersion = await this._resolveChartVersion(this.deploymentConfig.version);
         this._log(`Helm chart version resolved to: ${chartVersion}`);
-        const helmValuePaths = [
-            DEFAULT_CONFIG_PATHS.helm.valueFile,
-            ...(this.deploymentConfig.useNewFrontendSystem
-                ? [DEFAULT_CONFIG_PATHS.newFrontendSystem.valueFile]
-                : []),
-            valueFile,
-            ...(this.deploymentConfig.useNewFrontendSystem &&
-                fs.existsSync(WorkspacePaths.valueFileAppNext)
-                ? [WorkspacePaths.valueFileAppNext]
-                : []),
-        ];
+        const helmValuePaths = [DEFAULT_CONFIG_PATHS.helm.valueFile, valueFile];
         const valueFileObject = (await mergeYamlFilesIfExists(helmValuePaths));
         this._logBoxen("Value File", valueFileObject);
         // Merge dynamic plugins into the values file (including auth-specific plugins)
@@ -348,9 +336,6 @@ export class RHDHDeployment {
             process.env.INSTALLATION_METHOD ??
             "helm";
         const namespace = input.namespace ?? this.deploymentConfig.namespace;
-        const useNewFrontendSystem = input.useNewFrontendSystem ??
-            (namespace.endsWith("-app-next") ||
-                process.env.USE_NEW_FRONTEND_SYSTEM === "true");
         const base = {
             version,
             namespace,
@@ -359,7 +344,6 @@ export class RHDHDeployment {
             secrets: input.secrets ?? WorkspacePaths.secrets,
             dynamicPlugins: input.dynamicPlugins ?? WorkspacePaths.dynamicPlugins,
             disablePlugins: input.disablePlugins ?? [],
-            useNewFrontendSystem,
         };
         if (method === "helm") {
             return {

package/dist/deployment/rhdh/deployment.test.js

@@ -38,11 +38,11 @@ describe("dynamic-plugins merge (no user config path)", () => {
         assert.strictEqual(plugins.length, 1, "merged config must have exactly one keycloak plugin");
         assert.ok(plugins[0].package?.startsWith("oci://"), "metadata (OCI) must win over auth local path");
     });
-    it("keeps user app-auth OCI ref over NFS defaults for same logical plugin", () => {
-        const nfsDefaults = {
+    it("keeps user app-auth OCI ref over package defaults for the same logical plugin", () => {
+        const packageDefaults = {
             plugins: [
                 {
-                    package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-app-auth:bs_1.49.4__0.0.1",
+                    package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-app-auth:bs_1.54.6__1.1.0",
                     disabled: false,
                 },
             ],
@@ -55,7 +55,7 @@ describe("dynamic-plugins merge (no user config path)", () => {
                 },
             ],
         };
-        const merged = deepMerge(nfsDefaults, userPlugins, {
+        const merged = deepMerge(packageDefaults, userPlugins, {
             arrayMergeStrategy: {
                 byKey: "package",
                 normalizeKey: (item) => getNormalizedPluginMergeKey(item),
@@ -63,22 +63,22 @@ describe("dynamic-plugins merge (no user config path)", () => {
         });
         const plugins = merged.plugins;
         assert.strictEqual(plugins.length, 1);
-        assert.ok(plugins[0].package?.includes("older__0.0.1"), "user layer must win over NFS defaults for the same logical plugin");
+        assert.ok(plugins[0].package?.includes("older__0.0.1"), "user layer must win over package defaults for the same logical plugin");
     });
-    it("does not duplicate includes when NFS layer omits includes", () => {
+    it("does not duplicate includes when a package layer omits includes", () => {
         const common = {
             includes: ["dynamic-plugins.default.yaml"],
             plugins: [],
         };
-        const nfsLayer = {
+        const packageLayer = {
             plugins: [
                 {
-                    package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-app-auth:bs_1.49.4__0.0.1",
+                    package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-app-auth:bs_1.54.6__1.1.0",
                     disabled: false,
                 },
             ],
         };
-        const merged = deepMerge(common, nfsLayer, {
+        const merged = deepMerge(common, packageLayer, {
             arrayMergeStrategy: {
                 byKey: "package",
                 normalizeKey: (item) => getNormalizedPluginMergeKey(item),

package/dist/deployment/rhdh/types.d.ts

@@ -15,8 +15,6 @@ export type DeploymentOptions = {
      * `{{inherit}}`). Accepts display names, local paths, or OCI refs.
      */
     disablePlugins?: string[];
-    /** When true, merge new-frontend-system (app-next) layers. When omitted, auto-detect: namespace ends with `-app-next` or `USE_NEW_FRONTEND_SYSTEM=true`. Pass false to disable. */
-    useNewFrontendSystem?: boolean;
 };
 export type HelmDeploymentConfig = {
     method: "helm";
@@ -34,8 +32,6 @@ export type DeploymentConfigBase = {
     secrets: string;
     dynamicPlugins: string;
     disablePlugins: string[];
-    /** New frontend system (Backstage app-next / NFS shell). */
-    useNewFrontendSystem: boolean;
 };
 export type DeploymentConfig = DeploymentConfigBase & (HelmDeploymentConfig | OperatorDeploymentConfig);
 //# sourceMappingURL=types.d.ts.map

package/dist/deployment/rhdh/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/deployment/rhdh/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,UAAU,CAAC;AACnD,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,UAAU,GAAG,QAAQ,CAAC;AAE3D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,mLAAmL;IACnL,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,MAAM,EAAE,UAAU,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,YAAY,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,4DAA4D;IAC5D,oBAAoB,EAAE,OAAO,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,oBAAoB,GACjD,CAAC,oBAAoB,GAAG,wBAAwB,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/deployment/rhdh/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,UAAU,CAAC;AACnD,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,UAAU,GAAG,QAAQ,CAAC;AAE3D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,MAAM,EAAE,UAAU,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,YAAY,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,oBAAoB,GACjD,CAAC,oBAAoB,GAAG,wBAAwB,CAAC,CAAC"}

package/dist/playwright/helpers/common.d.ts

@@ -94,6 +94,7 @@ export declare class LoginHelper {
     githubLogin(username: string, password: string, twofactor: string): Promise<string>;
     githubLoginFromSettingsPage(username: string, password: string, twofactor: string): Promise<string>;
     microsoftAzureLogin(username: string, password: string): Promise<"Already logged in" | "Login successful" | "User does not exist">;
+    private waitForSidebar;
 }
 export declare function setupBrowser(browser: Browser, testInfo: TestInfo): Promise<{
     page: Page;

package/dist/playwright/helpers/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/playwright/helpers/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAOhF;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAGxD;AAED;;;;;;GAMG;AACH,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAExE,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAQzE;AAED;;;;;;;;GAQG;AACH,wBAAsB,2BAA2B,CAC/C,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAQf;AAED;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CAAC,CAAC,EAC3C,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,CAAC,CAAC,CAYZ;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAC1B,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAQ/B;AAED,qBAAa,WAAW;IACtB,IAAI,EAAE,IAAI,CAAC;IACX,QAAQ,EAAE,QAAQ,CAAC;gBAEP,IAAI,EAAE,IAAI;IAKhB,YAAY;IAcZ,OAAO;YAMC,aAAa;IA2CrB,eAAe,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAOnE;;;OAGG;IACG,mBAAmB,CACvB,MAAM,GAAE,MAAkC,EAC1C,QAAQ,GAAE,MAAkC;IAoBxC,iBAAiB,CACrB,MAAM,GAAE,MAA+C;YAa3C,mBAAmB;YAwCnB,oBAAoB;IAW5B,4BAA4B;YASpB,uBAAuB;IAgB/B,YAAY,CAAC,KAAK,EAAE,MAAM;IA2B1B,2BAA2B,CAAC,KAAK,UAAQ;IAU/C,mBAAmB,IAAI,MAAM;IAIvB,mBAAmB;IAgBzB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAevC,eAAe,IAAI,MAAM;IAKnB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;YAqCxC,sBAAsB;IAoD9B,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAYjE,2BAA2B,CAC/B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM;IAYb,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;CA2C7D;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ;;;GAWtE"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/playwright/helpers/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAOhF;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAGxD;AAED;;;;;;GAMG;AACH,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAExE,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAQzE;AAED;;;;;;;;GAQG;AACH,wBAAsB,2BAA2B,CAC/C,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAQf;AAED;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CAAC,CAAC,EAC3C,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,CAAC,CAAC,CAYZ;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAC1B,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAQ/B;AAED,qBAAa,WAAW;IACtB,IAAI,EAAE,IAAI,CAAC;IACX,QAAQ,EAAE,QAAQ,CAAC;gBAEP,IAAI,EAAE,IAAI;IAKhB,YAAY;IAcZ,OAAO;YAMC,aAAa;IA2CrB,eAAe,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAOnE;;;OAGG;IACG,mBAAmB,CACvB,MAAM,GAAE,MAAkC,EAC1C,QAAQ,GAAE,MAAkC;IAoBxC,iBAAiB,CACrB,MAAM,GAAE,MAA+C;YAa3C,mBAAmB;YAuCnB,oBAAoB;IAW5B,4BAA4B;YASpB,uBAAuB;IAgB/B,YAAY,CAAC,KAAK,EAAE,MAAM;IA2B1B,2BAA2B,CAAC,KAAK,UAAQ;IAU/C,mBAAmB,IAAI,MAAM;IAIvB,mBAAmB;IAgBzB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAevC,eAAe,IAAI,MAAM;IAKnB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;YAqCxC,sBAAsB;IAoD9B,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAYjE,2BAA2B,CAC/B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM;IAYb,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;YA4C9C,cAAc;CAO7B;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ;;;GAWtE"}

package/dist/playwright/helpers/common.js

@@ -123,7 +123,7 @@ export class LoginHelper {
         });
         await this.uiHelper.verifyHeading("Select a sign-in method");
         await this.uiHelper.clickButton("Enter");
-        await this.page.waitForSelector("nav a", { timeout: 10_000 });
+        await this.waitForSidebar();
     }
     async signOut() {
         await this.page.click(SETTINGS_PAGE_COMPONENTS.userSettingsMenu);
@@ -181,7 +181,7 @@ export class LoginHelper {
         }
         const popup = await popupPromise;
         await this.logintoKeycloak(popup, userid, password);
-        await this.page.waitForSelector("nav a", { timeout: 30_000 });
+        await this.waitForSidebar();
     }
     async loginAsGithubUser(userid = process.env.VAULT_GH_USER_ID) {
         const sessionFileName = githubSessionFile(userid);
@@ -204,8 +204,7 @@ export class LoginHelper {
         await this.uiHelper.waitForLoad(12000);
         await this.uiHelper.clickButton("Sign In");
         // Wait for either: sidebar appears (auto-login) or popup opens (needs auth)
-        const navPromise = this.page
-            .waitForSelector("nav a", { timeout: 15_000 })
+        const navPromise = this.waitForSidebar(15_000)
             .then(() => "nav")
             .catch(() => null);
         const popupPromise = this.page
@@ -227,7 +226,7 @@ export class LoginHelper {
         await this.uiHelper.waitForLoad(240000);
         await this.uiHelper.clickButton("Sign In");
         await this.checkAndReauthorizeGithubApp();
-        await this.page.waitForSelector("nav a", { timeout: 10_000 });
+        await this.waitForSidebar(10000);
         await writeStorageStateAtomically(this.page, sessionFileName);
         console.log(`Authentication state saved for user: ${userid}`);
     }
@@ -461,6 +460,13 @@ export class LoginHelper {
             }
         }
     }
+    async waitForSidebar(timeout = 30_000) {
+        return this.page
+            .getByLabel("sidebar nav")
+            .getByRole("link")
+            .first()
+            .waitFor({ state: "visible", timeout });
+    }
 }
 export async function setupBrowser(browser, testInfo) {
     const context = await browser.newContext({

package/dist/playwright/helpers/github-session.test.js

@@ -16,7 +16,7 @@ describe("github session file naming", () => {
         // same 30-second window submit the identical code and GitHub rejects the second.
         // Sharing the session is the point; withGithubSessionLock is what makes it safe.
         const file = githubSessionFile("rhdh-qe");
-        assert.doesNotMatch(path.basename(file), /app-next|project/);
+        assert.doesNotMatch(path.basename(file), /project/);
     });
     it("is absolute, so it does not follow a later chdir", () => {
         assert.ok(path.isAbsolute(githubSessionFile("rhdh-qe")));

package/dist/utils/plugin-metadata.d.ts

@@ -107,6 +107,11 @@ export declare function normalizeDisablePluginName(plugin: string): string;
  * @returns Dynamic plugins configuration that disables listed plugins
  */
 export declare function disablePlugins(plugins: string[]): DynamicPluginsConfig;
+/**
+ * Marks matching plugins disabled and adds fallback disable entries for plugins
+ * that are not already present in the merged configuration.
+ */
+export declare function applyDisabledPlugins(config: DynamicPluginsConfig, disabledConfig: DynamicPluginsConfig): DynamicPluginsConfig;
 /**
  * Auto-generates plugin entries from workspace metadata files.
  * Creates raw entries with local paths and disabled: false.

package/dist/utils/plugin-metadata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-metadata.d.ts","sourceRoot":"","sources":["../../src/utils/plugin-metadata.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAgBD,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAID;;;;;;;;;GASG;AACH,wBAAgB,YAAY,IAAI,OAAO,CAqBtC;AAoBD;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CA+CjE;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAc3D;AAID;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAI5D;AAYD,eAAO,MAAM,qBAAqB,gBAAgB,CAAC;AAEnD,wBAAgB,oBAAoB,CAClC,YAAY,GAAE,MAA8B,GAC3C,MAAM,GAAG,IAAI,CAQf;AAED,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,CAAC,CA2BzB;AAED,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAwBtC;AA2JD;;;;;;;GAOG;AACH;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE;IACjD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,MAAM,CAMT;AAyHD;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAajE;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAuBtE;AAED;;;;;;;GAOG;AACH,wBAAsB,2BAA2B,CAC/C,YAAY,GAAE,MAA8B,GAC3C,OAAO,CAAC,oBAAoB,CAAC,CAwB/B;AA2BD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,oBAAoB,EAC5B,YAAY,GAAE,MAA8B,EAC5C,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GACzB,OAAO,CAAC,oBAAoB,CAAC,CAsC/B"}
+{"version":3,"file":"plugin-metadata.d.ts","sourceRoot":"","sources":["../../src/utils/plugin-metadata.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAgBD,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAID;;;;;;;;;GASG;AACH,wBAAgB,YAAY,IAAI,OAAO,CAqBtC;AAoBD;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CA+CjE;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAc3D;AAID;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAI5D;AAYD,eAAO,MAAM,qBAAqB,gBAAgB,CAAC;AAEnD,wBAAgB,oBAAoB,CAClC,YAAY,GAAE,MAA8B,GAC3C,MAAM,GAAG,IAAI,CAQf;AAED,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,CAAC,CA2BzB;AAED,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAwBtC;AA2JD;;;;;;;GAOG;AACH;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE;IACjD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,MAAM,CAMT;AAyHD;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAajE;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAuBtE;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,oBAAoB,EAC5B,cAAc,EAAE,oBAAoB,GACnC,oBAAoB,CAuBtB;AAED;;;;;;;GAOG;AACH,wBAAsB,2BAA2B,CAC/C,YAAY,GAAE,MAA8B,GAC3C,OAAO,CAAC,oBAAoB,CAAC,CAwB/B;AA2BD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,oBAAoB,EAC5B,YAAY,GAAE,MAA8B,EAC5C,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GACzB,OAAO,CAAC,oBAAoB,CAAC,CAsC/B"}

package/dist/utils/plugin-metadata.js

@@ -425,6 +425,25 @@ export function disablePlugins(plugins) {
     }
     return pluginConfig;
 }
+/**
+ * Marks matching plugins disabled and adds fallback disable entries for plugins
+ * that are not already present in the merged configuration.
+ */
+export function applyDisabledPlugins(config, disabledConfig) {
+    const disabledPlugins = disabledConfig.plugins ?? [];
+    const disabledNames = new Set(disabledPlugins.map((plugin) => getNormalizedPluginMergeKey(plugin)));
+    const plugins = (config.plugins ?? []).map((plugin) => disabledNames.has(getNormalizedPluginMergeKey(plugin))
+        ? { ...plugin, disabled: true }
+        : plugin);
+    const presentNames = new Set(plugins.map((plugin) => getNormalizedPluginMergeKey(plugin)));
+    return {
+        ...config,
+        plugins: [
+            ...plugins,
+            ...disabledPlugins.filter((plugin) => !presentNames.has(getNormalizedPluginMergeKey(plugin))),
+        ],
+    };
+}
 /**
  * Auto-generates plugin entries from workspace metadata files.
  * Creates raw entries with local paths and disabled: false.

package/dist/utils/tests/plugin-metadata.test.js

@@ -5,7 +5,7 @@
 import { describe, it } from "node:test";
 import assert from "node:assert";
 import fs from "fs-extra";
-import { extractPluginName, getNormalizedPluginMergeKey, disablePlugins, normalizeDisablePluginName, generatePluginsFromMetadata, } from "../plugin-metadata.js";
+import { extractPluginName, getNormalizedPluginMergeKey, disablePlugins, applyDisabledPlugins, normalizeDisablePluginName, generatePluginsFromMetadata, } from "../plugin-metadata.js";
 import { createMetadataFixture } from "./helpers.js";
 // ── extractPluginName ────────────────────────────────────────────────────────
 describe("extractPluginName", () => {
@@ -70,6 +70,22 @@ describe("normalizeDisablePluginName", () => {
     });
 });
 describe("disablePlugins", () => {
+    it("disables an existing OCI entry by normalized plugin name", () => {
+        const result = applyDisabledPlugins({
+            plugins: [
+                {
+                    package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-app-auth:bs_1.54.6__1.1.0",
+                    disabled: false,
+                },
+            ],
+        }, disablePlugins(["red-hat-developer-hub-backstage-plugin-app-auth"]));
+        assert.deepStrictEqual(result.plugins, [
+            {
+                package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-app-auth:bs_1.54.6__1.1.0",
+                disabled: true,
+            },
+        ]);
+    });
     it("returns empty plugins array for empty input", () => {
         const result = disablePlugins([]);
         assert.deepStrictEqual(result, { plugins: [] });

package/dist/utils/workspace-paths.d.ts

@@ -37,8 +37,6 @@ export declare class WorkspacePaths {
     static get dynamicPlugins(): string;
     /** Default Helm value file path: `tests/config/value_file.yaml` */
     static get valueFile(): string;
-    /** Optional Helm values merged after `value_file.yaml` when the new frontend system is active (explicit option, namespace suffix `-app-next`, or `USE_NEW_FRONTEND_SYSTEM=true`) and this file exists. */
-    static get valueFileAppNext(): string;
     /** Default operator subscription path: `tests/config/subscription.yaml` */
     static get subscription(): string;
 }

package/dist/utils/workspace-paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-paths.d.ts","sourceRoot":"","sources":["../../src/utils/workspace-paths.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,cAAc;IACzB,OAAO;IAEP,4FAA4F;IAC5F,MAAM,KAAK,OAAO,IAAI,MAAM,CAE3B;IAED,4DAA4D;IAC5D,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAI5C,0DAA0D;IAC1D,MAAM,KAAK,aAAa,IAAI,MAAM,CAEjC;IAED,8DAA8D;IAC9D,MAAM,KAAK,WAAW,IAAI,MAAM,CAE/B;IAED,gFAAgF;IAChF,MAAM,KAAK,SAAS,IAAI,MAAM,CAE7B;IAID,mEAAmE;IACnE,MAAM,KAAK,SAAS,IAAI,MAAM,CAE7B;IAED,6DAA6D;IAC7D,MAAM,KAAK,OAAO,IAAI,MAAM,CAE3B;IAED,wEAAwE;IACxE,MAAM,KAAK,cAAc,IAAI,MAAM,CAElC;IAED,mEAAmE;IACnE,MAAM,KAAK,SAAS,IAAI,MAAM,CAE7B;IAED,0MAA0M;IAC1M,MAAM,KAAK,gBAAgB,IAAI,MAAM,CAEpC;IAED,2EAA2E;IAC3E,MAAM,KAAK,YAAY,IAAI,MAAM,CAEhC;CACF"}
+{"version":3,"file":"workspace-paths.d.ts","sourceRoot":"","sources":["../../src/utils/workspace-paths.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,cAAc;IACzB,OAAO;IAEP,4FAA4F;IAC5F,MAAM,KAAK,OAAO,IAAI,MAAM,CAE3B;IAED,4DAA4D;IAC5D,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAI5C,0DAA0D;IAC1D,MAAM,KAAK,aAAa,IAAI,MAAM,CAEjC;IAED,8DAA8D;IAC9D,MAAM,KAAK,WAAW,IAAI,MAAM,CAE/B;IAED,gFAAgF;IAChF,MAAM,KAAK,SAAS,IAAI,MAAM,CAE7B;IAID,mEAAmE;IACnE,MAAM,KAAK,SAAS,IAAI,MAAM,CAE7B;IAED,6DAA6D;IAC7D,MAAM,KAAK,OAAO,IAAI,MAAM,CAE3B;IAED,wEAAwE;IACxE,MAAM,KAAK,cAAc,IAAI,MAAM,CAElC;IAED,mEAAmE;IACnE,MAAM,KAAK,SAAS,IAAI,MAAM,CAE7B;IAED,2EAA2E;IAC3E,MAAM,KAAK,YAAY,IAAI,MAAM,CAEhC;CACF"}

package/dist/utils/workspace-paths.js

@@ -58,10 +58,6 @@ export class WorkspacePaths {
     static get valueFile() {
         return path.resolve(this.e2eRoot, "tests/config/value_file.yaml");
     }
-    /** Optional Helm values merged after `value_file.yaml` when the new frontend system is active (explicit option, namespace suffix `-app-next`, or `USE_NEW_FRONTEND_SYSTEM=true`) and this file exists. */
-    static get valueFileAppNext() {
-        return path.resolve(this.e2eRoot, "tests/config/value_file-app-next.yaml");
-    }
     /** Default operator subscription path: `tests/config/subscription.yaml` */
     static get subscription() {
         return path.resolve(this.e2eRoot, "tests/config/subscription.yaml");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@red-hat-developer-hub/e2e-test-utils",
-  "version": "2.1.16",
+  "version": "2.1.18",
   "description": "Test utilities for RHDH E2E tests",
   "license": "Apache-2.0",
   "repository": {

package/dist/deployment/rhdh/config/new-frontend-system/dynamic-plugins.yaml

@@ -1,5 +0,0 @@
-plugins:
-  - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-app-auth:bs_1.49.4__0.0.1
-    disabled: false
-  - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-app-integrations:bs_1.49.4__0.0.1
-    disabled: false

package/dist/deployment/rhdh/config/new-frontend-system/value_file.yaml

@@ -1,2 +0,0 @@
-# Helm values merge layer for the new frontend system (app-next); merged when NFS layers are active (additive; extend as needed).
-{}