Merge pull request #10 from in2workspace/feature/profile

fix in profile

Author: AlbaLopez552

docker-compose.yaml

@@ -2,6 +2,6 @@ name: isbe-catalog-ui
 
 services:
   catalog-ui:
-    image: in2workspace/bae-frontend:v0.0.0
+    image: in2workspace/bae-frontend:v0.0.1
     container_name: isbe-catalog-ui
     restart: always

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "bae-frontend",
-  "version": "0.0.0",
+  "version": "0.0.1",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

package.json

@@ -1,3 +1,5 @@
+import { environment } from "src/environments/environment";
+
 export interface LoginInfo {
   id: string;
   user: string;
@@ -6,6 +8,7 @@ export interface LoginInfo {
   expire: number;
   seller: string;
   username: string;
+  userId: string;
   roles: Array<{ id: string; name: string }>;
   organizations: Array<{
     id: string;
@@ -46,9 +49,9 @@ function rolesFromPowers(vc: any): string[] {
     roleSet.add('individual');
   }
 
-  const orgName = (mandator?.organization || '').toLowerCase();
-  if (orgName.includes('in2')) {
-    //roleSet.add('admin'); //TODO: check
+  const orgiId = (mandator?.organizationIdentifier || '').toLowerCase();
+  if (orgiId.includes(environment.FOUNDATION_ID)) { //ISBE FOUNDATION ID
+    roleSet.add('admin');
   }
 
   return Array.from(roleSet);
@@ -87,6 +90,7 @@ export function claimsToLoginInfo(claims: any, token: string): LoginInfo {
 
   return {
     id: vc?.id,
+    userId: mandatee?.id || '',
     user: userLocalPart,
     email,
     token,
@@ -95,6 +99,6 @@ export function claimsToLoginInfo(claims: any, token: string): LoginInfo {
     username,
     roles: roleObjects,
     organizations,
-    logged_as: orgId,
+    logged_as: roleStrings.includes('orgAdmin') && orgId ? orgId : vc?.id,
   };
 }

src/app/guard/login-info.mapper.ts

@@ -1,3 +1,8 @@
+export interface CountryDef {
+  code: string;
+  phone: string;
+}
+
 export const phoneNumbers = [
     { text: '🇺🇸 +1   United States', code: '+1', flag: '🇺🇸', country: 'US' },
     { text: '🇨🇦 +1   Canada', code: '+1', flag: '🇨🇦', country: 'CA' },

src/app/models/country.const.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, ChangeDetectorRef } from '@angular/core';
+import { Component, ChangeDetectorRef } from '@angular/core';
 import {components} from "src/app/models/product-catalog";
 type Catalog = components["schemas"]["Catalog"];
 import {LocalStorageService} from "src/app/services/local-storage.service";
@@ -19,7 +19,7 @@ import { NgClass } from '@angular/common';
     standalone: true,
     imports: [OperatorRevenueSharingComponent, VerificationComponent, UpdateCategoryComponent, CreateCategoryComponent,CategoriesComponent,TranslateModule, NgClass]
 })
-export class AdminComponent implements OnInit {
+export class AdminComponent {
   show_categories:boolean = true;
   show_create_categories:boolean = false;
   show_update_categories:boolean = false;
@@ -48,10 +48,6 @@ export class AdminComponent implements OnInit {
     })
   }
 
-  ngOnInit() {
-    console.log('init')
-  }
-
   goToCategories(){
     this.selectCategories();
     this.show_categories = true;
@@ -143,17 +139,13 @@ export class AdminComponent implements OnInit {
     if(elem != null){
       if(elem.className.match(cls)){
         this.removeClass(elem,cls)
-      } else {
-        console.log('already unselected')
       }
     }
   }
 
   selectMenu(elem:HTMLElement| null,cls:string){
     if(elem != null){
-      if(elem.className.match(cls)){
-        console.log('already selected')
-      } else {
+      if(!elem.className.match(cls)){
         this.addClass(elem,cls)
       }
     }

src/app/pages/admin/admin.component.ts

@@ -1,13 +1,10 @@
-import { Component, OnInit, ChangeDetectorRef } from '@angular/core';
-import { Router } from '@angular/router';
+import { Component, ChangeDetectorRef, LOCALE_ID } from '@angular/core';
 import { FormControl } from '@angular/forms';
 import {faIdCard, faSort, faSwatchbook} from "@fortawesome/pro-solid-svg-icons";
 import {components} from "src/app/models/product-catalog";
 type Category = components["schemas"]["Category"];
 import { environment } from 'src/environments/environment';
 import { ApiServiceService } from 'src/app/services/product-service.service';
-import {LocalStorageService} from "src/app/services/local-storage.service";
-import { LoginInfo } from 'src/app/models/interfaces';
 import {EventMessageService} from "src/app/services/event-message.service";
 import { initFlowbite } from 'flowbite';
 import { TranslateModule } from '@ngx-translate/core';
@@ -17,6 +14,7 @@ import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { AuthService } from 'src/app/guard/auth.service';
 import { take } from 'rxjs';
 
+
 @Component({
     selector: 'admin-categories',
     templateUrl: './categories.component.html',
@@ -93,7 +91,6 @@ export class CategoriesComponent {
         })           
       }
     })*/
-    console.log('Getting categories...')
     this.api.getCategories(this.status).then(data => {      
       for(let i=0; i < data.length; i++){
         this.findChildren(data[i],data);
@@ -171,17 +168,12 @@ export class CategoriesComponent {
     const index = this.status.findIndex(item => item === filter);
     if (index !== -1) {
       this.status.splice(index, 1);
-      console.log('elimina filtro')
-      console.log(this.status)
     } else {
-      console.log('añade filtro')
-      console.log(this.status)
       this.status.push(filter)
     }
     this.loading=true;
     this.categories=[];
     this.getCategories();
-    console.log('filter')
   }
 
 }

src/app/pages/admin/categories/categories.component.ts

@@ -98,7 +98,6 @@ export class CreateCategoryComponent implements OnInit {
   }
 
   getCategories(){
-    console.log('Getting categories...')
     this.api.getLaunchedCategories().then(data => {      
       for(let i=0; i < data.length; i++){
         this.findChildren(data[i],data);
@@ -257,17 +256,13 @@ export class CreateCategoryComponent implements OnInit {
     if(elem != null){
       if(elem.className.match(cls)){
         this.removeClass(elem,cls)
-      } else {
-        console.log('already unselected')
       }
     }
   }
 
   selectMenu(elem:HTMLElement| null,cls:string){
     if(elem != null){
-      if(elem.className.match(cls)){
-        console.log('already selected')
-      } else {
+      if(!elem.className.match(cls)){
         this.addClass(elem,cls)
       }
     }
@@ -364,7 +359,6 @@ export class CreateCategoryComponent implements OnInit {
   }
 
   addEmoji(event:any){
-    console.log(event)
     this.showEmoji=false;
     const currentText = this.generalForm.value.description;
     this.generalForm.patchValue({

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

@@ -303,17 +303,13 @@ export class UpdateCategoryComponent implements OnInit {
     if(elem != null){
       if(elem.className.match(cls)){
         this.removeClass(elem,cls)
-      } else {
-        console.log('already unselected')
       }
     }
   }
 
   selectMenu(elem:HTMLElement| null,cls:string){
     if(elem != null){
-      if(elem.className.match(cls)){
-        console.log('already selected')
-      } else {
+      if(!elem.className.match(cls)){
         this.addClass(elem,cls)
       }
     }
@@ -410,7 +406,6 @@ export class UpdateCategoryComponent implements OnInit {
   }
 
   addEmoji(event:any){
-    console.log(event)
     this.showEmoji=false;
     const currentText = this.generalForm.value.description;
     this.generalForm.patchValue({

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

@@ -47,7 +47,7 @@ export class VerificationComponent {
       error: error => {
         console.error('There was an error while updating!', error);
         if(error.error.error){
-          console.log(error)
+          console.error(error)
           this.errorMessage = 'Error: ' + error.error.error;
         } else {
           this.errorMessage = '¡Hubo un error al cargar el producto!';