From 622d90fdec122977a53878c9b51bcbf6eabc7cd3 Mon Sep 17 00:00:00 2001
From: Ivan Mitev <>
Date: Thu, 11 Dec 2025 23:46:54 +0100
Subject: [PATCH] FIX: Organisation profile view rights bug

---
 src/app/app-routing.module.ts                 |   2 +-
 .../billing-info/billing-info.component.html  |  40 +--
 .../billing-info/billing-info.component.ts    |   9 +
 .../org-info/org-info.component.html          | 267 ++++++++++--------
 .../org-info/org-info.component.ts            |  25 +-
 src/app/shared/header/header.component.html   |   8 +-
 6 files changed, 207 insertions(+), 144 deletions(-)

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index ad043153..bd5d8259 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -72,7 +72,7 @@ const routes: Routes = [
   },
   { path: 'profile',
   component: UserProfileComponent,
-  canActivate: [AuthGuard], data: { roles: ['individual','orgAdmin'] }
+  canActivate: [AuthGuard], data: { roles: [] }
   },
   { path: 'my-offerings',
   component: SellerOfferingsComponent,
diff --git a/src/app/pages/user-profile/profile-sections/billing-info/billing-info.component.html b/src/app/pages/user-profile/profile-sections/billing-info/billing-info.component.html
index fd495793..ec2517d5 100644
--- a/src/app/pages/user-profile/profile-sections/billing-info/billing-info.component.html
+++ b/src/app/pages/user-profile/profile-sections/billing-info/billing-info.component.html
@@ -26,9 +26,11 @@ <h2 class="md:text-3xl lg:text-4xl font-bold text-primary-100 ml-4 dark:text-whi
                         <th scope="col" class="px-6 py-3">
                             {{ 'BILLING._phone' | translate }}
                         </th>
-                        <th scope="col" class="px-6 py-3">
-                            {{ 'BILLING._action' | translate }}
-                        </th>
+                        @if(!isReadOnly){
+                            <th scope="col" class="px-6 py-3">
+                                {{ 'BILLING._action' | translate }}
+                            </th>
+                        }
                     </tr>
                 </thead>
                 <tbody>
@@ -49,18 +51,20 @@ <h2 class="md:text-3xl lg:text-4xl font-bold text-primary-100 ml-4 dark:text-whi
                             <td class="px-6 py-4">
                                 ({{bill.telephoneType}}) {{bill.telephoneNumber}}
                             </td>
-                            <td class="px-6 py-4 inline-flex">
-                                <button data-cy="billingEdit" (click)="toggleEditBill(bill);$event.stopPropagation();" type="button" class="text-white bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-full text-sm p-1 lg:p-2.5 text-center inline-flex items-center me-2">
-                                    <svg class="w-[18px] h-[18px] text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
-                                        <path fill-rule="evenodd" d="M14 4.182A4.136 4.136 0 0 1 16.9 3c1.087 0 2.13.425 2.899 1.182A4.01 4.01 0 0 1 21 7.037c0 1.068-.43 2.092-1.194 2.849L18.5 11.214l-5.8-5.71 1.287-1.31.012-.012Zm-2.717 2.763L6.186 12.13l2.175 2.141 5.063-5.218-2.141-2.108Zm-6.25 6.886-1.98 5.849a.992.992 0 0 0 .245 1.026 1.03 1.03 0 0 0 1.043.242L10.282 19l-5.25-5.168Zm6.954 4.01 5.096-5.186-2.218-2.183-5.063 5.218 2.185 2.15Z" clip-rule="evenodd"/>
-                                    </svg>
-                                </button>
-                                <!--<button (click)="toggleDeleteBill(bill);$event.stopPropagation();" type="button" class="text-white bg-red-800 hover:bg-red-900 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-full text-sm p-1 lg:p-2.5 text-center inline-flex items-center me-2">
-                                    <svg class="w-[18px] h-[18px] text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
-                                        <path fill-rule="evenodd" d="M8.586 2.586A2 2 0 0 1 10 2h4a2 2 0 0 1 2 2v2h3a1 1 0 1 1 0 2v12a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V8a1 1 0 0 1 0-2h3V4a2 2 0 0 1 .586-1.414ZM10 6h4V4h-4v2Zm1 4a1 1 0 1 0-2 0v8a1 1 0 1 0 2 0v-8Zm4 0a1 1 0 1 0-2 0v8a1 1 0 1 0 2 0v-8Z" clip-rule="evenodd"/>
+                            @if(!isReadOnly){
+                                <td class="px-6 py-4 inline-flex">
+                                    <button data-cy="billingEdit" (click)="toggleEditBill(bill);$event.stopPropagation();" type="button" class="text-white bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-full text-sm p-1 lg:p-2.5 text-center inline-flex items-center me-2">
+                                        <svg class="w-[18px] h-[18px] text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
+                                            <path fill-rule="evenodd" d="M14 4.182A4.136 4.136 0 0 1 16.9 3c1.087 0 2.13.425 2.899 1.182A4.01 4.01 0 0 1 21 7.037c0 1.068-.43 2.092-1.194 2.849L18.5 11.214l-5.8-5.71 1.287-1.31.012-.012Zm-2.717 2.763L6.186 12.13l2.175 2.141 5.063-5.218-2.141-2.108Zm-6.25 6.886-1.98 5.849a.992.992 0 0 0 .245 1.026 1.03 1.03 0 0 0 1.043.242L10.282 19l-5.25-5.168Zm6.954 4.01 5.096-5.186-2.218-2.183-5.063 5.218 2.185 2.15Z" clip-rule="evenodd"/>
                                         </svg>
-                                </button>-->
-                            </td>
+                                    </button>
+                                    <!--<button (click)="toggleDeleteBill(bill);$event.stopPropagation();" type="button" class="text-white bg-red-800 hover:bg-red-900 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-full text-sm p-1 lg:p-2.5 text-center inline-flex items-center me-2">
+                                        <svg class="w-[18px] h-[18px] text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
+                                            <path fill-rule="evenodd" d="M8.586 2.586A2 2 0 0 1 10 2h4a2 2 0 0 1 2 2v2h3a1 1 0 1 1 0 2v12a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V8a1 1 0 0 1 0-2h3V4a2 2 0 0 1 .586-1.414ZM10 6h4V4h-4v2Zm1 4a1 1 0 1 0-2 0v8a1 1 0 1 0 2 0v-8Zm4 0a1 1 0 1 0-2 0v8a1 1 0 1 0 2 0v-8Z" clip-rule="evenodd"/>
+                                            </svg>
+                                    </button>-->
+                                </td>
+                            }
                         </tr>
                     } @empty {
                         <div class="flex justify-center w-full m-4">
@@ -77,9 +81,11 @@ <h2 class="md:text-3xl lg:text-4xl font-bold text-primary-100 ml-4 dark:text-whi
                 </tbody>
             </table>
         </div>
-        <h2 class="md:text-3xl lg:text-4xl font-bold text-primary-100 ml-4 dark:text-white m-4">{{ 'BILLING._add' | translate }}</h2>
-        <hr class="h-px mr-4 ml-4 bg-primary-100 dark:bg-white border-0">
-        <app-billing-account-form [preferred]="preferred"></app-billing-account-form>
+        @if(!isReadOnly){
+            <h2 class="md:text-3xl lg:text-4xl font-bold text-primary-100 ml-4 dark:text-white m-4">{{ 'BILLING._add' | translate }}</h2>
+            <hr class="h-px mr-4 ml-4 bg-primary-100 dark:bg-white border-0">
+            <app-billing-account-form [preferred]="preferred"></app-billing-account-form>
+        }
     </div>
 }
 
