Bug fixes ch38688

unicef · Nov 29, 2024 · 99769eb · 99769eb
1 parent 258e311
commit 99769eb
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 6 deletions.
diff --git a/src_ts/app-shell.ts b/src_ts/app-shell.ts
@@ -81,6 +81,9 @@ export class AppShell extends LoadingMixin(connect(store)(LitElement)) {
         :host-context([dir='rtl']) reason-display {
           --text-padding: 26px 80px 26px 24px;
         }
+        div[slot='tabs'] {
+          width: 100%;
+        }
         sl-tab-group {
           --indicator-color: var(--primary-color);
           max-width: calc(100% - 2px);
@@ -159,7 +162,7 @@ export class AppShell extends LoadingMixin(connect(store)(LitElement)) {
                   </div>
                 </div>
                 <div slot="tabs">
-                  <sl-tab-group @sl-tab-show="${this.tabChanged}" no-scroll-controls>
+                  <sl-tab-group @sl-tab-show="${this.tabChanged}">
                     ${this.tabs?.map(
                       (t) =>
                         html` <sl-tab
@@ -380,9 +383,11 @@ export class AppShell extends LoadingMixin(connect(store)(LitElement)) {
   getAppStaticData() {
     this.getCurrentUser().then((user: any) => {
       if (user) {
+        if (!user.is_unicef_user) {
+          window.location.href = window.location.origin + '/menu/';
+        }
         this.user = user;
         this.getCountryDetails();
-
         // Seems to not be used
         // this.getSectors();
         // this.getDropdownsStaticData();
@@ -392,9 +397,10 @@ export class AppShell extends LoadingMixin(connect(store)(LitElement)) {
   }
 
   getCountryDetails() {
-    sendRequest({endpoint: Endpoints.userCountry}).then(
-      (resp) => (this.countryDetails = resp && resp.length ? resp[0] : {})
-    );
+    sendRequest({endpoint: Endpoints.userCountry}).then((resp) => {
+      this.countryDetails = resp && resp.length ? resp[0] : {};
+      this.requestUpdate();
+    });
   }
 
   // Seems to not be used

diff --git a/src_ts/components/appshell/page-header.ts b/src_ts/components/appshell/page-header.ts
@@ -38,7 +38,7 @@ export class PageHeader extends LitElement {
         }
       </style>
 
-      <app-toolbar sticky class="layout-horizontal align-items-center" hide-app-menu>
+      <app-toolbar sticky class="layout-horizontal align-items-center" hide-app-menu .profile=${this.profile}>
         <div slot="dropdowns">
           <countries-dropdown
             id="countries"

diff --git a/src_ts/components/pages/view-fam.ts b/src_ts/components/pages/view-fam.ts
@@ -23,6 +23,17 @@ export class ViewFam extends LitElement {
       this.embedSource = `${famProd}&$filter=business_area/area_code eq '${this.countryCode}'`;
     }
   }
+  static get observedAttributes() {
+    return ['country-code']; // Watch for the `country-code` attribute
+  }
+
+  attributeChangedCallback(name: string, oldValue: string | null, newValue: string | null) {
+    super.attributeChangedCallback(name, oldValue, newValue);
+    if (name === 'country-code' && oldValue !== newValue) {
+      this.countryCode = newValue || ''; // Update property when attribute changes
+      this.embedSource = `${famProd}&$filter=business_area/area_code eq '${this.countryCode}'`;
+    }
+  }
 
   render() {
     return html`

diff --git a/src_ts/components/pages/view-fmm.ts b/src_ts/components/pages/view-fmm.ts
@@ -23,6 +23,17 @@ export class ViewFMM extends LitElement {
       this.embedSource = `${fmmProd}&$filter=fm_ontrack/Area_x0020_Code eq '${this.countryCode}'`;
     }
   }
+  static get observedAttributes() {
+    return ['country-code']; // Watch for the `country-code` attribute
+  }
+
+  attributeChangedCallback(name: string, oldValue: string | null, newValue: string | null) {
+    super.attributeChangedCallback(name, oldValue, newValue);
+    if (name === 'country-code' && oldValue !== newValue) {
+      this.countryCode = newValue || ''; // Update property when attribute changes
+      this.embedSource = `${fmmProd}&$filter=fm_ontrack/Area_x0020_Code eq '${this.countryCode}'`;
+    }
+  }
 
   render() {
     return html`

diff --git a/src_ts/components/pages/view-fmp.ts b/src_ts/components/pages/view-fmp.ts
@@ -23,6 +23,17 @@ export class ViewFMP extends LitElement {
       this.embedSource = `${fmpProd}&$filter=fm_ontrack/Area_x0020_Code eq '${this.countryCode}'`;
     }
   }
+  static get observedAttributes() {
+    return ['country-code']; // Watch for the `country-code` attribute
+  }
+
+  attributeChangedCallback(name: string, oldValue: string | null, newValue: string | null) {
+    super.attributeChangedCallback(name, oldValue, newValue);
+    if (name === 'country-code' && oldValue !== newValue) {
+      this.countryCode = newValue || ''; // Update property when attribute changes
+      this.embedSource = `${fmpProd}&$filter=fm_ontrack/Area_x0020_Code eq '${this.countryCode}'`;
+    }
+  }
 
   render() {
     return html`

diff --git a/src_ts/components/pages/view-partnerships.ts b/src_ts/components/pages/view-partnerships.ts
@@ -23,6 +23,17 @@ export class ViewPartnerships extends LitElement {
       this.setEmbedSource();
     }
   }
+  static get observedAttributes() {
+    return ['country-code']; // Watch for the `country-code` attribute
+  }
+
+  attributeChangedCallback(name: string, oldValue: string | null, newValue: string | null) {
+    super.attributeChangedCallback(name, oldValue, newValue);
+    if (name === 'country-code' && oldValue !== newValue) {
+      this.countryCode = newValue || ''; // Update property when attribute changes
+      this.setEmbedSource();
+    }
+  }
 
   private setEmbedSource(): void {
     this.embedSource = `${partnershipsProd}&$filter=business_area/area_code eq '${this.countryCode}'`;