Angular 21 upgrade and post-merge improvements

package.json

@@ -1,6 +1,6 @@
 {
   "name": "stratos",
-  "version": "v5.0.0-dev.8+build.20260415.52d8eaf981",
+  "version": "v5.0.0-dev.10",
   "type": "module",
   "description": "Stratos Console",
   "main": "index.js",

postcss.config.cjs

@@ -1,6 +1,20 @@
-module.exports = {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
+const postcss = require('postcss');
+const nested = require('postcss-nested');
+
+// postcss-nested uses PostCSS v8 visitor API (phase 2), but Tailwind's
+// detectNesting runs in phase 1 (runOnRoot). Wrapping in an Once handler
+// forces nesting to be expanded in phase 1, before Tailwind sees it.
+const nestedOnce = {
+  postcssPlugin: 'postcss-nested-once',
+  Once(root) {
+    postcss([nested]).process(root).sync();
   },
-}
+};
+
+module.exports = {
+  plugins: [
+    nestedOnce,
+    require('tailwindcss'),
+    require('autoprefixer'),
+  ],
+};

src/frontend/packages/cloud-foundry/src/features/applications/application-delete/application-delete.component.ts

@@ -56,6 +56,7 @@ import {
     LoadingPageComponent,
   ],
   providers: [
+    DatePipe,
     CfAppRoutesListConfigService,
     AppServiceBindingListConfigService
   ]

src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/instances-tab/instances-tab.component.spec.ts

@@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { provideHttpClient } from '@angular/common/http';
 import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
 import { provideZonelessChangeDetection, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { provideRouter } from '@angular/router';
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
 import { of } from 'rxjs';
 import { Store } from '@ngrx/store';
@@ -54,6 +55,7 @@ describe('InstancesTabComponent', () => {
         provideHttpClient(),
         provideHttpClientTesting(),
         provideZonelessChangeDetection(),
+        provideRouter([]),
         { provide: Store, useValue: mockStore },
         { provide: PaginationMonitorFactory, useValue: mockPmf },
         { provide: ApplicationService, useClass: ApplicationServiceMock },

src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2-1/commit-list-wrapper/commit-list-wrapper.component.ts

@@ -1,3 +1,4 @@
+import { DatePipe } from '@angular/common';
 import { Component, ChangeDetectionStrategy, inject } from '@angular/core';
 import { GitCommit } from '@stratosui/git';
 import { Observable } from 'rxjs';
@@ -18,6 +19,7 @@ import {
     ListComponent
   ],
   providers: [
+    DatePipe,
     {
       provide: ListConfig,
       useFactory: () => new GithubCommitsListConfigServiceDeploy(),

src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-step2.component.spec.ts

@@ -1,10 +1,23 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { provideZonelessChangeDetection } from '@angular/core';
-import { provideMockStore } from '@ngrx/store/testing';
-import { describe, it, expect, beforeEach } from 'vitest';
+import { provideHttpClient } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { ActivatedRoute } from '@angular/router';
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { Subject, of } from 'rxjs';
+import { StoreModule } from '@ngrx/store';
+import { deployAppReducer } from '../../../../store/reducers/deploy-app.reducer';
 
-import { getGitHubAPIURL, GITHUB_API_URL, GitSCMService } from '@stratosui/git';
-import { STORE_TEST_PROVIDERS } from '@stratosui/store/testing';
+import { getGitHubAPIURL, GITHUB_API_URL, GitSCMService, GitHubSCM } from '@stratosui/git';
+import {
+  EntityCatalogHelper,
+  EntityCatalogHelpers,
+  EntityCatalogTestModule,
+  TEST_CATALOGUE_ENTITIES,
+  generateStratosEntities,
+} from '@stratosui/store';
+import { createBasicStoreModule, STORE_TEST_PROVIDERS } from '@stratosui/store/testing';
+import { generateCFEntities } from '../../../../cf-entity-generator';
 import { ApplicationDeploySourceTypes } from '../deploy-application-steps.types';
 import { DeployApplicationStep2Component } from './deploy-application-step2.component';
 
@@ -15,22 +28,148 @@ describe('DeployApplicationStep2Component', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [
-        DeployApplicationStep2Component
+        DeployApplicationStep2Component,
+        createBasicStoreModule(),
+        StoreModule.forFeature('deployApplication', deployAppReducer),
+        EntityCatalogTestModule,
       ],
       providers: [
-        provideMockStore(),
         ...STORE_TEST_PROVIDERS,
+        {
+          provide: TEST_CATALOGUE_ENTITIES,
+          useValue: [
+            ...generateStratosEntities(),
+            ...generateCFEntities(),
+          ],
+        },
         GitSCMService,
         ApplicationDeploySourceTypes,
         { provide: GITHUB_API_URL, useFactory: getGitHubAPIURL },
-        provideZonelessChangeDetection()
-      ]
+        {
+          provide: ActivatedRoute,
+          useValue: { snapshot: { queryParams: {}, data: {}, params: {} } },
+        },
+        provideZonelessChangeDetection(),
+        provideHttpClient(),
+        provideHttpClientTesting(),
+      ],
     });
+
+    const helper = TestBed.inject(EntityCatalogHelper);
+    EntityCatalogHelpers.SetEntityCatalogHelper(helper);
   });
 
-  // TODO: Fix EntityCatalogHelper initialization to enable component creation test
-  // The component requires EntityCatalogHelper to be initialized, which needs proper entity catalog setup
   it('should be defined', () => {
     expect(DeployApplicationStep2Component).toBeDefined();
   });
+
+  it('creates the component', () => {
+    fixture = TestBed.createComponent(DeployApplicationStep2Component);
+    component = fixture.componentInstance;
+    expect(component).toBeTruthy();
+  });
+
+  describe('applyGithubEnterpriseAndToken (GHE + PAT port)', () => {
+    let scmSpy: {
+      setPublicApi: ReturnType<typeof vi.fn>;
+      setAccessToken: ReturnType<typeof vi.fn>;
+      clearAccessToken: ReturnType<typeof vi.fn>;
+      getType: ReturnType<typeof vi.fn>;
+    };
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(DeployApplicationStep2Component);
+      component = fixture.componentInstance;
+
+      scmSpy = {
+        setPublicApi: vi.fn(),
+        setAccessToken: vi.fn(),
+        clearAccessToken: vi.fn(),
+        getType: vi.fn().mockReturnValue('github'),
+      };
+      // Inject a mock SCM so applyGithubEnterpriseAndToken's side effects are observable
+      // without driving the full deploy-step form.
+      component.scm = scmSpy as unknown as GitHubSCM;
+    });
+
+    const invoke = (url: string | undefined, token: string | undefined) =>
+      (component as unknown as {
+        applyGithubEnterpriseAndToken(u?: string, t?: string): void;
+      }).applyGithubEnterpriseAndToken(url, token);
+
+    it('flags an invalid enterprise URL and does not set the public API', () => {
+      invoke('not-a-url', undefined);
+
+      expect(component.isInvalidGithubEnterpriseUrl).toBe(true);
+      expect(scmSpy.setPublicApi).not.toHaveBeenCalled();
+    });
+
+    it('sets the public API endpoint for a valid enterprise URL', () => {
+      invoke('https://github.example.com/api/v3', undefined);
+
+      expect(component.isInvalidGithubEnterpriseUrl).toBe(false);
+      expect(scmSpy.setPublicApi).toHaveBeenCalledWith('https://github.example.com/api/v3');
+    });
+
+    it('sets the access token when one is provided', () => {
+      invoke('https://github.example.com/api/v3', 'pat-abc123');
+
+      expect(scmSpy.setAccessToken).toHaveBeenCalledWith('pat-abc123');
+      expect(scmSpy.clearAccessToken).not.toHaveBeenCalled();
+    });
+
+    it('clears the access token when none is provided', () => {
+      invoke('https://github.example.com/api/v3', '');
+
+      expect(scmSpy.clearAccessToken).toHaveBeenCalled();
+      expect(scmSpy.setAccessToken).not.toHaveBeenCalled();
+    });
+
+    it('ignores an empty enterprise URL and leaves the public API untouched', () => {
+      invoke('', 'pat-abc123');
+
+      expect(component.isInvalidGithubEnterpriseUrl).toBe(false);
+      expect(scmSpy.setPublicApi).not.toHaveBeenCalled();
+    });
+
+    it('skips token handling when the active SCM is not GitHub (e.g. GitLab)', () => {
+      scmSpy.getType.mockReturnValue('gitlab');
+      invoke('https://gitlab.example.com/api/v4', 'pat-should-be-ignored');
+
+      expect(scmSpy.setAccessToken).not.toHaveBeenCalled();
+      expect(scmSpy.clearAccessToken).not.toHaveBeenCalled();
+    });
+
+    it('wires applyGithubEnterpriseAndToken to the sourceSelectionForm valueChanges stream', () => {
+      // Mock the NgForm ViewChild with a Subject so we can emit form values
+      // without standing up the full template-driven reactive form. Also mock
+      // setupForGit's other upstream collaborators just enough to reach the
+      // suggestedRepos$ assignment where the tap callback is registered.
+      const valueChanges = new Subject<Record<string, string | undefined>>();
+      (component as unknown as { sourceSelectionForm: { valueChanges: Subject<unknown> } }).sourceSelectionForm = {
+        valueChanges,
+      };
+      // updateSuggestedRepositories is called inside switchMap; stub it to
+      // return an empty result so the pipe completes without network work.
+      vi.spyOn(
+        component as unknown as { updateSuggestedRepositories: (n: string) => unknown },
+        'updateSuggestedRepositories',
+      ).mockReturnValue(of([]));
+
+      // Invoke setupForGit so the valueChanges subscription gets wired up.
+      (component as unknown as { setupForGit(): void }).setupForGit();
+      // Subscribe to keep the pipe hot; the tap callback only fires on
+      // subscribed observables.
+      component.suggestedRepos$.subscribe();
+
+      valueChanges.next({
+        githubEnterpriseUrl: 'https://github.example.com/api/v3',
+        githubAccessToken: 'pat-from-form',
+        projectName: 'org/repo',
+      });
+
+      expect(scmSpy.setPublicApi).toHaveBeenCalledWith('https://github.example.com/api/v3');
+      expect(scmSpy.setAccessToken).toHaveBeenCalledWith('pat-from-form');
+    });
+  });
 });