diff --git a/src/app/pages/user-profile/profile-sections/billing-info/billing-info.component.ts b/src/app/pages/user-profile/profile-sections/billing-info/billing-info.component.ts
index fd3eb82d..affcbe12 100644
--- a/src/app/pages/user-profile/profile-sections/billing-info/billing-info.component.ts
+++ b/src/app/pages/user-profile/profile-sections/billing-info/billing-info.component.ts
@@ -41,6 +41,7 @@ export class BillingInfoComponent implements OnInit{
   selectedDate:any;
   countries: any[] = countries;
   preferred:boolean=false;
+  isReadOnly:boolean=false;
 
   errorMessage:any='';
   showError:boolean=false;
@@ -105,6 +106,13 @@ export class BillingInfoComponent implements OnInit{
           href : this.partyId,
           role: "Owner"
         }
+
+        // Check if user has orgAdmin role for edit permission
+        if(loggedOrg && loggedOrg.roles){
+          const orgRoles = loggedOrg.roles.map((role: any) => role.name);
+          const hasOrgAdminRole = orgRoles.some((role: any) => role === 'orgAdmin');
+          this.isReadOnly = !hasOrgAdminRole;
+        }
       } else {
         this.partyId = aux.partyId;
         console.log('init party info')
@@ -115,6 +123,7 @@ export class BillingInfoComponent implements OnInit{
           href : this.partyId,
           role: "Owner"
         }
+        this.isReadOnly = false;
       }
       this.getBilling();
     }
diff --git a/src/app/pages/user-profile/profile-sections/org-info/org-info.component.html b/src/app/pages/user-profile/profile-sections/org-info/org-info.component.html
index cb666209..cf6da907 100644
--- a/src/app/pages/user-profile/profile-sections/org-info/org-info.component.html
+++ b/src/app/pages/user-profile/profile-sections/org-info/org-info.component.html
@@ -13,21 +13,35 @@ <h2 class="md:text-3xl lg:text-4xl font-bold text-primary-100 ml-4 dark:text-whi
         <form class="m-4 grid md:grid-cols-2 gap-4" [formGroup]="profileForm">
             <div>
                 <span class="font-bold dark:text-white">{{ 'PROFILE._name' | translate }} (*)</span>
