fix update control

Author: AlbaLopez552

src/app/guard/auth.service.ts

@@ -33,7 +33,7 @@ export class AuthService {
   role: WritableSignal<string | null> = signal(null);
 
   checkAuth(): Observable<boolean> {
-    return this.oidc.checkAuth().pipe(
+    /*return this.oidc.checkAuth().pipe(
       take(1),
       catchError(() => of({ isAuthenticated: false, accessToken: '', userData: {} } as any)),
       switchMap(async ({ isAuthenticated, accessToken, userData }) => {
@@ -62,7 +62,16 @@ export class AuthService {
 
         return true;
       })
-    );
+    );*/
+
+    // FAKE AUTH FOR DEV PURPOSES ONLY
+    const fakeAccessToken = "eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJodHRwczovL2NhdGFsb2cuaXNiZW9uYm9hcmQuY29tIiwiZXhwIjoxNzYyNTI0NTMxLCJpYXQiOjE3NjI1MjA5MzEsImlzcyI6Imh0dHBzOi8vY2VydGF1dGguZXZpZGVuY2VsZWRnZXIuZXUiLCJqdGkiOiJIVlFYV1dOV1ZHS1M3NE1YWEpDRjZKVUtKNSIsIm5vbmNlIjoiMzllYzViYzdhN2VhM2YzMDg2YTUzNDMyNWU1ODRjNTE1MGhPUmg3UWciLCJzY29wZSI6Im9wZW5pZCBlaWRhcyIsInN1YiI6Imh0dHBzOi8vY2F0YWxvZy5pc2Jlb25ib2FyZC5jb20iLCJ2YyI6eyJAY29udGV4dCI6WyJodHRwczovL3d3dy53My5vcmcvbnMvY3JlZGVudGlhbHMvIiwiaHR0cHM6Ly9jcmVkZW50aWFscy5ldWRpc3RhY2suZXUvLndlbGwta25vd24vY3JlZGVudGlhbHMvbGVhcl9jcmVkZW50aWFsX2VtcGxveWVlL3czYy92MyJdLCJjcmVkZW50aWFsU3RhdHVzIjp7ImlkIjoiaHR0cHM6Ly9pc3N1ZXIuZG9tZS1tYXJrZXRwbGFjZS1zYngub3JnL2JhY2tvZmZpY2UvdjEvY3JlZGVudGlhbHMvc3RhdHVzLzEjU1lDOTA4UklRUXFlVVhSMTluaDNFUSIsInN0YXR1c0xpc3RDcmVkZW50aWFsIjoiaHR0cHM6Ly9pc3N1ZXIuZG9tZS1tYXJrZXRwbGFjZS1zYngub3JnL2JhY2tvZmZpY2UvdjEvY3JlZGVudGlhbHMvc3RhdHVzLzEiLCJzdGF0dXNMaXN0SW5kZXgiOiJTWUM5MDhSSVFRcWVVWFIxOW5oM0VRIiwic3RhdHVzUHVycG9zZSI6InJldm9jYXRpb24iLCJ0eXBlIjoiUGxhaW5MaXN0RW50aXR5In0sImNyZWRlbnRpYWxTdWJqZWN0Ijp7Im1hbmRhdGUiOnsibWFuZGF0ZWUiOnsiZW1haWwiOiJhbGJhLmxvcGV6QGluMi5lcyIsImVtcGxveWVlSWQiOiIxMjM0NTY3OEEiLCJmaXJzdE5hbWUiOiJKb2huIiwiaWQiOiIxMjM0NTY3OEEiLCJsYXN0TmFtZSI6IkRvZSJ9LCJtYW5kYXRvciI6eyJjb21tb25OYW1lIjoiSm9obiBEb2UiLCJjb3VudHJ5IjoiRVMiLCJlbWFpbCI6ImFsYmEubG9wZXpAaW4yLmVzIiwiaWQiOiJkaWQ6ZWxzaTpWQVRFUy1HODc5MzYxNTkiLCJvcmdhbml6YXRpb24iOiJBTEFTVFJJQSIsIm9yZ2FuaXphdGlvbklkZW50aWZpZXIiOiJWQVRFUy1HODc5MzYxNTkiLCJzZXJpYWxOdW1iZXIiOiIxMjM0NTY3OEEifSwicG93ZXIiOlt7ImFjdGlvbiI6WyJFeGVjdXRlIl0sImRvbWFpbiI6IkRPTUUiLCJmdW5jdGlvbiI6Ik9uYm9hcmRpbmciLCJ0eXBlIjoiZG9tYWluIn0seyJhY3Rpb24iOlsiQ3JlYXRlIiwiVXBkYXRlIiwiRGVsZXRlIl0sImRvbWFpbiI6IkRPTUUiLCJmdW5jdGlvbiI6IlByb2R1Y3RPZmZlcmluZyIsInR5cGUiOiJkb21haW4ifV19fSwiZGVzY3JpcHRpb24iOiJWZXJpZmlhYmxlIENyZWRlbnRpYWwgZm9yIGVtcGxveWVlcyBvZiBhbiBvcmdhbml6YXRpb24iLCJpZCI6InVybjp1dWlkM09NTFdFUVFKTjI2WlJQUkJGWTJBQVg2RFIiLCJpc3N1ZXIiOnsiY29tbW9uTmFtZSI6IkNlcnRBdXRoIElkZW50aXR5IFByb3ZpZGVyIGZvciBJU0JFIiwiY291bnRyeSI6IkVTIiwiaWQiOiJkaWQ6ZWxzaTpWQVRFUy1CNjA2NDU5MDAiLCJvcmdhbml6YXRpb24iOiJJTjIiLCJvcmdhbml6YXRpb25JZGVudGlmaWVyIjoiVkFURVMtQjYwNjQ1OTAwIiwic2VyaWFsTnVtYmVyIjoiQjQ3NDQ3NTYwIn0sInR5cGUiOlsiTEVBUkNyZWRlbnRpYWxFbXBsb3llZSIsIlZlcmlmaWFibGVDcmVkZW50aWFsIl0sInZhbGlkRnJvbSI6IjIwMjUtMTEtMDRUMTg6MzY6NTBaIiwidmFsaWRVbnRpbCI6IjIwMjYtMTItMDZUMTg6MzY6NTBaIn19.K7OaHIWw1Z1TCUxWjm0n7WZJAlxQVO2e9ZvEtf8FTiNJ0K4rx1gdg_Do6SXqRnHTlx9aRdZQ1muD7wGNbcaseg";
+    let claims: any = this.decodeJwtPayload(fakeAccessToken);
+    const u = this.mapUserFromClaims(claims);
+    this.setState(true, u, fakeAccessToken ?? '', this.pickPrimaryRole(u));
+    const li = claimsToLoginInfo(claims, fakeAccessToken ?? '');
+    this.loginInfoSubject.next(li);
+    return of(true);
   }
 
   sellerId$ = combineLatest([this.loginInfo$, this.orgCtx.getOrganization()]).pipe(
@@ -139,4 +148,4 @@ export class AuthService {
       return null;
     }
   }
-}
+}

