@africanies/angular-web-sdk 0.1.8 → 0.1.9

package/libs/africanies-core/src/index.ts

@@ -210,9 +210,9 @@ export {
 
 // User notifications (auth required)
 export {
+  isNotificationExternalLink,
   mapNotification,
   mapNotificationInboxItem,
-  isNotificationExternalLink,
   mapNotificationList,
   mapNotificationPayload,
   NOTIFICATION_READ_PATH,

package/libs/africanies-core/src/lib/notification/notification-link.ts

@@ -12,7 +12,10 @@ const QUERY_SHIPMENT_APP = 'shipment_app';
 const LEGACY_PORTAL_HOST =
   /^(?:test-)?(?:admin|customer)-(?:export|import)\.africaniestest\.com$/i;
 
-/** Signed export downloads and other hosts that must not be rewritten in-app. */
+/**
+ * Signed export downloads and other hosts that must not be rewritten in-app.
+ * @param link
+ */
 export function isNotificationExternalLink(link: string): boolean {
   const trimmed = decodeNotificationLink(link).trim();
   if (!trimmed) {
@@ -39,6 +42,8 @@ export function isNotificationExternalLink(link: string): boolean {
  * - Legacy portal hosts become relative `/portal/...` paths with query preserved.
  * - When the notification already includes `shipment_app`, it is kept as-is.
  * - Otherwise classic host / `shipment_app` rewriting applies for portal URLs.
+ * @param link
+ * @param mode
  */
 export function resolveNotificationLinkForMode(
   link: string | null | undefined,

package/libs/africanies-ui/src/lib/layout/app-shell-header.component.ts

@@ -113,13 +113,13 @@ export class AppShellHeaderEndDirective {}
                   <span
                     class="text-body-sm font-medium tabular-nums tracking-tight text-ink dark:text-white"
                   >
-                    {{ temp }}°
+                    {{ temp }}°C
                   </span>
                 }
                 <span
                   class="hidden text-caption text-neutral-600 md:inline dark:text-neutral-400"
                 >
-                  {{ weatherPlace() }}
+                  {{ weatherCondition() }}
                 </span>
               </div>
             }
@@ -274,15 +274,15 @@ export class AppShellHeaderComponent {
     if (temp === undefined || !Number.isFinite(temp)) {
       return null;
     }
-    return temp.toFixed(1);
+    return String(Math.round(temp));
   });
 
-  protected readonly weatherPlace = computed(() => {
+  protected readonly weatherCondition = computed(() => {
     const forecast = this.weather();
     if (!forecast) {
       return '';
     }
-    return forecast.city?.trim() || headerWeatherLabel(forecast.kind);
+    return headerWeatherLabel(forecast.kind, this.now().getHours());
   });
 
   protected readonly weatherAriaLabel = computed(() => {
@@ -290,11 +290,11 @@ export class AppShellHeaderComponent {
     if (!forecast) {
       return 'Weather';
     }
-    const condition = headerWeatherLabel(forecast.kind).toLowerCase();
+    const condition = this.weatherCondition().toLowerCase();
     const temp = this.weatherTemp();
-    const city = forecast.city?.trim();
-    const degrees = temp === null ? condition : `${temp} degrees, ${condition}`;
-    return city ? `Weather in ${city}: ${degrees}` : `Weather: ${degrees}`;
+    return temp === null
+      ? `Weather: ${condition}`
+      : `Weather: ${temp} degrees Celsius, ${condition}`;
   });
 
   protected readonly unreadCount = computed(

package/libs/africanies-ui/src/lib/layout/header-greeting.util.ts

@@ -33,8 +33,6 @@ export interface HeaderWeather {
   kind: HeaderWeatherKind;
   /** Celsius, when the forecast includes it. */
   temperatureC?: number;
-  /** City from IP geolocation, when known. */
-  city?: string;
 }
 
 const PERIOD_KICKERS: Record<HeaderGreetingPeriod, readonly string[]> = {

package/libs/africanies-ui/src/lib/layout/header-weather.spec.ts

@@ -66,7 +66,7 @@ describe('loadHeaderWeather', () => {
     ).resolves.toBeNull();
   });
 
-  it('reads Open-Meteo after IP geolocation and reverse-geocodes the city', async () => {
+  it('reads Open-Meteo after IP coordinates', async () => {
     const fetchFn = jest.fn(async (url: string) => {
       if (String(url).includes('geojs')) {
         return jsonResponse({
@@ -75,9 +75,6 @@ describe('loadHeaderWeather', () => {
           city: 'Lagos',
         });
       }
-      if (String(url).includes('bigdatacloud')) {
-        return jsonResponse({ city: 'Abuja', locality: 'Abuja' });
-      }
       return jsonResponse({
         current: { weather_code: 61, temperature_2m: 27.4 },
       });
@@ -88,29 +85,8 @@ describe('loadHeaderWeather', () => {
     ).resolves.toEqual({
       kind: 'rain',
       temperatureC: 27.4,
-      city: 'Abuja',
-    });
-    expect(fetchFn).toHaveBeenCalledTimes(3);
-  });
-
-  it('falls back to the IP city when reverse geocode is empty', async () => {
-    const fetchFn = jest.fn(async (url: string) => {
-      if (String(url).includes('geojs')) {
-        return jsonResponse({ latitude: 1, longitude: 2, city: 'Lagos' });
-      }
-      if (String(url).includes('bigdatacloud')) {
-        return jsonResponse({});
-      }
-      return jsonResponse({ current: { weather_code: 0, temperature_2m: 30 } });
-    });
-
-    await expect(
-      loadHeaderWeather(fetchFn as unknown as typeof fetch),
-    ).resolves.toEqual({
-      kind: 'clear',
-      temperatureC: 30,
-      city: 'Lagos',
     });
+    expect(fetchFn).toHaveBeenCalledTimes(2);
   });
 
   it('reuses the same-hour session cache', async () => {
@@ -118,9 +94,6 @@ describe('loadHeaderWeather', () => {
       if (String(url).includes('geojs')) {
         return jsonResponse({ latitude: 1, longitude: 2 });
       }
-      if (String(url).includes('bigdatacloud')) {
-        return jsonResponse({ city: 'Accra' });
-      }
       return jsonResponse({ current: { weather_code: 0, temperature_2m: 30 } });
     });
 
@@ -128,16 +101,13 @@ describe('loadHeaderWeather', () => {
     const second = await loadHeaderWeather(fetchFn as unknown as typeof fetch);
 
     expect(first).toEqual(second);
-    expect(fetchFn).toHaveBeenCalledTimes(3);
+    expect(fetchFn).toHaveBeenCalledTimes(2);
   });
 
   it('fetches again when the cached hour no longer matches', async () => {
     const fetchFn = jest.fn(async (url: string) => {
       if (String(url).includes('geojs')) {
-        return jsonResponse({ latitude: 1, longitude: 2, city: 'Lagos' });
-      }
-      if (String(url).includes('bigdatacloud')) {
-        return jsonResponse({ city: 'Lagos' });
+        return jsonResponse({ latitude: 1, longitude: 2 });
       }
       return jsonResponse({ current: { weather_code: 0, temperature_2m: 30.2 } });
     });
@@ -154,7 +124,7 @@ describe('loadHeaderWeather', () => {
     sessionStorage.setItem(cacheKey!, JSON.stringify(stored));
 
     await loadHeaderWeather(fetchFn as unknown as typeof fetch);
-    expect(fetchFn).toHaveBeenCalledTimes(6);
+    expect(fetchFn).toHaveBeenCalledTimes(4);
   });
 
   it('uses browser coordinates when geolocation succeeds', async () => {
@@ -181,9 +151,6 @@ describe('loadHeaderWeather', () => {
     });
 
     const fetchFn = jest.fn(async (url: string) => {
-      if (String(url).includes('bigdatacloud')) {
-        return jsonResponse({ city: 'Abuja' });
-      }
       if (String(url).includes('geojs')) {
         throw new Error('should not call IP geo');
       }
@@ -195,7 +162,6 @@ describe('loadHeaderWeather', () => {
     ).resolves.toEqual({
       kind: 'clear',
       temperatureC: 31,
-      city: 'Abuja',
     });
     expect(
       fetchFn.mock.calls.some((call) => String(call[0]).includes('geojs')),
@@ -206,7 +172,12 @@ describe('loadHeaderWeather', () => {
 describe('headerWeatherLabel', () => {
   it('returns a short condition', () => {
     expect(headerWeatherLabel('rain')).toBe('Rain');
-    expect(headerWeatherLabel('clear')).toBe('Clear');
+    expect(headerWeatherLabel('cloudy')).toBe('Cloudy');
+  });
+
+  it('uses Sunny by day and Clear at night', () => {
+    expect(headerWeatherLabel('clear', 10)).toBe('Sunny');
+    expect(headerWeatherLabel('clear', 22)).toBe('Clear');
   });
 });
 

package/libs/africanies-ui/src/lib/layout/header-weather.ts

@@ -2,15 +2,12 @@ import type { IconName } from '@africanies/africanies-icons';
 
 import type { HeaderWeather, HeaderWeatherKind } from './header-greeting.util';
 
-/** Bump when cache shape or city resolution strategy changes. */
-const CACHE_KEY = 'africanies-header-weather-v4';
+/** Bump when cache shape or lookup strategy changes. */
+const CACHE_KEY = 'africanies-header-weather-v5';
 const FETCH_MS = 4_000;
 const BROWSER_GEO_MS = 3_500;
-/** IP fallback — city string is often wrong (e.g. NG IPs labelled Lagos). */
+/** IP fallback for coordinates only — city strings are often wrong. */
 const GEO_URL = 'https://get.geojs.io/v1/ip/geo.json';
-/** Client reverse-geocode so the label matches the forecast coordinates. */
-const REVERSE_GEO_URL =
-  'https://api.bigdatacloud.net/data/reverse-geocode-client';
 
 const WEATHER_LABELS: Record<HeaderWeatherKind, string> = {
   clear: 'Clear',
@@ -26,21 +23,13 @@ interface CachedWeather {
   hour: string;
   kind: HeaderWeatherKind;
   temperatureC?: number;
-  city?: string;
 }
 
 interface GeoJsPayload {
-  city?: string;
   latitude?: string | number;
   longitude?: string | number;
 }
 
-interface ReverseGeoPayload {
-  city?: string;
-  locality?: string;
-  principalSubdivision?: string;
-}
-
 interface OpenMeteoPayload {
   current?: {
     weather_code?: number;
@@ -88,9 +77,16 @@ export function mapWmoWeatherCode(code: number): HeaderWeatherKind | null {
  * Short condition label for the header weather chip.
  *
  * @param kind - Coarse forecast kind.
- * @returns Display label such as `Rain` or `Clear`.
+ * @param hour - Local hour; clear days show as Sunny, nights as Clear.
+ * @returns Display label such as `Rain` or `Sunny`.
  */
-export function headerWeatherLabel(kind: HeaderWeatherKind): string {
+export function headerWeatherLabel(
+  kind: HeaderWeatherKind,
+  hour = new Date().getHours(),
+): string {
+  if (kind === 'clear') {
+    return hour >= 19 || hour < 6 ? 'Clear' : 'Sunny';
+  }
   return WEATHER_LABELS[kind];
 }
 
@@ -112,12 +108,12 @@ export function headerWeatherIcon(kind: HeaderWeatherKind, hour: number): IconNa
 }
 
 /**
- * City-level forecast via browser / IP geolocation + Open-Meteo (no API key).
+ * Local forecast via browser / IP coordinates + Open-Meteo (no API key).
  *
- * Coordinates prefer the browser Geolocation API (accurate for travellers;
- * may prompt once). Otherwise IP geo is used. The city label is reverse-
- * geocoded from those coordinates — IP `city` strings are often wrong for
- * Nigeria (many networks resolve as Lagos).
+ * Coordinates prefer the browser Geolocation API (may prompt once).
+ * Otherwise IP geo is used for lat/lon only — city labels are not shown
+ * because IP and reverse-geocode cities are often wrong (e.g. NG IPs
+ * labelled Lagos).
  *
  * Fails closed: missing browser APIs, timeouts, and HTTP errors all return
  * `null` so the greeting can stay time-of-day only. Cached per local hour
@@ -162,11 +158,8 @@ export async function loadHeaderWeather(
     }
 
     const temperatureC = asNumber(forecast?.current?.temperature_2m) ?? undefined;
-    const city =
-      (await reverseGeocodeCity(run, coords.latitude, coords.longitude)) ??
-      coords.fallbackCity;
-    const weather: HeaderWeather = { kind, temperatureC, city };
-    writeCache({ hour, kind, temperatureC, city });
+    const weather: HeaderWeather = { kind, temperatureC };
+    writeCache({ hour, kind, temperatureC });
     return weather;
   } catch {
     return null;
@@ -194,7 +187,6 @@ function readCache(hour: string): HeaderWeather | null {
     return {
       kind: parsed.kind,
       temperatureC: parsed.temperatureC,
-      city: parsed.city,
     };
   } catch {
     return null;
@@ -211,12 +203,11 @@ function writeCache(value: CachedWeather): void {
 
 /**
  * Prefer device coordinates when available (may prompt once); otherwise fall
- * back to IP geo. IP city labels for Nigeria are often wrong — reverse
- * geocoding from these coordinates still depends on accurate lat/lon.
+ * back to IP lat/lon for the forecast only.
  */
 async function resolveCoordinates(
   fetchFn: typeof fetch,
-): Promise<(Coordinates & { fallbackCity?: string }) | null> {
+): Promise<Coordinates | null> {
   const browser = await tryBrowserGeolocation();
   if (browser) {
     return browser;
@@ -228,11 +219,7 @@ async function resolveCoordinates(
   if (latitude === null || longitude === null) {
     return null;
   }
-  return {
-    latitude,
-    longitude,
-    fallbackCity: asCity(geo?.city),
-  };
+  return { latitude, longitude };
 }
 
 async function tryBrowserGeolocation(): Promise<Coordinates | null> {
@@ -266,23 +253,6 @@ async function tryBrowserGeolocation(): Promise<Coordinates | null> {
   });
 }
 
-async function reverseGeocodeCity(
-  fetchFn: typeof fetch,
-  latitude: number,
-  longitude: number,
-): Promise<string | undefined> {
-  const url =
-    `${REVERSE_GEO_URL}?latitude=${encodeURIComponent(String(latitude))}` +
-    `&longitude=${encodeURIComponent(String(longitude))}` +
-    `&localityLanguage=en`;
-  const payload = (await fetchJson(fetchFn, url)) as ReverseGeoPayload | null;
-  return (
-    asCity(payload?.city) ??
-    asCity(payload?.locality) ??
-    asCity(payload?.principalSubdivision)
-  );
-}
-
 function asNumber(value: unknown): number | null {
   if (typeof value === 'number' && Number.isFinite(value)) {
     return value;
@@ -294,17 +264,6 @@ function asNumber(value: unknown): number | null {
   return null;
 }
 
-function asCity(value: unknown): string | undefined {
-  if (typeof value !== 'string') {
-    return undefined;
-  }
-  const trimmed = value.trim();
-  if (!trimmed || trimmed.toLowerCase() === 'n/a') {
-    return undefined;
-  }
-  return trimmed;
-}
-
 async function fetchJson(
   fetchFn: typeof fetch,
   url: string,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@africanies/angular-web-sdk",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "packageManager": "pnpm@11.24.0",
   "license": "MIT",
   "contributors": [