-                <input type="text" formControlName="name" id="name"
-                class="mb-2 bg-gray-50 text-gray-900 dark:bg-secondary-300 dark:text-white text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5"
-                [ngClass]="(profileForm.get('name')?.invalid == true && profileForm.value.name!='') || (profileForm.get('name')?.touched && profileForm.value.name=='') ? 'border-red-600' : 'border-gray-300 dark:border-secondary-200'" />
+                <input type="text" formControlName="name" id="name" [readonly]="isReadOnly"
+                [ngClass]="{
+                    'bg-gray-100 dark:bg-gray-700 cursor-not-allowed': isReadOnly,
+                    'bg-gray-50 dark:bg-secondary-300': !isReadOnly,
+                    'border-red-600': (profileForm.get('name')?.invalid == true && profileForm.value.name!='') || (profileForm.get('name')?.touched && profileForm.value.name==''),
+                    'border-gray-300 dark:border-secondary-200': !((profileForm.get('name')?.invalid == true && profileForm.value.name!='') || (profileForm.get('name')?.touched && profileForm.value.name==''))
+                }"
+                class="mb-2 text-gray-900 dark:text-white text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5" />
                 @if(profileForm.get('name')?.invalid && profileForm.get('name')?.errors?.['required'] && (profileForm.get('name')?.touched && profileForm.value.name=='')){
                     <p class="text-sm text-red-600 dark:text-red-500"><span class="font-medium">This field is mandatory.</span></p>
-                } 
+                }
             </div>
             <div>
                 <span class="font-bold dark:text-white">{{ 'PROFILE._website' | translate }}</span>
-                <input type="text" formControlName="website" id="website"
-                class="mb-2 bg-gray-50 border border-gray-300 text-gray-900 dark:bg-secondary-300 dark:border-secondary-200 dark:text-white text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5" />    
+                <input type="text" formControlName="website" id="website" [readonly]="isReadOnly"
+                [ngClass]="{
+                    'bg-gray-100 dark:bg-gray-700 cursor-not-allowed': isReadOnly,
+                    'bg-gray-50 dark:bg-secondary-300': !isReadOnly
+                }"
+                class="mb-2 border border-gray-300 text-gray-900 dark:border-secondary-200 dark:text-white text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5" />
             </div>
             <div>
                 <span class="font-bold dark:text-white">{{ 'PROFILE._country' | translate }} (*)</span>
-                <select data-cy="orgCountry" id="country" formControlName="country" class="mb-2 bg-gray-50 border border-gray-300 text-gray-900 dark:bg-secondary-300 dark:border-secondary-200 dark:text-white text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5">
+                <select data-cy="orgCountry" id="country" formControlName="country" [disabled]="isReadOnly"
+                [ngClass]="{
+                    'bg-gray-100 dark:bg-gray-700 cursor-not-allowed pointer-events-none': isReadOnly,
+                    'bg-gray-50 dark:bg-secondary-300': !isReadOnly
+                }"
+                class="mb-2 border border-gray-300 text-gray-900 dark:border-secondary-200 dark:text-white text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5">
                     <option *ngFor="let country of euCountries" [value]="country.code">
                       {{ country.name }}
                     </option>
@@ -35,114 +49,128 @@ <h2 class="md:text-3xl lg:text-4xl font-bold text-primary-100 ml-4 dark:text-whi
             </div>
 
             <label class="font-bold text-lg col-span-2 dark:text-white">{{ 'UPDATE_OFFER._description' | translate }}</label>