src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step3/deploy-application-step3.component.ts

@@ -207,6 +207,23 @@ export class DeployApplicationStep3Component implements OnDestroy {
   }
 
   onEnter = (fsDeployer: DeployApplicationDeployer) => {
+    // Re-entry after Previous: tear down the prior deployer's subscriptions
+    // and websocket so its stale status$ cannot replay the earlier error
+    // snackbar on top of the fresh attempt.
+    this.destroyDeployer();
+    if (this.deployer && this.deployer !== fsDeployer) {
+      this.deployer.close();
+    }
+
+    // Reset UI state so buttons reflect "deploy not yet started" rather
+    // than carrying over the prior attempt's terminal state (e.g. "Go to
+    // App Summary" staying active from a previous successful push).
+    this.validSubject.next(false);
+    this.closeableSubject.next(false);
+    this.showOverlaySubject.next(false);
+    this.disablePreviousSubject.next(true);
+    this.error.set(false);
+
     // If we were passed data, then we came from the File System step
     if (fsDeployer) {
       this.deployer = fsDeployer;

src/frontend/packages/cloud-foundry/src/features/services/detach-service-instance/detach-service-instance.component.ts

@@ -38,7 +38,8 @@ import { DetachAppsComponent } from './detach-apps/detach-apps.component';
     StepComponent,
     DetachAppsComponent,
     AppActionMonitorComponent
-  ]
+  ],
+  providers: [DatePipe]
 })
 export class DetachServiceInstanceComponent {
   private store = inject<Store<CFAppState>>(Store);