Revert "feat/CXSPA-9270 CXSPA-7795: Order code and Quote code link in details page" (#20122)

Author: anjana-bl

Diff for: feature-libs/order/assets/translations/en/order.json

@@ -10,8 +10,6 @@
     "placed": "Placed",
     "placedBy": "Placed By",
     "unit": "Unit",
-    "quoteCode": "Quote ID {{id}}",
-    "quoteDetail": "Quote Detail",
     "costCenter": "Cost Center",
     "costCenterAndUnit": "Cost Center / Unit",
     "costCenterAndUnitValue": "{{costCenterName}} / {{unitName}}",

Diff for: feature-libs/order/components/order-details/order-overview/order-overview.component.html

@@ -63,13 +63,6 @@
             [content]="getOrderStatusCardContent(order.statusDisplay) | async"
           ></cx-card>
 
-          <ng-container
-            *ngTemplateOutlet="
-              showQuoteCode;
-              context: { sapQuoteCode: order.sapQuoteCode }
-            "
-          ></ng-container>
-
           <ng-template
             [cxOutlet]="cartOutlets.ORDER_OVERVIEW"
             [cxOutletContext]="{ item: order, readonly: true }"
@@ -160,13 +153,6 @@
           [content]="getOrderStatusCardContent(order.statusDisplay) | async"
         ></cx-card>
 
-        <ng-container
-          *ngTemplateOutlet="
-            showQuoteCode;
-            context: { sapQuoteCode: order.sapQuoteCode }
-          "
-        ></ng-container>
-
         <ng-template
           [cxOutlet]="cartOutlets.ORDER_OVERVIEW"
           [cxOutletContext]="{ item: order, readonly: true }"
@@ -182,21 +168,3 @@
     </div>
   </ng-container>
 </div>
-
-<ng-template #showQuoteCode let-quoteCode="sapQuoteCode">
-  <ng-container *cxFeature="'showOrderQuoteLink'">
-    <div id="quote-container" class="card-body cx-card-body" *ngIf="quoteCode">
-      <div class="cx-card-title">
-        {{ 'orderDetails.quoteCode' | cxTranslate: { id: quoteCode } }}
-      </div>
-      <a
-        [routerLink]="
-          { cxRoute: 'quoteDetails', params: { quoteId: quoteCode } } | cxUrl
-        "
-        class="cx-card-actions"
-      >
-        {{ 'orderDetails.quoteDetail' | cxTranslate }}
-      </a>
-    </div>
-  </ng-container>
-</ng-template>

Diff for: feature-libs/order/components/order-details/order-overview/order-overview.component.spec.ts

@@ -1,4 +1,4 @@
-import { Component, Input, Pipe, PipeTransform } from '@angular/core';
+import { Component, Input } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { DeliveryMode } from '@spartacus/cart/base/root';
 import {
@@ -14,7 +14,6 @@ import { EMPTY, Observable, of } from 'rxjs';
 import { OrderDetailsService } from '../order-details.service';
 import { OrderOverviewComponent } from './order-overview.component';
 import { OrderOverviewComponentService } from './order-overview-component.service';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 
 @Component({
   selector: 'cx-card',
@@ -26,14 +25,6 @@ class MockCardComponent {
   content: Card;
 }
 
-@Pipe({
-  name: 'cxUrl',
-  standalone: false,
-})
-class MockUrlPipe implements PipeTransform {
-  transform() {}
-}
-
 const mockDeliveryAddress: Address = {
   firstName: 'John',
   lastName: 'Smith',
@@ -163,12 +154,7 @@ describe('OrderOverviewComponent', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [I18nTestingModule],
-      declarations: [
-        OrderOverviewComponent,
-        MockCardComponent,
-        MockUrlPipe,
-        MockFeatureDirective,
-      ],
+      declarations: [OrderOverviewComponent, MockCardComponent],
       providers: [
         { provide: TranslationService, useClass: MockTranslationService },
         {
@@ -566,24 +552,4 @@ describe('OrderOverviewComponent', () => {
       );
     });
   });
-
-  it('should render quote code in UI', () => {
-    component.order$ = of({ ...mockOrder, sapQuoteCode: '12345' });
-    fixture.detectChanges();
-    const quoteContainer =
-      fixture.nativeElement.querySelector('#quote-container');
-    expect(quoteContainer).not.toBeNull();
-    const quoteTemplate = quoteContainer.querySelector('.cx-card-title');
-    expect(quoteTemplate.textContent).toContain('12345');
-    const quoteLink = quoteContainer.querySelector('.cx-card-actions');
-    expect(quoteLink.innerText).toEqual('orderDetails.quoteDetail');
-  });
-
-  it('should not render quote code in UI', () => {
-    component.order$ = of({ ...mockOrder });
-    fixture.detectChanges();
-    const quoteContainer =
-      fixture.nativeElement.querySelector('#quote-container');
-    expect(quoteContainer).toBeNull();
-  });
 });

Diff for: feature-libs/order/occ/adapters/occ-order-history.adapter.spec.ts

@@ -12,7 +12,6 @@ import {
   ConverterService,
   OccConfig,
   OccEndpointsService,
-  OccFieldsService,
 } from '@spartacus/core';
 import {
   CancellationRequestEntryInputList,
@@ -49,7 +48,6 @@ describe('OccOrderHistoryAdapter', () => {
   let httpMock: HttpTestingController;
   let converter: ConverterService;
   let occEnpointsService: OccEndpointsService;
-  let occFieldsService: OccFieldsService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -69,7 +67,6 @@ describe('OccOrderHistoryAdapter', () => {
     httpMock = TestBed.inject(HttpTestingController);
     converter = TestBed.inject(ConverterService);
     occEnpointsService = TestBed.inject(OccEndpointsService);
-    occFieldsService = TestBed.inject(OccFieldsService);
     spyOn(converter, 'pipeable').and.callThrough();
     spyOn(converter, 'convert').and.callThrough();
     spyOn(occEnpointsService, 'buildUrl').and.callThrough();
@@ -125,42 +122,14 @@ describe('OccOrderHistoryAdapter', () => {
   });
 
   describe('getOrder', () => {
-    it('should fetch a single order without quote code', waitForAsync(() => {
-      spyOn(
-        (occOrderHistoryAdapter as any).featureConfigService,
-        'isEnabled'
-      ).and.returnValue(false);
-      occOrderHistoryAdapter.load(userId, orderData.code).subscribe();
-      httpMock.expectOne((req: HttpRequest<any>) => {
-        return req.method === 'GET';
-      }, `GET a single order`);
-      expect(occEnpointsService.buildUrl).toHaveBeenCalledWith('orderDetail', {
-        urlParams: { userId, orderId: orderData.code },
-      });
-      expect(occEnpointsService.buildUrl).not.toHaveBeenCalledWith(
-        'quoteCode',
-        {
-          urlParams: { userId, orderId: orderData.code },
-        }
-      );
-    }));
     it('should fetch a single order', waitForAsync(() => {
-      spyOn(occFieldsService, 'getOptimalUrlGroups').and.callThrough();
-      spyOn(
-        (occOrderHistoryAdapter as any).featureConfigService,
-        'isEnabled'
-      ).and.returnValue(true);
       occOrderHistoryAdapter.load(userId, orderData.code).subscribe();
       httpMock.expectOne((req: HttpRequest<any>) => {
         return req.method === 'GET';
       }, `GET a single order`);
       expect(occEnpointsService.buildUrl).toHaveBeenCalledWith('orderDetail', {
         urlParams: { userId, orderId: orderData.code },
       });
-      expect(occEnpointsService.buildUrl).toHaveBeenCalledWith('quoteCode', {
-        urlParams: { userId, orderId: orderData.code },
-      });
-      expect(occFieldsService.getOptimalUrlGroups).toHaveBeenCalled();
     }));
 
     it('should use converter', () => {

Diff for: feature-libs/order/occ/adapters/occ-order-history.adapter.ts

@@ -8,15 +8,12 @@ import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Injectable, inject } from '@angular/core';
 import {
   ConverterService,
-  FeatureConfigService,
   InterceptorUtil,
   LoggerService,
   OCC_USER_ID_ANONYMOUS,
   OCC_USER_ID_CURRENT,
   Occ,
   OccEndpointsService,
-  OccFieldsService,
-  ScopedDataWithUrl,
   USE_CLIENT_TOKEN,
   normalizeHttpError,
 } from '@spartacus/core';
@@ -45,8 +42,6 @@ const CONTENT_TYPE_JSON_HEADER = { 'Content-Type': 'application/json' };
 @Injectable()
 export class OccOrderHistoryAdapter implements OrderHistoryAdapter {
   protected logger = inject(LoggerService);
-  private occFieldsService = inject(OccFieldsService);
-  private featureConfigService = inject(FeatureConfigService);
 
   constructor(
     protected http: HttpClient,
@@ -55,24 +50,9 @@ export class OccOrderHistoryAdapter implements OrderHistoryAdapter {
   ) {}
 
   public load(userId: string, orderCode: string): Observable<Order> {
-    const url = this.featureConfigService.isEnabled('showOrderQuoteLink')
-      ? (() => {
-          const scopes = ['orderDetail', 'quoteCode'];
-          const scopedDataWithUrls: ScopedDataWithUrl[] = scopes.map(
-            (scope) => ({
-              scopedData: { scope, userId, orderCode },
-              url: this.occEndpoints.buildUrl(scope, {
-                urlParams: { userId, orderId: orderCode },
-              }),
-            })
-          );
-          const mergedUrl =
-            this.occFieldsService.getOptimalUrlGroups(scopedDataWithUrls);
-          return Object.keys(mergedUrl)[0];
-        })()
-      : this.occEndpoints.buildUrl('orderDetail', {
-          urlParams: { userId, orderId: orderCode },
-        });
+    const url = this.occEndpoints.buildUrl('orderDetail', {
+      urlParams: { userId, orderId: orderCode },
+    });
 
     let headers = new HttpHeaders();
     if (userId === OCC_USER_ID_ANONYMOUS) {

Diff for: feature-libs/order/occ/config/default-occ-order-config.ts

@@ -13,7 +13,6 @@ export const defaultOccOrderConfig: OccConfig = {
         /* eslint-disable max-len */
         orderHistory: 'users/${userId}/orders',
         orderDetail: 'users/${userId}/orders/${orderId}?fields=FULL',
-        quoteCode: 'users/${userId}/orders/${orderId}?fields=sapQuoteCode',
         consignmentTracking:
           'users/${userId}/orders/${orderCode}/consignments/${consignmentCode}/tracking',
         cancelOrder: 'users/${userId}/orders/${orderId}/cancellation',

Diff for: feature-libs/order/occ/model/occ-order-endpoints.model.ts

@@ -19,12 +19,6 @@ export interface OrderOccEndpoints {
    * @member {string}
    */
   orderDetail?: string | OccEndpoint;
-  /**
-   * Endpoint for Quote Code associated with the Order. The Quote Code is present if the order was placed from a quote.
-   *
-   * @member {string}
-   */
-  quoteCode?: string | OccEndpoint;
   /**
    * Endpoint for consignment tracking
    *

Diff for: feature-libs/order/root/model/order.model.ts

@@ -142,5 +142,4 @@ export interface Order {
   user?: Principal;
   returnable?: boolean;
   cancellable?: boolean;
-  sapQuoteCode?: string;
 }

Diff for: feature-libs/quote/assets/translations/en/quote.json

@@ -176,12 +176,10 @@
       "newCart": "New Cart",
       "quotes": "Quotes",
       "download": "Download Proposal",
-      "order": "Order Detail",
       "a11y": {
         "newCart": "Create new empty cart and navigate to it.",
         "quotes": "Navigate to quote search result list.",
-        "download": "Start downloading a quote proposal",
-        "order": "Navigate to order associated with this quote"
+        "download": "Start downloading a quote proposal"
       }
     },
     "list": {

Diff for: feature-libs/quote/components/links/quote-links.component.html

@@ -40,22 +40,6 @@
           {{ 'quote.links.download' | cxTranslate }}
         </button>
       </li>
-      <ng-container *cxFeature="'showOrderQuoteLink'">
-        <li *ngIf="quoteDetails.sapOrderCode">
-          <a
-            [attr.aria-label]="'quote.links.a11y.order' | cxTranslate"
-            class="link cx-action-link"
-            [routerLink]="
-              {
-                cxRoute: 'orderDetails',
-                params: { code: quoteDetails.sapOrderCode },
-              } | cxUrl
-            "
-          >
-            {{ 'quote.links.order' | cxTranslate }}</a
-          >
-        </li>
-      </ng-container>
     </ul>
   </section>
 </ng-container>

Diff for: feature-libs/quote/components/links/quote-links.component.spec.ts

@@ -32,7 +32,6 @@ import { createEmptyQuote } from '../../core/testing/quote-test-utils';
 import { CommonQuoteTestUtilsService } from '../testing/common-quote-test-utils.service';
 import { QuoteLinksComponent } from './quote-links.component';
 import createSpy = jasmine.createSpy;
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 
 class MockCartUtilsService implements Partial<CartUtilsService> {
   goToNewCart = createSpy();
@@ -58,11 +57,6 @@ const mockQuote: Quote = {
   totalPrice: totalPrice,
 };
 
-const mockWithOrderCode: Quote = {
-  ...mockQuote,
-  sapOrderCode: '12345',
-};
-
 const mockQuoteAttachment = (): File => {
   const blob = new Blob([''], { type: 'application/pdf' });
   return blob as File;
@@ -120,7 +114,7 @@ describe('QuoteLinksComponent', () => {
         UrlTestingModule,
         RouterModule.forRoot(mockRoutes),
       ],
-      declarations: [QuoteLinksComponent, MockFeatureDirective],
+      declarations: [QuoteLinksComponent],
       providers: [
         {
           provide: QuoteFacade,
@@ -325,29 +319,4 @@ describe('QuoteLinksComponent', () => {
       });
     });
   });
-
-  describe('order details link', () => {
-    it('should not show order details link when order code is present', () => {
-      const anchorElements =
-        fixture.nativeElement.querySelectorAll('a.cx-action-link');
-      const orderLink = Array.from(anchorElements).find(
-        (el: any) => el.innerText.trim() === 'quote.links.order'
-      );
-      expect(orderLink).toBeUndefined();
-    });
-    it('should show order details link when order code is present', async () => {
-      mockQuoteDetails$.next(mockWithOrderCode);
-      fixture.detectChanges();
-      const anchorElements =
-        fixture.nativeElement.querySelectorAll('a.cx-action-link');
-      const orderLink = Array.from(anchorElements).find(
-        (el: any) => el.innerText.trim() === 'quote.links.order'
-      );
-      expect(orderLink).not.toBeUndefined();
-      expect((orderLink as HTMLAnchorElement).href).toContain(
-        'cxRoute:orderDetails'
-      );
-      expect((orderLink as HTMLAnchorElement).href).toContain('code:12345');
-    });
-  });
 });

Diff for: feature-libs/quote/components/links/quote-links.module.ts

@@ -10,21 +10,14 @@ import { RouterModule } from '@angular/router';
 import {
   AuthGuard,
   CmsConfig,
-  FeaturesConfigModule,
   I18nModule,
   provideDefaultConfig,
   UrlModule,
 } from '@spartacus/core';
 import { QuoteLinksComponent } from './quote-links.component';
 
 @NgModule({
-  imports: [
-    CommonModule,
-    I18nModule,
-    RouterModule,
-    UrlModule,
-    FeaturesConfigModule,
-  ],
+  imports: [CommonModule, I18nModule, RouterModule, UrlModule],
   providers: [
     provideDefaultConfig(<CmsConfig>{
       cmsComponents: {