-            <div class="w-full col-span-2 mb-4 border border-gray-200 rounded-lg bg-gray-50 dark:bg-secondary-200 dark:border-secondary-200">
-                <div class="flex items-center justify-between px-3 py-2 border-b">
-                    <div class="flex flex-wrap items-center divide-gray-200 dark:divide-secondary-200 sm:divide-x sm:rtl:divide-x-reverse">
-                        <div class="flex items-center space-x-1 rtl:space-x-reverse sm:pe-4 text-gray-500 dark:text-gray-200">
-                            <button [disabled]="showPreview" [ngClass]="showPreview ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'" (click)="addBold()" type="button"
-                                class="p-2 rounded hover:text-gray-900 hover:bg-gray-100">
-                                <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 24 24">
-                                    <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 5h4.5a3.5 3.5 0 1 1 0 7H8m0-7v7m0-7H6m2 7h6.5a3.5 3.5 0 1 1 0 7H8m0-7v7m0 0H6"/>
-                                </svg>                                          
-                                <span class="sr-only">Bold</span>
-                            </button>
-                            <button [disabled]="showPreview" [ngClass]="showPreview ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'" (click)="addItalic()" type="button"
-                                class="p-2 rounded hover:text-gray-900 hover:bg-gray-100">
-                                <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 24 24">
-                                    <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m8.874 19 6.143-14M6 19h6.33m-.66-14H18"/>
-                                </svg>                                                                                 
-                                <span class="sr-only">Italic</span>
-                            </button>
-                            <button [disabled]="showPreview" [ngClass]="showPreview ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'" (click)="addList()" type="button"
-                                class="p-2 rounded hover:text-gray-900 hover:bg-gray-100">
-                                <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
-                                    <path stroke="currentColor" stroke-linecap="round" stroke-width="2" d="M9 8h10M9 12h10M9 16h10M4.99 8H5m-.02 4h.01m0 4H5"/>
-                                </svg>                                          
-                                <span class="sr-only">Add list</span>
-                            </button>
-                            <button [disabled]="showPreview" [ngClass]="showPreview ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'" (click)="addOrderedList()" type="button"
-                                class="hidden lg:block p-2 rounded hover:text-gray-900 hover:bg-gray-100">
-                                <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
-                                    <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6h8m-8 6h8m-8 6h8M4 16a2 2 0 1 1 3.321 1.5L4 20h5M4 5l2-1v6m-2 0h4"/>
-                                </svg>                                          
-                                <span class="sr-only">Add ordered list</span>
-                            </button>
-                            <button [disabled]="showPreview" [ngClass]="showPreview ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'" (click)="addBlockquote()" type="button"
-                                class="hidden md:block p-2 rounded hover:text-gray-900 hover:bg-gray-100">
-                                <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
-                                    <path fill-rule="evenodd" d="M5 6a1 1 0 0 1 1-1h12a1 1 0 1 1 0 2H6a1 1 0 0 1-1-1Zm0 12a1 1 0 0 1 1-1h12a1 1 0 1 1 0 2H6a1 1 0 0 1-1-1Zm1.65-9.76A1 1 0 0 0 5 9v6a1 1 0 0 0 1.65.76l3.5-3a1 1 0 0 0 0-1.52l-3.5-3ZM12 10a1 1 0 0 1 1-1h5a1 1 0 1 1 0 2h-5a1 1 0 0 1-1-1Zm0 4a1 1 0 0 1 1-1h5a1 1 0 1 1 0 2h-5a1 1 0 0 1-1-1Z" clip-rule="evenodd"/>
-                                </svg>                                         
-                                <span class="sr-only">Add blockquote</span>
-                            </button>
-                            <button [disabled]="showPreview" [ngClass]="showPreview ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'" (click)="addTable()" type="button"
-                                class="p-2 rounded hover:text-gray-900 hover:bg-gray-100">
-                                <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-                                    <path stroke="currentColor" stroke-width="2" d="M3 11h18m-9 0v8m-8 0h16a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1H4a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1Z"/>
-                                </svg>                                         
-                                <span class="sr-only">Add table</span>
-                            </button>                                 
-                            <button [disabled]="showPreview" [ngClass]="showPreview ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'" (click)="addCode()" type="button"
-                                class="hidden md:block p-2 rounded hover:text-gray-900 hover:bg-gray-100">
-                                <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-                                    <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m8 8-4 4 4 4m8 0 4-4-4-4m-2-3-4 14"/>
-                                </svg>                                        
-                                <span class="sr-only">Add code</span>
-                            </button>
-                            <button [disabled]="showPreview" [ngClass]="showPreview ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'" (click)="addCodeBlock()" type="button"
-                                class="hidden md:block p-2 rounded hover:text-gray-900 hover:bg-gray-100">
-                                <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-                                    <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 3v4a1 1 0 0 1-1 1H5m5 4-2 2 2 2m4-4 2 2-2 2m5-12v16a1 1 0 0 1-1 1H6a1 1 0 0 1-1-1V7.914a1 1 0 0 1 .293-.707l3.914-3.914A1 1 0 0 1 9.914 3H18a1 1 0 0 1 1 1Z"/>
-                                  </svg>                                                                                  
-                                <span class="sr-only">Add code block</span>
-                            </button>
-                            <button [disabled]="showPreview" [ngClass]="showPreview ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'" (click)="addLink()" type="button"
-                                class="hidden md:block p-2 rounded hover:text-gray-900 hover:bg-gray-100">
-                                <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-                                    <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13.213 9.787a3.391 3.391 0 0 0-4.795 0l-3.425 3.426a3.39 3.39 0 0 0 4.795 4.794l.321-.304m-.321-4.49a3.39 3.39 0 0 0 4.795 0l3.424-3.426a3.39 3.39 0 0 0-4.794-4.795l-1.028.961"/>
-                                </svg>                                                                                
-                                <span class="sr-only">Add link</span>
-                            </button>
-                            <button [disabled]="showPreview" [ngClass]="showPreview ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'" (click)="showEmoji=!showEmoji;$event.stopPropagation();" type="button"
-                                class="hidden lg:block p-2 rounded hover:text-gray-900 hover:bg-gray-100">
-                                <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
-                                    <path d="M10 .5a9.5 9.5 0 1 0 9.5 9.5A9.51 9.51 0 0 0 10 .5ZM13.5 6a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3Zm-7 0a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3Zm3.5 9.5A5.5 5.5 0 0 1 4.6 11h10.81A5.5 5.5 0 0 1 10 15.5Z"/>
-                                </svg>
-                                <span class="sr-only">Add emoji</span>
-                            </button>
+            @if(isReadOnly) {
+                <!-- Read-only view: Show only the preview -->
+                <div class="w-full col-span-2 mb-4 border border-gray-200 rounded-lg bg-gray-100 dark:bg-gray-700 dark:border-secondary-200">
+                    <div class="px-4 py-2 rounded-lg">
+                        <markdown [ngClass]="{
+                            'break-all': hasLongWord(description, 20),
+                            'break-words': !hasLongWord(description, 20)
+                        }" class="text-gray-800 dark:text-gray-200 text-wrap break-words" [data]="description"></markdown>
+                    </div>
+                </div>
+            } @else {
+                <!-- Editable view: Show toolbar and editor -->
+                <div class="w-full col-span-2 mb-4 border border-gray-200 rounded-lg bg-gray-50 dark:bg-secondary-200 dark:border-secondary-200">
+                    <div class="flex items-center justify-between px-3 py-2 border-b">
+                        <div class="flex flex-wrap items-center divide-gray-200 dark:divide-secondary-200 sm:divide-x sm:rtl:divide-x-reverse">
+                            <div class="flex items-center space-x-1 rtl:space-x-reverse sm:pe-4 text-gray-500 dark:text-gray-200">
+                                <button [disabled]="showPreview" [ngClass]="showPreview ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'" (click)="addBold()" type="button"
+                                    class="p-2 rounded hover:text-gray-900 hover:bg-gray-100">
+                                    <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 24 24">
+                                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 5h4.5a3.5 3.5 0 1 1 0 7H8m0-7v7m0-7H6m2 7h6.5a3.5 3.5 0 1 1 0 7H8m0-7v7m0 0H6"/>
+                                    </svg>
+                                    <span class="sr-only">Bold</span>
+                                </button>
+                                <button [disabled]="showPreview" [ngClass]="showPreview ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'" (click)="addItalic()" type="button"
+                                    class="p-2 rounded hover:text-gray-900 hover:bg-gray-100">
+                                    <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 24 24">
+                                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m8.874 19 6.143-14M6 19h6.33m-.66-14H18"/>
+                                    </svg>
+                                    <span class="sr-only">Italic</span>
+                                </button>
+                                <button [disabled]="showPreview" [ngClass]="showPreview ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'" (click)="addList()" type="button"
+                                    class="p-2 rounded hover:text-gray-900 hover:bg-gray-100">
+                                    <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+                                        <path stroke="currentColor" stroke-linecap="round" stroke-width="2" d="M9 8h10M9 12h10M9 16h10M4.99 8H5m-.02 4h.01m0 4H5"/>
+                                    </svg>
+                                    <span class="sr-only">Add list</span>
+                                </button>
+                                <button [disabled]="showPreview" [ngClass]="showPreview ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'" (click)="addOrderedList()" type="button"
+                                    class="hidden lg:block p-2 rounded hover:text-gray-900 hover:bg-gray-100">
+                                    <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+                                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6h8m-8 6h8m-8 6h8M4 16a2 2 0 1 1 3.321 1.5L4 20h5M4 5l2-1v6m-2 0h4"/>
+                                    </svg>
+                                    <span class="sr-only">Add ordered list</span>
+                                </button>
+                                <button [disabled]="showPreview" [ngClass]="showPreview ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'" (click)="addBlockquote()" type="button"
+                                    class="hidden md:block p-2 rounded hover:text-gray-900 hover:bg-gray-100">
+                                    <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
+                                        <path fill-rule="evenodd" d="M5 6a1 1 0 0 1 1-1h12a1 1 0 1 1 0 2H6a1 1 0 0 1-1-1Zm0 12a1 1 0 0 1 1-1h12a1 1 0 1 1 0 2H6a1 1 0 0 1-1-1Zm1.65-9.76A1 1 0 0 0 5 9v6a1 1 0 0 0 1.65.76l3.5-3a1 1 0 0 0 0-1.52l-3.5-3ZM12 10a1 1 0 0 1 1-1h5a1 1 0 1 1 0 2h-5a1 1 0 0 1-1-1Zm0 4a1 1 0 0 1 1-1h5a1 1 0 1 1 0 2h-5a1 1 0 0 1-1-1Z" clip-rule="evenodd"/>
+                                    </svg>
+                                    <span class="sr-only">Add blockquote</span>
+                                </button>
+                                <button [disabled]="showPreview" [ngClass]="showPreview ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'" (click)="addTable()" type="button"
+                                    class="p-2 rounded hover:text-gray-900 hover:bg-gray-100">
+                                    <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+                                        <path stroke="currentColor" stroke-width="2" d="M3 11h18m-9 0v8m-8 0h16a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1H4a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1Z"/>
+                                    </svg>
+                                    <span class="sr-only">Add table</span>
+                                </button>
+                                <button [disabled]="showPreview" [ngClass]="showPreview ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'" (click)="addCode()" type="button"
+                                    class="hidden md:block p-2 rounded hover:text-gray-900 hover:bg-gray-100">
+                                    <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+                                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m8 8-4 4 4 4m8 0 4-4-4-4m-2-3-4 14"/>
+                                    </svg>
+                                    <span class="sr-only">Add code</span>
+                                </button>
+                                <button [disabled]="showPreview" [ngClass]="showPreview ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'" (click)="addCodeBlock()" type="button"
+                                    class="hidden md:block p-2 rounded hover:text-gray-900 hover:bg-gray-100">
+                                    <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+                                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 3v4a1 1 0 0 1-1 1H5m5 4-2 2 2 2m4-4 2 2-2 2m5-12v16a1 1 0 0 1-1 1H6a1 1 0 0 1-1-1V7.914a1 1 0 0 1 .293-.707l3.914-3.914A1 1 0 0 1 9.914 3H18a1 1 0 0 1 1 1Z"/>
+                                      </svg>
+                                    <span class="sr-only">Add code block</span>
+                                </button>
+                                <button [disabled]="showPreview" [ngClass]="showPreview ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'" (click)="addLink()" type="button"
+                                    class="hidden md:block p-2 rounded hover:text-gray-900 hover:bg-gray-100">
+                                    <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+                                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13.213 9.787a3.391 3.391 0 0 0-4.795 0l-3.425 3.426a3.39 3.39 0 0 0 4.795 4.794l.321-.304m-.321-4.49a3.39 3.39 0 0 0 4.795 0l3.424-3.426a3.39 3.39 0 0 0-4.794-4.795l-1.028.961"/>
+                                    </svg>
+                                    <span class="sr-only">Add link</span>
+                                </button>
+                                <button [disabled]="showPreview" [ngClass]="showPreview ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'" (click)="showEmoji=!showEmoji;$event.stopPropagation();" type="button"
+                                    class="hidden lg:block p-2 rounded hover:text-gray-900 hover:bg-gray-100">
+                                    <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
+                                        <path d="M10 .5a9.5 9.5 0 1 0 9.5 9.5A9.51 9.51 0 0 0 10 .5ZM13.5 6a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3Zm-7 0a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3Zm3.5 9.5A5.5 5.5 0 0 1 4.6 11h10.81A5.5 5.5 0 0 1 10 15.5Z"/>
+                                    </svg>
+                                    <span class="sr-only">Add emoji</span>
+                                </button>
+                            </div>
+                        </div>
+                        <button type="button" (click)="showPreview=!showPreview;togglePreview()" data-tooltip-target="tooltip-fullscreen" class="rounded cursor-pointer text-gray-500 dark:text-gray-200 p-2 sm:ms-auto hover:text-gray-900 dark:hover:text-gray-900 hover:bg-gray-100">
+                            <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+                                <path stroke="currentColor" stroke-width="2" d="M21 12c0 1.2-4.03 6-9 6s-9-4.8-9-6c0-1.2 4.03-6 9-6s9 4.8 9 6Z"/>
+                                <path stroke="currentColor" stroke-width="2" d="M15 12a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z"/>
+                              </svg>
+
+                            <span class="sr-only">{{ 'CREATE_CATALOG._preview' | translate }}</span>
+                        </button>
+                        <div id="tooltip-fullscreen" role="tooltip" class="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-white transition-opacity duration-300 bg-gray-900 rounded-lg shadow-sm opacity-0 tooltip">
+                            {{ 'CREATE_CATALOG._show_preview' | translate }}
+                            <div class="tooltip-arrow" data-popper-arrow></div>
                         </div>
                     </div>
-                    <button type="button" (click)="showPreview=!showPreview;togglePreview()" data-tooltip-target="tooltip-fullscreen" class="rounded cursor-pointer text-gray-500 dark:text-gray-200 p-2 sm:ms-auto hover:text-gray-900 dark:hover:text-gray-900 hover:bg-gray-100">
-                        <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
-                            <path stroke="currentColor" stroke-width="2" d="M21 12c0 1.2-4.03 6-9 6s-9-4.8-9-6c0-1.2 4.03-6 9-6s9 4.8 9 6Z"/>
-                            <path stroke="currentColor" stroke-width="2" d="M15 12a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z"/>
-                          </svg>
-                          
-                        <span class="sr-only">{{ 'CREATE_CATALOG._preview' | translate }}</span>
-                    </button>
-                    <div id="tooltip-fullscreen" role="tooltip" class="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-white transition-opacity duration-300 bg-gray-900 rounded-lg shadow-sm opacity-0 tooltip">
-                        {{ 'CREATE_CATALOG._show_preview' | translate }}
-                        <div class="tooltip-arrow" data-popper-arrow></div>
+                    <div class="px-4 py-2 bg-white dark:bg-secondary-300 rounded-b-lg">
+                        <label for="editor" class="sr-only">Publish post</label>
+                        @if(showPreview){
+                                <markdown [ngClass]="{
+                                    'break-all': hasLongWord(description, 20),
+                                    'break-words': !hasLongWord(description, 20)
+                                    }" class="text-gray-800 dark:text-gray-200 text-wrap break-words" [data]="description"></markdown>
+
+                        }@else{
+                            <textarea id="editor" formControlName="description" rows="8" class="block w-full min-h-fit px-0 text-sm text-gray-800 dark:text-gray-200 bg-white dark:bg-secondary-300 border-0" placeholder="Add product description..." ></textarea>
+                        }
+                        @if(showEmoji){
+                            <emoji-mart (click)="$event.stopPropagation();" [darkMode]="false" [style]="{ position: 'relative', left: '200px', top: '-500px' }" (emojiClick)="addEmoji($event)"></emoji-mart>
+                        }
+
                     </div>
                 </div>