src/app/offerings/gallery/gallery.component.html

@@ -83,7 +83,7 @@
 
 </section>
 
-@if (products.length === 0){
+@if (products.length === 0 && !loading) {
   <div class="py-8 flex justify-center w-full lg:py-16">
     <div class="flex items-center p-4 mb-4 text-sm text-primary-100 rounded-lg bg-purple-50 dark:bg-secondary-200 dark:text-primary-50" role="alert">
       <svg class="flex-shrink-0 inline w-4 h-4 me-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">

src/app/pages/admin/categories/update-category/update-category.component.html

@@ -181,7 +181,7 @@ <h2 class="text-3xl font-bold text-primary-100 ml-4 dark:text-white">{{ 'UPDATE_
 
 
                     <div class="flex w-full justify-items-end justify-end ml-4">
-                        <button type="button" (click)="updateCategory();" [disabled]="isCatValid()" [ngClass]="isCatValid() ? 'opacity-50' : 'hover:bg-primary-50'" class="flex text-white justify-end bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-purple-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center">
+                        <button type="button" (click)="updateCategory();" [disabled]="!isCatValid()" [ngClass]="!isCatValid() ? 'opacity-50' : 'hover:bg-primary-50'" class="flex text-white justify-end bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-purple-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center">
                             {{ 'UPDATE_CATEGORIES._update' | translate }}
                             <svg class="rtl:rotate-180 w-3.5 h-3.5 ms-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 10">
                             <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 5h12m0 0L9 1m4 4L9 9"/>

src/app/pages/admin/categories/update-category/update-category.component.ts

@@ -459,9 +459,9 @@ export class UpdateCategoryComponent implements OnInit {
   }
 
   isCatValid(){
-    if((this.edited && this.catStatusDraft !== 'Active')|| !this.generalForm.valid){
-      return true;
+    if((this.edited && this.catStatusDraft === 'Launched')|| !this.generalForm.valid){
+      return false;
     }
-    return false;
+    return true;
   }
 }

src/app/pages/seller-offerings/offerings/seller-product-spec/update-product-spec/update-product-spec.component.html

@@ -1296,7 +1296,7 @@ <h2 class="text-3xl font-bold text-primary-100 ml-4 dark:text-white">{{ 'UPDATE_
                             </div>
                         }
                         <div class="flex w-full justify-items-end justify-end ml-4">
-                            <button type="button" (click)="updateProduct();" [disabled]="isProdValid()" [ngClass]="isProdValid() ? 'opacity-50' : 'hover:bg-primary-50'"  class="flex text-white justify-end bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-purple-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center">
+                            <button type="button" (click)="updateProduct();" [disabled]="!isProdValid()" [ngClass]="!isProdValid() ? 'opacity-50' : 'hover:bg-primary-50'"  class="flex text-white justify-end bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-purple-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center">
                                 {{ 'UPDATE_PROD_SPEC._update_prod' | translate }}
                                 <svg class="rtl:rotate-180 w-3.5 h-3.5 ms-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 10">
                                 <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 5h12m0 0L9 1m4 4L9 9"/>

src/app/pages/seller-offerings/offerings/seller-product-spec/update-product-spec/update-product-spec.component.ts

@@ -1144,21 +1144,21 @@ export class UpdateProductSpecComponent implements OnInit {
   }
 
   isProdValid(){
-    if(this.edited && this.prodStatusDraft !== 'Active'){
-      return true;
+    if (this.edited && this.prodStatusDraft === 'Launched') {
+      return false;
     }
     if(this.generalForm.valid){
       if(this.bundleChecked){
         if(this.prodSpecsBundle.length<2){
-          return true;
-        } else {
           return false;
+        } else {
+          return true;
         }
       } else {
-        return false;
+        return true;
       }
     } else {
-      return true;
+      return false;
     }
   }
 

src/app/shared/forms/offer/offer.component.ts

@@ -1175,17 +1175,9 @@ export class OfferComponent implements OnInit, OnDestroy{
     if (this.formType === 'create') {
       return true;
     }
-
-    const currentStatus = this.productOfferForm.get('generalInfo')?.value?.status;
-    const originalStatus = this.offer?.lifecycleStatus;
-    const edited = hasNonStatusChanges(
-      this.buildSnapshot('offer'),
-      this.buildSnapshot('form')
-    );
-    if (originalStatus === 'Launched' && edited && currentStatus !== 'Active') {
-      return false;
+    if (this.edited && this.productOfferForm.get('generalInfo')?.value?.status === 'Launched') {
+        return false;
     }
-
     return true;
   }