-                <div class="px-4 py-2 bg-white dark:bg-secondary-300 rounded-b-lg">
-                    <label for="editor" class="sr-only">Publish post</label>
-                    @if(showPreview){
-                            <markdown [ngClass]="{
-                                'break-all': hasLongWord(description, 20),
-                                'break-words': !hasLongWord(description, 20)
-                                }" class="text-gray-800 dark:text-gray-200 text-wrap break-words" [data]="description"></markdown>
-                        
-                    }@else{
-                        <textarea id="editor" formControlName="description" rows="8" class="block w-full min-h-fit px-0 text-sm text-gray-800 dark:text-gray-200 bg-white dark:bg-secondary-300 border-0" placeholder="Add product description..." ></textarea>
-                    }
-                    @if(showEmoji){
-                        <emoji-mart (click)="$event.stopPropagation();" [darkMode]="false" [style]="{ position: 'relative', left: '200px', top: '-500px' }" (emojiClick)="addEmoji($event)"></emoji-mart>
-                    }                    
-                    
-                </div>
-            </div>
+            }
         </form>
 
+        @if(!isReadOnly){
         <div class="flex">
             <h2 class="md:text-3xl lg:text-4xl font-bold text-primary-100 ml-4 dark:text-white m-4">{{ 'PROFILE._add_logo' | translate }}</h2>
             <div class="flex inline-flex ml-2 align-middle">
@@ -219,7 +247,8 @@ <h3 class="font-semibold text-gray-900 dark:text-white">Logo requirements</h3>
                 </div>
             </div>
         }
-       
+        }
+
         <h2 class="md:text-3xl lg:text-4xl font-bold text-primary-100 ml-4 dark:text-white m-4">{{ 'PROFILE._contact_info' | translate }}</h2>
         <hr class="h-px mr-4 ml-4 bg-primary-100 dark:bg-white border-0">
         <div class="m-4 relative overflow-x-auto shadow-md sm:rounded-lg">
@@ -232,9 +261,11 @@ <h2 class="md:text-3xl lg:text-4xl font-bold text-primary-100 ml-4 dark:text-whi
                         <th scope="col" class="px-6 py-3 hidden md:table-cell">
                             {{ 'PROFILE._info' | translate }}
                         </th>
-                        <th scope="col" class="px-6 py-3">
-                            {{ 'PROFILE._actions' | translate }}
-                        </th>
+                        @if(!isReadOnly){
+                            <th scope="col" class="px-6 py-3">
+                                {{ 'PROFILE._actions' | translate }}
+                            </th>
+                        }
                     </tr>
                 </thead>
                 <tbody>
@@ -250,8 +281,9 @@ <h2 class="md:text-3xl lg:text-4xl font-bold text-primary-100 ml-4 dark:text-whi
                                     {{medium.characteristic.street1}}, {{medium.characteristic.postCode}} ({{medium.characteristic.city}}) {{medium.characteristic.stateOrProvince}}, {{medium.characteristic.country}}
                                 } @else {
                                     ({{medium.characteristic.contactType}}) {{medium.characteristic.phoneNumber}}
-                                }                                
-                            </td> 
+                                }
+                            </td>
+                            @if(!isReadOnly){
                             <td class="px-6 py-4 inline-flex">
                                 <button data-cy="editContact" type="button" (click)="showEdit(medium)" class="text-white bg-primary-100 hover:bg-primary-50 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-full text-sm p-1 lg:p-2.5 text-center inline-flex items-center me-2">
                                     <svg class="w-[18px] h-[18px] text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
@@ -264,6 +296,7 @@ <h2 class="md:text-3xl lg:text-4xl font-bold text-primary-100 ml-4 dark:text-whi
                                         </svg>
                                 </button>
                             </td>
+                            }
                         </tr>
                     } @empty {
                         <div class="flex justify-center w-full m-4">
@@ -280,6 +313,7 @@ <h2 class="md:text-3xl lg:text-4xl font-bold text-primary-100 ml-4 dark:text-whi
                 </tbody>
             </table>
         </div>
+        @if(!isReadOnly){
         <h2 class="md:text-3xl lg:text-4xl font-bold text-primary-100 ml-4 dark:text-white m-4">{{ 'PROFILE._add_new_contact' | translate }}</h2>
         <hr class="h-px mr-4 ml-4 bg-primary-100 dark:bg-white border-0">
         <div class="mr-8">
@@ -379,7 +413,7 @@ <h2 class="md:text-3xl lg:text-4xl font-bold text-primary-100 ml-4 dark:text-whi
                 {{ 'PROFILE._save' | 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 24 24">
                     <path stroke="currentColor" stroke-linecap="round" stroke-width="2" d="M11 16h2m6.707-9.293-2.414-2.414A1 1 0 0 0 16.586 4H5a1 1 0 0 0-1 1v14a1 1 0 0 0 1 1h14a1 1 0 0 0 1-1V7.414a1 1 0 0 0-.293-.707ZM16 20v-6a1 1 0 0 0-1-1H9a1 1 0 0 0-1 1v6h8ZM9 4h6v3a1 1 0 0 1-1 1h-4a1 1 0 0 1-1-1V4Z"/>
-                </svg>                         
+                </svg>
             </button>
         </div>
         <div class="flex w-full justify-end">
@@ -387,6 +421,7 @@ <h2 class="md:text-3xl lg:text-4xl font-bold text-primary-100 ml-4 dark:text-whi
                 {{ 'PROFILE._update' | translate }}
             </button>
         </div>
+        }
     </div>
 }
 @if(showError){
diff --git a/src/app/pages/user-profile/profile-sections/org-info/org-info.component.ts b/src/app/pages/user-profile/profile-sections/org-info/org-info.component.ts
index 9ee3ff69..522e53dd 100644
--- a/src/app/pages/user-profile/profile-sections/org-info/org-info.component.ts
+++ b/src/app/pages/user-profile/profile-sections/org-info/org-info.component.ts
@@ -31,6 +31,7 @@ export class OrgInfoComponent implements OnInit {
   token:string='';
   email:string='';
   selectedDate:any;
+  isReadOnly:boolean=false;
   profileForm = new FormGroup({
     name: new FormControl('', [Validators.required]),
     website: new FormControl(''),
@@ -130,20 +131,34 @@ export class OrgInfoComponent implements OnInit {
     today.setMonth(today.getMonth()-1);
     this.selectedDate = today.toISOString();
     this.initPartyInfo();
-    setTimeout(() => {        
-      initFlowbite();   
+    if(this.isReadOnly && this.profileForm.value.description) {
+      this.description = this.profileForm.value.description;
+    }
+    setTimeout(() => {
+      initFlowbite();
     }, 500);
   }
 
   initPartyInfo(){
     let aux = this.localStorage.getObject('login_items') as LoginInfo;
     if(JSON.stringify(aux) != '{}' && (((aux.expire - moment().unix())-4) > 0)) {
-      let loggedOrg = aux.organizations.find((element: { id: any; }) => element.id == aux.logged_as)
-      this.partyId = loggedOrg.partyId;
+      if (aux.logged_as !== aux.id) {
+        let loggedOrg = aux.organizations.find((element: { id: any; }) => element.id == aux.logged_as)
+        this.partyId = loggedOrg.partyId;
+
+        // Check if user has orgAdmin role for edit permission
+        if(loggedOrg && loggedOrg.roles){
+          const orgRoles = loggedOrg.roles.map((role: any) => role.name);
+          const hasOrgAdminRole = orgRoles.some((role: any) => role === 'orgAdmin');
+          this.isReadOnly = !hasOrgAdminRole;
+        }
+      } else {
+        this.partyId = aux.partyId;
+        this.isReadOnly = false;
+      }
 
       this.token=aux.token;
       this.email=aux.email;
-      //this.partyId = aux.partyId;
       this.profileForm.reset();
       this.getProfile();
     }
diff --git a/src/app/shared/header/header.component.html b/src/app/shared/header/header.component.html
index e04b6cad..c1b412b8 100644
--- a/src/app/shared/header/header.component.html
+++ b/src/app/shared/header/header.component.html
@@ -158,11 +158,9 @@
             <div class="font-medium truncate line-clamp-2">{{email}}</div>
           </div>
           <ul class="py-2 text-sm text-gray-700 dark:text-gray-200" aria-labelledby="avatarButton">
-            @if(loggedAsOrg == false || roles.includes('orgAdmin')) {
-              <li>
-                <button id="userProfile" (click)="goTo('/profile')" class="flex w-full justify-left px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white"><fa-icon [icon]="faAddressCard" class="mr-2"></fa-icon>{{ 'HEADER._profile' | translate }}</button>
-              </li>
-            }
+            <li>
+              <button id="userProfile" (click)="goTo('/profile')" class="flex w-full justify-left px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white"><fa-icon [icon]="faAddressCard" class="mr-2"></fa-icon>{{ 'HEADER._profile' | translate }}</button>
+            </li>
             @if(roles.includes('seller')){
               <li>
                 <button id="myOfferings" (click)="goTo('/my-offerings')" class="flex w-full justify-left px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white"><fa-icon [icon]="faHandHoldingBox" class="mr-2"></fa-icon>{{ 'HEADER._offerings' | translate }}</button>