From f6a0a069492561c325bdbc21066028b39d6bf877 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 14 Oct 2024 21:54:29 +0100 Subject: [PATCH 1/6] feat: extension home forecasts link --- .../src/app/material.module.ts | 3 +- .../pages/home/extension-home.component.html | 71 ++++++++++++++----- .../pages/home/extension-home.component.scss | 27 ++++--- .../pages/home/extension-home.component.ts | 61 +++++++++++----- .../extension_content/svgs/forecasts_tool.svg | 11 +++ 5 files changed, 124 insertions(+), 49 deletions(-) create mode 100644 libs/data/extension_content/svgs/forecasts_tool.svg diff --git a/apps/picsa-tools/extension-content/src/app/material.module.ts b/apps/picsa-tools/extension-content/src/app/material.module.ts index 5fe59349d..acf5e9b54 100644 --- a/apps/picsa-tools/extension-content/src/app/material.module.ts +++ b/apps/picsa-tools/extension-content/src/app/material.module.ts @@ -25,6 +25,8 @@ export class ExtensionToolkitMaterialModule { 'climate_tool', 'data_collection', 'discussions', + 'farmer_activity', + 'forecasts_tool', 'manual_tool', 'option_tool', 'play_store', @@ -33,7 +35,6 @@ export class ExtensionToolkitMaterialModule { 'seasonal_calendar_tool', 'tutorial', 'whatsapp', - 'farmer_activity', ]; for (const icon of icons) { diff --git a/apps/picsa-tools/extension-content/src/app/pages/home/extension-home.component.html b/apps/picsa-tools/extension-content/src/app/pages/home/extension-home.component.html index 2a96d76ef..2fe28fd17 100644 --- a/apps/picsa-tools/extension-content/src/app/pages/home/extension-home.component.html +++ b/apps/picsa-tools/extension-content/src/app/pages/home/extension-home.component.html @@ -3,29 +3,62 @@
-
- @for (link of links; track $index) { -
-
- -
{{ link.name | translate }}
+
+

+
{{ 'Training' | translate }}
+

+
+ + @for (link of picsaLinks; track $index) { +
+
+ +
{{ link.name | translate }}
+
+ @if (link.tourId==='monitoring' && monitoringService.pendingSyncCount>0) { +
{{ monitoringService.pendingSyncCount }}
+ }
- @if (link.tourId==='monitoring' && monitoringService.pendingSyncCount>0) { -
{{ monitoringService.pendingSyncCount }}
}
- } -
-
- -
{{ 'Take App Tour' | translate }}
+ +

+
{{ 'Additional' | translate }}
+

+
+ @for (link of additionalLinks; track $index) { +
+
+ +
{{ link.name | translate }}
+
+ @if (link.tourId==='monitoring' && monitoringService.pendingSyncCount>0) { +
{{ monitoringService.pendingSyncCount }}
+ }
+ } + + + + +
diff --git a/apps/picsa-tools/extension-content/src/app/pages/home/extension-home.component.scss b/apps/picsa-tools/extension-content/src/app/pages/home/extension-home.component.scss index 4bf3ecde4..d149de7ef 100644 --- a/apps/picsa-tools/extension-content/src/app/pages/home/extension-home.component.scss +++ b/apps/picsa-tools/extension-content/src/app/pages/home/extension-home.component.scss @@ -38,17 +38,24 @@ z-index: -1; opacity: 0.4; } -.link-grid { - display: grid; - grid-template-columns: repeat(auto-fit, minmax(128px, 1fr)); - grid-auto-rows: max-content; - gap: 8px; +h2.section-header { + background: rgba(255, 255, 255, 0.8); + margin: 0; + padding: 8px 16px; + font-weight: 500; + border-top: 2px solid white; + border-bottom: 2px solid white; + color: black; + text-align: left; +} +.link-container { flex: 1; - padding: 1rem; - margin-bottom: 3rem; - overflow-y: auto; - overflow-x: hidden; - max-height: calc(100vh - 136px); + max-height: calc(100vh - 102px); + overflow: auto; +} +.link-grid { + @apply grid gap-2 grid-cols-2 max-w-screen-lg m-auto; + @apply sm:grid-cols-4 sm:gap-4 sm:p-4 lg:grid-cols-6; } .grid-tile { diff --git a/apps/picsa-tools/extension-content/src/app/pages/home/extension-home.component.ts b/apps/picsa-tools/extension-content/src/app/pages/home/extension-home.component.ts index 1b57a566c..db490865b 100644 --- a/apps/picsa-tools/extension-content/src/app/pages/home/extension-home.component.ts +++ b/apps/picsa-tools/extension-content/src/app/pages/home/extension-home.component.ts @@ -32,24 +32,7 @@ const PAGE_LINKS: IPageLink[] = [ url: '/manual', tourId: 'manual', }, - { - name: translateMarker('Farmer Activities'), - svgIcon: 'extension_app:farmer_activity', - url: '/farmer', - tourId: 'farmer', - }, - { - name: translateMarker('Resources'), - svgIcon: 'extension_app:resources_tool', - url: '/resources', - tourId: 'resources', - }, - { - name: translateMarker('Monitoring'), - svgIcon: 'extension_app:data_collection', - url: '/monitoring', - tourId: 'monitoring', - }, + { name: translateMarker('Climate'), svgIcon: 'extension_app:climate_tool', @@ -94,6 +77,45 @@ const PAGE_LINKS: IPageLink[] = [ // } ]; +const ADDITIONAL_LINKS: IPageLink[] = [ + { + name: translateMarker('Resources'), + svgIcon: 'extension_app:resources_tool', + url: '/resources', + tourId: 'resources', + }, + { + name: translateMarker('Forecasts'), + svgIcon: 'extension_app:forecasts_tool', + url: '/forecasts', + tourId: 'forecasts', + }, + { + name: translateMarker('Farmer Activities'), + svgIcon: 'extension_app:farmer_activity', + url: '/farmer', + tourId: 'farmer', + }, + { + name: translateMarker('Monitoring'), + svgIcon: 'extension_app:data_collection', + url: '/monitoring', + tourId: 'monitoring', + }, + + // { + // name: translateMarker('Discussions'), + // svgIcon: 'picsa_discussions', + // url: '/discussions', + // }, + + // { + // name: 'Settings', + // svgIcon: 'picsa_settings', + // url: '/settings' + // } +]; + /** Additional links only available when running in non-production */ const DEV_PAGE_LINKS: IPageLink[] = []; if (!ENVIRONMENT.production) { @@ -119,7 +141,8 @@ if (!ENVIRONMENT.production) { }) export class ExtensionHomeComponent implements AfterViewInit, OnDestroy { /** List of home page display links, filtered when running in production */ - public links = PAGE_LINKS; + public picsaLinks = PAGE_LINKS; + public additionalLinks = ADDITIONAL_LINKS; public version = APP_VERSION; @ViewChild('headerContent') diff --git a/libs/data/extension_content/svgs/forecasts_tool.svg b/libs/data/extension_content/svgs/forecasts_tool.svg new file mode 100644 index 000000000..6e3091148 --- /dev/null +++ b/libs/data/extension_content/svgs/forecasts_tool.svg @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file From c7c6d6a7c351533e2df24b6c514cdbbd1aa731a6 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 14 Oct 2024 21:55:07 +0100 Subject: [PATCH 2/6] feat: forecasts data --- libs/data/climate/forecasts/index.ts | 5 + libs/data/climate/forecasts/mw.ts | 593 +++++++++++++++++++++++++++ libs/data/climate/forecasts/zm.ts | 25 ++ 3 files changed, 623 insertions(+) create mode 100644 libs/data/climate/forecasts/index.ts create mode 100644 libs/data/climate/forecasts/mw.ts create mode 100644 libs/data/climate/forecasts/zm.ts diff --git a/libs/data/climate/forecasts/index.ts b/libs/data/climate/forecasts/index.ts new file mode 100644 index 000000000..6639d9ed2 --- /dev/null +++ b/libs/data/climate/forecasts/index.ts @@ -0,0 +1,5 @@ +import zm from './zm'; + +import mw from './mw'; + +export const CLIMATE_FORECASTS = { zm, mw }; diff --git a/libs/data/climate/forecasts/mw.ts b/libs/data/climate/forecasts/mw.ts new file mode 100644 index 000000000..d9643f067 --- /dev/null +++ b/libs/data/climate/forecasts/mw.ts @@ -0,0 +1,593 @@ +const seasonal = { + id: 'b79ff462-eb50-49bf-89d2-d7e87717af7e', + bucket_id: 'mw', + name: 'forecasts/2024-2025_Seasonal_Rainfall_Forecast_Malawi_11_Sep_2024_Final.pdf', + owner: '', + created_at: '2024-10-14 18:12:08.013546+00', + updated_at: '2024-10-14 18:12:08.013546+00', + last_accessed_at: '2024-10-14 18:12:08.013546+00', + metadata: { + eTag: '0d83e8fa5956c75dbd7bd40d8d4811de-1', + size: 275194, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:12:08.000Z', + contentLength: 275194, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', '2024-2025_Seasonal_Rainfall_Forecast_Malawi_11_Sep_2024_Final.pdf'], + version: 'fd5bed25-06af-46a3-a727-5fd81ac81eb2', + owner_id: '', +}; + +const downscaled = [ + { + id: 'a4ac39ea-f469-419d-8bd5-99e080e00bcb', + bucket_id: 'mw', + name: 'forecasts/downscaled/BALAKA.pdf', + owner: '', + created_at: '2024-10-14 18:11:23.243079+00', + updated_at: '2024-10-14 18:11:23.243079+00', + last_accessed_at: '2024-10-14 18:11:23.243079+00', + metadata: { + eTag: '6872bb2af47f4ad30814378bec0fecf7-1', + size: 1863041, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:23.000Z', + contentLength: 1863041, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'BALAKA.pdf'], + version: '316f4917-c66d-4440-90eb-6512b73990b9', + owner_id: '', + }, + { + id: '380db05d-7dad-426f-9d17-7381eebce2e5', + bucket_id: 'mw', + name: 'forecasts/downscaled/BLANTYRE.pdf', + owner: '', + created_at: '2024-10-14 18:11:09.655212+00', + updated_at: '2024-10-14 18:11:09.655212+00', + last_accessed_at: '2024-10-14 18:11:09.655212+00', + metadata: { + eTag: '9bad7616897d92df2f6ca2ecdd8f0543-1', + size: 2378940, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:10.000Z', + contentLength: 2378940, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'BLANTYRE.pdf'], + version: 'efdf185c-2917-47bb-82e7-b91034a74f7c', + owner_id: '', + }, + { + id: '3c2dcc8b-b8dd-4326-8637-539aae3c3f8d', + bucket_id: 'mw', + name: 'forecasts/downscaled/CHIKWAWA.pdf', + owner: '', + created_at: '2024-10-14 18:11:09.682714+00', + updated_at: '2024-10-14 18:11:09.682714+00', + last_accessed_at: '2024-10-14 18:11:09.682714+00', + metadata: { + eTag: '01d83b1ea204c3df4b6a361bc88cf02f-1', + size: 2356724, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:10.000Z', + contentLength: 2356724, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'CHIKWAWA.pdf'], + version: '46546c7a-e737-4ad7-bdfa-17c06e8ac34c', + owner_id: '', + }, + { + id: '907f32a5-6840-478c-a0d1-6edc596fe258', + bucket_id: 'mw', + name: 'forecasts/downscaled/CHIRADZULU.pdf', + owner: '', + created_at: '2024-10-14 18:11:23.207281+00', + updated_at: '2024-10-14 18:11:23.207281+00', + last_accessed_at: '2024-10-14 18:11:23.207281+00', + metadata: { + eTag: '99edd25c05ef95274232b16b9685e8b3-1', + size: 1864973, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:23.000Z', + contentLength: 1864973, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'CHIRADZULU.pdf'], + version: '6c672d04-2ffb-48a9-aadd-7b1e5c97c83a', + owner_id: '', + }, + { + id: '0eec3606-d263-4c7d-901c-b22bec133e68', + bucket_id: 'mw', + name: 'forecasts/downscaled/CHITIPA.pdf', + owner: '', + created_at: '2024-10-14 18:11:09.83569+00', + updated_at: '2024-10-14 18:11:09.83569+00', + last_accessed_at: '2024-10-14 18:11:09.83569+00', + metadata: { + eTag: '3bf6ddca442ec9b56a43858581cf965c-1', + size: 2442692, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:10.000Z', + contentLength: 2442692, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'CHITIPA.pdf'], + version: '560b88ef-3ebb-4b65-8d83-3d24b9d5668d', + owner_id: '', + }, + { + id: '8532e10c-4cb9-4920-91bd-71e059a67c77', + bucket_id: 'mw', + name: 'forecasts/downscaled/DOWA.pdf', + owner: '', + created_at: '2024-10-14 18:11:09.409888+00', + updated_at: '2024-10-14 18:11:09.409888+00', + last_accessed_at: '2024-10-14 18:11:09.409888+00', + metadata: { + eTag: '9eff6abe88c0dd86e177b981b6af2d06-1', + size: 2108958, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:09.000Z', + contentLength: 2108958, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'DOWA.pdf'], + version: '9b4fb2de-ead2-4114-8fd4-e24ef115d985', + owner_id: '', + }, + { + id: '87b69c91-da9c-4174-8525-3dd75289c987', + bucket_id: 'mw', + name: 'forecasts/downscaled/KASUNGU.pdf', + owner: '', + created_at: '2024-10-14 18:11:08.448048+00', + updated_at: '2024-10-14 18:11:08.448048+00', + last_accessed_at: '2024-10-14 18:11:08.448048+00', + metadata: { + eTag: '9880fe170457a43396a5801c4ab57bd0-1', + size: 1961333, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:08.000Z', + contentLength: 1961333, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'KASUNGU.pdf'], + version: '0f43084c-1c53-40e8-a3f0-3c8729dc7c30', + owner_id: '', + }, + { + id: '40fc3ecb-2ae5-40db-afff-14dfe94335e4', + bucket_id: 'mw', + name: 'forecasts/downscaled/KIRONGA.pdf', + owner: '', + created_at: '2024-10-14 18:11:09.567199+00', + updated_at: '2024-10-14 18:11:09.567199+00', + last_accessed_at: '2024-10-14 18:11:09.567199+00', + metadata: { + eTag: '6ac1e00472e9174853aa95f5ba39ac92-1', + size: 2275092, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:10.000Z', + contentLength: 2275092, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'KIRONGA.pdf'], + version: 'a9d74118-f963-410d-a08f-234f95c4e754', + owner_id: '', + }, + { + id: '6fc83453-a84d-4768-814e-8bb01af4a17e', + bucket_id: 'mw', + name: 'forecasts/downscaled/LIKOMA.pdf', + owner: '', + created_at: '2024-10-14 18:11:31.980442+00', + updated_at: '2024-10-14 18:11:31.980442+00', + last_accessed_at: '2024-10-14 18:11:31.980442+00', + metadata: { + eTag: '7a06cef7f13cf8496a67a1cb2794bec1-1', + size: 1695687, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:32.000Z', + contentLength: 1695687, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'LIKOMA.pdf'], + version: '1fba580c-b316-4f1a-adef-432347c578ae', + owner_id: '', + }, + { + id: 'abf3c291-20f8-4582-a9ad-488ce509988d', + bucket_id: 'mw', + name: 'forecasts/downscaled/LILONGWE.pdf', + owner: '', + created_at: '2024-10-14 18:11:23.145823+00', + updated_at: '2024-10-14 18:11:23.145823+00', + last_accessed_at: '2024-10-14 18:11:23.145823+00', + metadata: { + eTag: '84b259e978c634fb23d7cce0477e2699-1', + size: 1958258, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:23.000Z', + contentLength: 1958258, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'LILONGWE.pdf'], + version: '3bb260c8-c339-4f10-a722-b4f752a024cb', + owner_id: '', + }, + { + id: 'e0b89068-a34f-4f8d-9a5a-6acfc58e22de', + bucket_id: 'mw', + name: 'forecasts/downscaled/MACHINGA.pdf', + owner: '', + created_at: '2024-10-14 18:11:09.79181+00', + updated_at: '2024-10-14 18:11:09.79181+00', + last_accessed_at: '2024-10-14 18:11:09.79181+00', + metadata: { + eTag: '727268c311a29af94d65243a7fad923f-1', + size: 2238135, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:10.000Z', + contentLength: 2238135, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'MACHINGA.pdf'], + version: '2bf16b4e-a0c1-4883-90d3-e971ceb80d5c', + owner_id: '', + }, + { + id: '1ed3458c-b1bd-4524-a0c1-ad52ae6fe8d0', + bucket_id: 'mw', + name: 'forecasts/downscaled/MANGOCHI.pdf', + owner: '', + created_at: '2024-10-14 18:11:22.692276+00', + updated_at: '2024-10-14 18:11:22.692276+00', + last_accessed_at: '2024-10-14 18:11:22.692276+00', + metadata: { + eTag: '4a570cfd555cce2b0f73f0b93e8aa6bd-1', + size: 1858943, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:23.000Z', + contentLength: 1858943, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'MANGOCHI.pdf'], + version: 'b0289bfb-e4a7-46f0-92d5-bbcbc446af20', + owner_id: '', + }, + { + id: '000f3fd4-c3b4-414e-a004-490b0175d134', + bucket_id: 'mw', + name: 'forecasts/downscaled/MCHINJI.pdf', + owner: '', + created_at: '2024-10-14 18:11:08.844687+00', + updated_at: '2024-10-14 18:11:08.844687+00', + last_accessed_at: '2024-10-14 18:11:08.844687+00', + metadata: { + eTag: '09af8a1097d4c6c79c89e449f64a8e32-1', + size: 2032156, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:09.000Z', + contentLength: 2032156, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'MCHINJI.pdf'], + version: '8cbc0a4e-0c59-4c81-9f0f-fedf6af514f3', + owner_id: '', + }, + { + id: '687dada2-e368-4035-9219-1a082980c5ed', + bucket_id: 'mw', + name: 'forecasts/downscaled/MULANJE.pdf', + owner: '', + created_at: '2024-10-14 18:11:23.173087+00', + updated_at: '2024-10-14 18:11:23.173087+00', + last_accessed_at: '2024-10-14 18:11:23.173087+00', + metadata: { + eTag: '05f87a52b99ebf8f665de379a5ea50f9-1', + size: 1857501, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:23.000Z', + contentLength: 1857501, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'MULANJE.pdf'], + version: '0add9aa3-990c-4343-840a-4fca6f65f18f', + owner_id: '', + }, + { + id: 'aa8c69f8-8ed9-46ac-958c-e15b125e9c8e', + bucket_id: 'mw', + name: 'forecasts/downscaled/MWANZA.pdf', + owner: '', + created_at: '2024-10-14 18:11:32.48908+00', + updated_at: '2024-10-14 18:11:32.48908+00', + last_accessed_at: '2024-10-14 18:11:32.48908+00', + metadata: { + eTag: '0f1cd3857e26dcafb47eb101928bd712-1', + size: 1779096, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:32.000Z', + contentLength: 1779096, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'MWANZA.pdf'], + version: '5e3f5ba4-0d53-40ce-a944-0a0af20d37ce', + owner_id: '', + }, + { + id: '244b069d-d2c5-4e3d-8ceb-3cda1c7957c8', + bucket_id: 'mw', + name: 'forecasts/downscaled/MZIMBA.pdf', + owner: '', + created_at: '2024-10-14 18:11:09.259207+00', + updated_at: '2024-10-14 18:11:09.259207+00', + last_accessed_at: '2024-10-14 18:11:09.259207+00', + metadata: { + eTag: 'fe53a38cf77039745c7d16484a9d7bc7-1', + size: 2040559, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:09.000Z', + contentLength: 2040559, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'MZIMBA.pdf'], + version: '948ed2d8-ddde-4181-8b48-16a1e855b72c', + owner_id: '', + }, + { + id: '9bf1bf53-3b44-435a-b949-c3ac2576e33d', + bucket_id: 'mw', + name: 'forecasts/downscaled/NENO.pdf', + owner: '', + created_at: '2024-10-14 18:11:22.877689+00', + updated_at: '2024-10-14 18:11:22.877689+00', + last_accessed_at: '2024-10-14 18:11:22.877689+00', + metadata: { + eTag: '832902e386ebf3059f57320deb09a835-1', + size: 1839791, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:23.000Z', + contentLength: 1839791, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'NENO.pdf'], + version: 'e6866c48-034c-4294-9ae6-5d2ecfb625e2', + owner_id: '', + }, + { + id: '39bb7f23-7dee-46e4-b051-e9c37bd4c8a2', + bucket_id: 'mw', + name: 'forecasts/downscaled/NKHATA BAY.pdf', + owner: '', + created_at: '2024-10-14 18:11:32.547321+00', + updated_at: '2024-10-14 18:11:32.547321+00', + last_accessed_at: '2024-10-14 18:11:32.547321+00', + metadata: { + eTag: 'fdb3b1c0e1534b0872ccfcf16cc830f4-1', + size: 1821167, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:32.000Z', + contentLength: 1821167, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'NKHATA BAY.pdf'], + version: 'b2f2a13c-ea55-43fa-9985-fd0ec18db9e7', + owner_id: '', + }, + { + id: '9352fabe-0586-48ef-9cd8-f2dac5ac9894', + bucket_id: 'mw', + name: 'forecasts/downscaled/NKHOTAKOTA.pdf', + owner: '', + created_at: '2024-10-14 18:11:23.214239+00', + updated_at: '2024-10-14 18:11:23.214239+00', + last_accessed_at: '2024-10-14 18:11:23.214239+00', + metadata: { + eTag: '381f8dab5a196f532bdf8cafbafeada0-1', + size: 1959219, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:23.000Z', + contentLength: 1959219, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'NKHOTAKOTA.pdf'], + version: 'ac2ce35d-81f8-44c0-bc1c-262d1cebf316', + owner_id: '', + }, + { + id: 'e081519b-19f0-4e59-8f86-474670d6028f', + bucket_id: 'mw', + name: 'forecasts/downscaled/NSANJE.pdf', + owner: '', + created_at: '2024-10-14 18:11:32.403485+00', + updated_at: '2024-10-14 18:11:32.403485+00', + last_accessed_at: '2024-10-14 18:11:32.403485+00', + metadata: { + eTag: 'cc0c71d932a93d9919df182b09f5e652-1', + size: 1735406, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:32.000Z', + contentLength: 1735406, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'NSANJE.pdf'], + version: 'db731f5c-ef5d-4737-a976-c0372b89e048', + owner_id: '', + }, + { + id: '763869da-ffa1-467f-b8fe-0373710ca2df', + bucket_id: 'mw', + name: 'forecasts/downscaled/NTCHEU.pdf', + owner: '', + created_at: '2024-10-14 18:11:32.389443+00', + updated_at: '2024-10-14 18:11:32.389443+00', + last_accessed_at: '2024-10-14 18:11:32.389443+00', + metadata: { + eTag: 'c755a0fb3973faac4fec7cd4094f31cd-1', + size: 1737538, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:32.000Z', + contentLength: 1737538, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'NTCHEU.pdf'], + version: '0521ab98-644f-4712-a5e7-8c01a4f2d0ad', + owner_id: '', + }, + { + id: '3f0929de-b75e-4731-bf3f-da4f0d0ad825', + bucket_id: 'mw', + name: 'forecasts/downscaled/NTCHISI.pdf', + owner: '', + created_at: '2024-10-14 18:11:08.748628+00', + updated_at: '2024-10-14 18:11:08.748628+00', + last_accessed_at: '2024-10-14 18:11:08.748628+00', + metadata: { + eTag: '892b25032f774d845479a51a661dbd1b-1', + size: 1977360, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:09.000Z', + contentLength: 1977360, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'NTCHISI.pdf'], + version: 'fe6cbb05-3030-49aa-9d34-19f68b3c821f', + owner_id: '', + }, + { + id: 'c3aa2653-ac80-49f1-a899-b50c72ad4898', + bucket_id: 'mw', + name: 'forecasts/downscaled/PHALOMBE.pdf', + owner: '', + created_at: '2024-10-14 18:11:22.773196+00', + updated_at: '2024-10-14 18:11:22.773196+00', + last_accessed_at: '2024-10-14 18:11:22.773196+00', + metadata: { + eTag: 'e0ca6cd4cce5c51ed085ffdc512825eb-1', + size: 1862285, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:23.000Z', + contentLength: 1862285, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'PHALOMBE.pdf'], + version: 'fdbaa294-75f3-4ef4-a459-ac10d058e264', + owner_id: '', + }, + { + id: '64733f68-d958-4dd6-9a04-5dac5ce7fd2a', + bucket_id: 'mw', + name: 'forecasts/downscaled/RUMPHI.pdf', + owner: '', + created_at: '2024-10-14 18:11:32.507389+00', + updated_at: '2024-10-14 18:11:32.507389+00', + last_accessed_at: '2024-10-14 18:11:32.507389+00', + metadata: { + eTag: 'b16d1bf6376058b06d8955568de1209c-1', + size: 1743826, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:32.000Z', + contentLength: 1743826, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'RUMPHI.pdf'], + version: 'b38f0b9b-9b55-4466-bcb0-ef040cc69711', + owner_id: '', + }, + { + id: '1c204f75-5d7d-421f-830d-45261b82565a', + bucket_id: 'mw', + name: 'forecasts/downscaled/SALIMA.pdf', + owner: '', + created_at: '2024-10-14 18:11:31.637577+00', + updated_at: '2024-10-14 18:11:31.637577+00', + last_accessed_at: '2024-10-14 18:11:31.637577+00', + metadata: { + eTag: '0afb9450687df6a3222a732aab4c8aed-1', + size: 1556076, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:32.000Z', + contentLength: 1556076, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'SALIMA.pdf'], + version: 'b96c6966-a3d4-46e7-bd8e-e0b91655b5a9', + owner_id: '', + }, + { + id: '24f32ab0-20dd-4020-aa72-abf2ab79ef0a', + bucket_id: 'mw', + name: 'forecasts/downscaled/THYOLO.pdf', + owner: '', + created_at: '2024-10-14 18:11:23.494319+00', + updated_at: '2024-10-14 18:11:23.494319+00', + last_accessed_at: '2024-10-14 18:11:23.494319+00', + metadata: { + eTag: '0c484044c1b73e1de5537946deea96d3-1', + size: 1918738, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:23.000Z', + contentLength: 1918738, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'THYOLO.pdf'], + version: '4b199129-73dc-4b67-bc46-f65c2148b915', + owner_id: '', + }, + { + id: '9274a223-3568-434f-91ea-40fd0e30084b', + bucket_id: 'mw', + name: 'forecasts/downscaled/ZOMBA.pdf', + owner: '', + created_at: '2024-10-14 18:11:23.13625+00', + updated_at: '2024-10-14 18:11:23.13625+00', + last_accessed_at: '2024-10-14 18:11:23.13625+00', + metadata: { + eTag: 'd356df2ec0e697a474cdcc3f4a4190b5-1', + size: 1916377, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:11:23.000Z', + contentLength: 1916377, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'downscaled', 'ZOMBA.pdf'], + version: '36791e5c-1cd2-4e88-bd42-da411cb5cd41', + owner_id: '', + }, +]; + +export default { seasonal, downscaled }; diff --git a/libs/data/climate/forecasts/zm.ts b/libs/data/climate/forecasts/zm.ts new file mode 100644 index 000000000..3a4f9c440 --- /dev/null +++ b/libs/data/climate/forecasts/zm.ts @@ -0,0 +1,25 @@ +const seasonal = { + id: 'c139d571-723c-4013-8246-28b0a291becf', + bucket_id: 'zm', + name: 'forecasts/ZMD Seasonal forecast 2024-25.pdf', + owner: '', + created_at: '2024-10-14 18:12:29.879524+00', + updated_at: '2024-10-14 18:12:29.879524+00', + last_accessed_at: '2024-10-14 18:12:29.879524+00', + metadata: { + eTag: 'cc62ececec1d335da2fe7230c90f1a1e-1', + size: 2111455, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:12:30.000Z', + contentLength: 2111455, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'ZMD Seasonal forecast 2024-25.pdf'], + version: 'f5342a2a-55fb-48be-acd3-b2b82a581c5c', + owner_id: '', +}; + +export const downscaled = []; + +export default { seasonal }; From 9f33da2f76bbbf632efa25004b5dbd56ddaa881a Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 15 Oct 2024 15:43:47 +0100 Subject: [PATCH 3/6] feat: add mw and zm forecast collections --- .../pages/home/extension-home.component.html | 3 +- .../pages/home/extension-home.component.ts | 4 +- .../components/resource-item/file/file.html | 2 +- .../src/app/data/weather/files.ts | 179 +----------------- .../src/app/data/weather/index.ts | 36 ++-- .../resources/covers/downscaled-forecast.svg | 88 +++++++++ .../resources/covers/seasonal-forecast.svg | 35 ++++ libs/data/climate/forecasts/index.ts | 5 - libs/data/climate/forecasts/zm.ts | 25 --- libs/data/resources/forecasts/index.ts | 81 ++++++++ .../{climate => resources}/forecasts/mw.ts | 46 +++-- libs/data/resources/forecasts/types.ts | 6 + libs/data/resources/forecasts/zm.ts | 29 +++ 13 files changed, 298 insertions(+), 241 deletions(-) create mode 100644 apps/picsa-tools/resources-tool/src/assets/resources/covers/downscaled-forecast.svg create mode 100644 apps/picsa-tools/resources-tool/src/assets/resources/covers/seasonal-forecast.svg delete mode 100644 libs/data/climate/forecasts/index.ts delete mode 100644 libs/data/climate/forecasts/zm.ts create mode 100644 libs/data/resources/forecasts/index.ts rename libs/data/{climate => resources}/forecasts/mw.ts (95%) create mode 100644 libs/data/resources/forecasts/types.ts create mode 100644 libs/data/resources/forecasts/zm.ts diff --git a/apps/picsa-tools/extension-content/src/app/pages/home/extension-home.component.html b/apps/picsa-tools/extension-content/src/app/pages/home/extension-home.component.html index 2fe28fd17..c140dad1a 100644 --- a/apps/picsa-tools/extension-content/src/app/pages/home/extension-home.component.html +++ b/apps/picsa-tools/extension-content/src/app/pages/home/extension-home.component.html @@ -1,5 +1,6 @@
- + +
diff --git a/apps/picsa-tools/extension-content/src/app/pages/home/extension-home.component.ts b/apps/picsa-tools/extension-content/src/app/pages/home/extension-home.component.ts index db490865b..262cdedc5 100644 --- a/apps/picsa-tools/extension-content/src/app/pages/home/extension-home.component.ts +++ b/apps/picsa-tools/extension-content/src/app/pages/home/extension-home.component.ts @@ -87,7 +87,9 @@ const ADDITIONAL_LINKS: IPageLink[] = [ { name: translateMarker('Forecasts'), svgIcon: 'extension_app:forecasts_tool', - url: '/forecasts', + // HACK - forecasts currently child resource collection + // TODO - move to standalone tool + url: '/resources/collection/weatherResources', tourId: 'forecasts', }, { diff --git a/apps/picsa-tools/resources-tool/src/app/components/resource-item/file/file.html b/apps/picsa-tools/resources-tool/src/app/components/resource-item/file/file.html index 607eb8f65..e5c36783a 100644 --- a/apps/picsa-tools/resources-tool/src/app/components/resource-item/file/file.html +++ b/apps/picsa-tools/resources-tool/src/app/components/resource-item/file/file.html @@ -1,7 +1,7 @@ -
+
@if(fileURI){ } diff --git a/apps/picsa-tools/resources-tool/src/app/data/weather/files.ts b/apps/picsa-tools/resources-tool/src/app/data/weather/files.ts index 616fc4a49..709c1cd4a 100644 --- a/apps/picsa-tools/resources-tool/src/app/data/weather/files.ts +++ b/apps/picsa-tools/resources-tool/src/app/data/weather/files.ts @@ -6,180 +6,11 @@ interface IDownscaledForecast extends IResourceFile { }; } -const downscaledForecasts: Record = { - downscaled_forecast_2023_kasungu_en: { - id: 'downscaled_forecast_2023_kasungu_en', - description: '', - filename: 'forecast-kasungu-english.pdf', - mimetype: 'application/pdf', - title: 'KASUNGU DISTRICT DOWNSCALED SEASONAL FORECAST, 2023-2024', - type: 'file', - subtype: 'pdf', - url: 'https://firebasestorage.googleapis.com/v0/b/picsa-apps.appspot.com/o/weather%2FSeasonal%20Forecasts%2FKASUNGU_English_Poster_2023_2024_compressed.pdf?alt=media&token=79f46884-e20e-45fd-b2f1-aa096c4e61db', - size_kb: 356, - md5Checksum: '1e9d080d9395f14687100191e75a02f0', - filter: { countries: ['mw'] }, - language: 'en', - meta: { - locationIds: ['Malawi_Kasungu'], - }, - }, - downscaled_forecast_2023_kasungu_ny: { - id: 'downscaled_forecast_2023_kasungu_ny', - description: '', - filename: 'forecast-kasungu-chichewa.pdf', - mimetype: 'application/pdf', - title: 'ULOSI WA KAGWEDWE KA MVULA M’BOMA LA KASUNGU M’DZINJA LA 2023-2024', - type: 'file', - subtype: 'pdf', - url: 'https://firebasestorage.googleapis.com/v0/b/picsa-apps.appspot.com/o/weather%2FSeasonal%20Forecasts%2FKASUNGU_Chichewa_Poster_2023_2024_compressed.pdf?alt=media&token=18da5ae1-09dc-4224-b742-0e555cf584fe', - size_kb: 381.4, - md5Checksum: '5e9c7141d11bc6fab0c113487e46d410', - filter: { countries: ['mw'] }, - language: 'ny', - meta: { - locationIds: ['Malawi_Kasungu'], - }, - }, - monthly_forecasts_2023_kasungu: { - id: 'monthly_forecasts_2023_kasungu', - description: '', - filename: 'Kasungu_Station_based_Seasonal_Forecasts_2023_compressed.pdf', - mimetype: 'application/pdf', - title: 'MONTHLY FORECASTS FOR SPECIFIC AREAST, KASUNGU DISTRICT, 2023-2024', - type: 'file', - subtype: 'pdf', - url: 'https://firebasestorage.googleapis.com/v0/b/picsa-apps.appspot.com/o/weather%2FSeasonal%20Forecasts%2FKasungu_Station_based_Seasonal_Forecasts_2023_compressed.pdf?alt=media&token=83015293-8017-4026-9b52-1faf2f51f7e9', - size_kb: 481.5, - md5Checksum: 'f86ce626f25cd529e0e27dea841aecc0', - filter: { countries: ['mw'] }, - language: 'en', - meta: { - locationIds: ['Malawi_Kasungu'], - }, - }, - downscaled_forecast_2023_nkhotakota_en: { - id: 'downscaled_forecast_2023_nkhotakota_en', - description: '', - filename: 'forecast-nkhotakota-english.pdf', - mimetype: 'application/pdf', - title: 'NKHOTAKOTA DISTRICT DOWNSCALED SEASONAL FORECAST, 2023-2024', - type: 'file', - subtype: 'pdf', - url: 'https://firebasestorage.googleapis.com/v0/b/picsa-apps.appspot.com/o/weather%2FSeasonal%20Forecasts%2FNKHOTAKOTA_English_Poster_2023_2024_compressed.pdf?alt=media&token=0b2b4317-4c0a-44f5-a681-ce10b45af841', - size_kb: 396.2, - md5Checksum: 'b6221f1f62791e9110471b2ed04b9954', - filter: { countries: ['mw'] }, - language: 'en', - meta: { - locationIds: ['Malawi_Nkhotakota'], - }, - }, - monthly_forecasts_2023_nkhotakota: { - id: 'monthly_forecasts_2023_nkhotakota', - description: '', - filename: 'Nkhotakota_Station_based_Seasonal_Forecasts_2023_compressed.pdf', - mimetype: 'application/pdf', - title: 'MONTHLY FORECASTS FOR SPECIFIC AREAST, NKHOTAKOTA DISTRICT, 2023-2024', - type: 'file', - subtype: 'pdf', - url: 'https://firebasestorage.googleapis.com/v0/b/picsa-apps.appspot.com/o/weather%2FSeasonal%20Forecasts%2FNkhotakota_Station_based_Seasonal_Forecasts_2023_compressed.pdf?alt=media&token=a3b9172b-c6d0-4ca4-9c10-e4923d58fefb', - size_kb: 423.1, - md5Checksum: '7f3d047c72a3eae483c098e198e297de', - filter: { countries: ['mw'] }, - language: 'en', - meta: { - locationIds: ['Malawi_Nkhotakota'], - }, - }, - downscaled_forecast_2023_nkhotakota_ny: { - id: 'downscaled_forecast_2023_nkhotakota_ny', - description: '', - filename: 'forecast-nkhotakota-chichewa.pdf', - mimetype: 'application/pdf', - title: 'ULOSI WA KAGWEDWE KA MVULA M’BOMA LA NKHOTAKOTA M’DZINJA LA 2023-2024', - type: 'file', - subtype: 'pdf', - url: 'https://firebasestorage.googleapis.com/v0/b/picsa-apps.appspot.com/o/weather%2FSeasonal%20Forecasts%2FNKHOTAKOTA_Chichewa_Poster_2023_2024_compressed.pdf?alt=media&token=2e4d14cf-2e82-48ac-9222-e8020791c50b', - size_kb: 416.1, - md5Checksum: '70a8fb7adb64982e630d4d3890880c72', - filter: { countries: ['mw'] }, - language: 'ny', - meta: { - locationIds: ['Malawi_Nkhotakota'], - }, - }, - seasonal_forecast_2023_chipata: { - id: 'seasonal_forecast_2023_chipata', - description: '', - filename: 'Chipata_Seasonal_Forecast_2023_compressed.pdf', - mimetype: 'application/pdf', - title: 'Seasonal Forecast Chipata 2023', - type: 'file', - subtype: 'pdf', - url: 'https://firebasestorage.googleapis.com/v0/b/picsa-apps.appspot.com/o/weather%2FSeasonal%20Forecasts%2FChipata_Seasonal_Forecast_2023_compressed.pdf?alt=media&token=7b0eef18-7352-4340-b1dc-7d3d3887deb1', - size_kb: 264.5, - md5Checksum: 'e518fb9173765a36e7d82bb4ae3577d9', - filter: { countries: ['zm'] }, - language: 'en', - meta: { - locationIds: ['Zambia_Chipata'], - }, - }, - seasonal_forecast_2023_petauke: { - id: 'seasonal_forecast_2023_petauke', - description: '', - filename: 'Petauke_Seasonal_Forecast_2023_compressed.pdf', - mimetype: 'application/pdf', - title: 'Seasonal Forecast Petauke 2023', - type: 'file', - subtype: 'pdf', - url: 'https://firebasestorage.googleapis.com/v0/b/picsa-apps.appspot.com/o/weather%2FSeasonal%20Forecasts%2FPetauke_Seasonal_Forecast_2023_compressed.pdf?alt=media&token=a6d05f21-a89d-45c5-bc19-cea3e549ba52', - size_kb: 259.5, - md5Checksum: '3cbbd07e607443e5a0c6bc0d302225f7', - filter: { countries: ['zm'] }, - language: 'en', - meta: { - locationIds: ['Zambia_Petauke'], - }, - }, -}; +// HACK - forecasts now populated from 'data' directory +// TODO - remove all legacy forecasts -const otherForecasts: Record = { - rainfall_forecast_2023_zm: { - id: 'rainfall_forecast_2023_zm', - description: '', - filename: 'Zambia_Rainfall_Forecast_2023_2024_compressed.pdf', - mimetype: 'application/pdf', - title: 'RAINFALL FORECAST 2023/2024 SEASON', - type: 'file', - subtype: 'pdf', - url: 'https://firebasestorage.googleapis.com/v0/b/picsa-apps.appspot.com/o/weather%2FSeasonal%20Forecasts%2FZambia_Rainfall_Forecast_2023_2024_compressed.pdf?alt=media&token=21afe2eb-e809-42ac-a187-085ea8217cfd', - size_kb: 463.1, - md5Checksum: 'a7a9ac7d24d79177208dc2539eed07b8', - filter: { countries: ['zm'] }, - language: 'en', - meta: { - locationIds: ['Zambia_Petauke', 'Zambia_Chipata'], - }, - }, - rainfall_forecast_2023_zm_ny: { - id: 'rainfall_forecast_2023_zm_ny', - description: '', - filename: 'Zambia_Chinyanja_Rainfall_Forecast_2023_2024.pdf', - mimetype: 'application/pdf', - title: 'KULOZERA ZA NYENGO YA MVULA YA CAKA CA 2023/2024', - type: 'file', - subtype: 'pdf', - url: 'https://firebasestorage.googleapis.com/v0/b/picsa-apps.appspot.com/o/weather%2FSeasonal%20Forecasts%2FZambia_Chinyanja_Rainfall_Forecast_2023_2024.pdf?alt=media&token=d700185e-b833-47b1-95a9-bc1e83d13bc9', - size_kb: 500.3, - md5Checksum: '76a01e3a99ff0abca5708bd020c3b5bf', - filter: { countries: ['zm'] }, - language: 'ny', - meta: { - locationIds: ['Zambia_Petauke', 'Zambia_Chipata'], - }, - }, -}; +const downscaledForecasts: Record = {}; + +const otherForecasts: Record = {}; export default { downscaledForecasts, otherForecasts }; diff --git a/apps/picsa-tools/resources-tool/src/app/data/weather/index.ts b/apps/picsa-tools/resources-tool/src/app/data/weather/index.ts index a9769fdee..edc6d2e3e 100644 --- a/apps/picsa-tools/resources-tool/src/app/data/weather/index.ts +++ b/apps/picsa-tools/resources-tool/src/app/data/weather/index.ts @@ -1,8 +1,10 @@ +import { FORECAST_COLLECTIONS, FORECAST_FILES } from '@picsa/data/resources/forecasts'; + import { IResourceCollection, IResourceFile, IResourceLink } from '../../schemas'; import { filterHashmap } from '../../utils/data.utils'; import weatherFiles from './files'; import { WEATHER_LINKS } from './links'; -import { IWeatherLocation, WEATHER_LOCATIONS } from './locations'; +import { IWeatherLocation } from './locations'; import { MeteoBlueGenerator } from './meteoBlue'; import { WMOGenerator } from './wmo'; @@ -10,13 +12,17 @@ import { WMOGenerator } from './wmo'; * Weather resources are generated dynamically to assign location-specific * values to links */ -const localisedResources = WEATHER_LOCATIONS.reduce( - (resources, location) => ({ - ...resources, - ...generateLocationResources(location), - }), - {} -); + +// HACK - no longer provide localised resources +// TODO - review best way to manage moving forwards + +// const localisedResources = WEATHER_LOCATIONS.reduce( +// (resources, location) => ({ +// ...resources, +// ...generateLocationResources(location), +// }), +// {} +// ); /** Main collection that hosts child resources */ const weatherResources: IResourceCollection = { @@ -27,8 +33,9 @@ const weatherResources: IResourceCollection = { cover: { image: 'assets/resources/covers/weather.svg' }, priority: 6, childResources: { - collections: WEATHER_LOCATIONS.map((location) => `weatherResources_${location.id}`), - files: [], + // collections: WEATHER_LOCATIONS.map((location) => `weatherResources_${location.id}`), + collections: [FORECAST_COLLECTIONS.forecasts_downscaled.id], + files: FORECAST_COLLECTIONS.forecasts.childResources.files, links: Object.keys(WEATHER_LINKS), }, }; @@ -61,15 +68,18 @@ function generateLocationResources(location: IWeatherLocation) { [collection.id]: collection, ...links, ...files, - ...weatherFiles.downscaledForecasts, - ...weatherFiles.otherForecasts, }; } +// HACK - only included downscaled collection (files from main collection included in web) +const { forecasts_downscaled } = FORECAST_COLLECTIONS; + export default { weatherResources, ...WEATHER_LINKS, - ...localisedResources, + // ...localisedResources, ...weatherFiles.downscaledForecasts, ...weatherFiles.otherForecasts, + forecasts_downscaled, + ...FORECAST_FILES, }; diff --git a/apps/picsa-tools/resources-tool/src/assets/resources/covers/downscaled-forecast.svg b/apps/picsa-tools/resources-tool/src/assets/resources/covers/downscaled-forecast.svg new file mode 100644 index 000000000..59d10a991 --- /dev/null +++ b/apps/picsa-tools/resources-tool/src/assets/resources/covers/downscaled-forecast.svg @@ -0,0 +1,88 @@ + + + + diff --git a/apps/picsa-tools/resources-tool/src/assets/resources/covers/seasonal-forecast.svg b/apps/picsa-tools/resources-tool/src/assets/resources/covers/seasonal-forecast.svg new file mode 100644 index 000000000..9162c0ac4 --- /dev/null +++ b/apps/picsa-tools/resources-tool/src/assets/resources/covers/seasonal-forecast.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libs/data/climate/forecasts/index.ts b/libs/data/climate/forecasts/index.ts deleted file mode 100644 index 6639d9ed2..000000000 --- a/libs/data/climate/forecasts/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -import zm from './zm'; - -import mw from './mw'; - -export const CLIMATE_FORECASTS = { zm, mw }; diff --git a/libs/data/climate/forecasts/zm.ts b/libs/data/climate/forecasts/zm.ts deleted file mode 100644 index 3a4f9c440..000000000 --- a/libs/data/climate/forecasts/zm.ts +++ /dev/null @@ -1,25 +0,0 @@ -const seasonal = { - id: 'c139d571-723c-4013-8246-28b0a291becf', - bucket_id: 'zm', - name: 'forecasts/ZMD Seasonal forecast 2024-25.pdf', - owner: '', - created_at: '2024-10-14 18:12:29.879524+00', - updated_at: '2024-10-14 18:12:29.879524+00', - last_accessed_at: '2024-10-14 18:12:29.879524+00', - metadata: { - eTag: 'cc62ececec1d335da2fe7230c90f1a1e-1', - size: 2111455, - mimetype: 'application/pdf', - cacheControl: 'max-age=3600', - lastModified: '2024-10-14T18:12:30.000Z', - contentLength: 2111455, - httpStatusCode: 200, - }, - path_tokens: ['forecasts', 'ZMD Seasonal forecast 2024-25.pdf'], - version: 'f5342a2a-55fb-48be-acd3-b2b82a581c5c', - owner_id: '', -}; - -export const downscaled = []; - -export default { seasonal }; diff --git a/libs/data/resources/forecasts/index.ts b/libs/data/resources/forecasts/index.ts new file mode 100644 index 000000000..4ca34a874 --- /dev/null +++ b/libs/data/resources/forecasts/index.ts @@ -0,0 +1,81 @@ +import zm from './zm'; + +import mw from './mw'; + +import { IForecasts, IForecastStorageEntry } from './types'; +import { marker as translateMarker } from '@biesbjerg/ngx-translate-extract-marker'; +import { COUNTRIES_DATA_HASHMAP, ICountryCode } from '@picsa/data/deployments'; +import type { IResourceCollection, IResourceFile } from '@picsa/resources/src/app/schemas'; + +const CLIMATE_FORECASTS: { [country_code in ICountryCode]?: IForecasts } = { + zm, + mw, +}; + +/*********************************************************************************** + * Legacy - Resource Formats + * Used to (temporarily) display all forecasts within resource collection + ***********************************************************************************/ +const forecasts: IResourceCollection = { + id: 'forecasts', + title: translateMarker('Forecasts'), + childResources: { collections: ['forecasts_downscaled'], files: [], links: [] }, + type: 'collection', +}; +const forecasts_downscaled: IResourceCollection = { + id: 'forecasts_downscaled', + title: translateMarker('Downscaled Forecasts'), + childResources: { collections: [], files: [], links: [] }, + type: 'collection', + parentCollection: 'forecasts', + cover: { image: 'assets/resources/covers/downscaled-forecast.svg' }, +}; + +const files: Record = {}; + +for (const [country_code, { downscaled, seasonal }] of Object.entries(CLIMATE_FORECASTS)) { + // Add seasonal to main collection + for (const forecast of seasonal) { + const resource = hackGenerateLegacyResources(country_code as ICountryCode, forecast); + resource.title = translateMarker('Seasonal Forecast'); + resource.cover = { image: 'assets/resources/covers/seasonal-forecast.svg' }; + resource.description = `${COUNTRIES_DATA_HASHMAP[country_code].label} 2024-25`; + files[resource.id] = resource; + forecasts.childResources.files.push(resource.id); + } + // Add downscaled to collection + for (const forecast of downscaled) { + const resource = hackGenerateLegacyResources(country_code as ICountryCode, forecast); + files[resource.id] = resource; + forecasts_downscaled.childResources.files.push(resource.id); + } +} + +function hackGenerateLegacyResources(country_code: ICountryCode, forecast: IForecastStorageEntry): IResourceFile { + const { bucket_id, id, metadata, name, path_tokens, version } = forecast; + const { size } = metadata as any; + const filename = (path_tokens as string[]).pop() as string; + // HACK - assume all forecasts stored on production server + const url = `https://wpctacqpzxfzlucblowh.supabase.co/storage/v1/object/public/${bucket_id}/${name}`; + const entry: IResourceFile = { + filename, + id: id as string, + md5Checksum: version as string, + mimetype: 'application/pdf', + size_kb: size / 1000, + subtype: 'pdf', + title: filename.replace('.pdf', ''), + type: 'file', + url, + description: '', + filter: { countries: [country_code] }, + }; + return entry; +} + +export const FORECAST_FILES = files; + +export const FORECAST_COLLECTIONS = { + forecasts, + forecasts_downscaled, +}; diff --git a/libs/data/climate/forecasts/mw.ts b/libs/data/resources/forecasts/mw.ts similarity index 95% rename from libs/data/climate/forecasts/mw.ts rename to libs/data/resources/forecasts/mw.ts index d9643f067..ad3434931 100644 --- a/libs/data/climate/forecasts/mw.ts +++ b/libs/data/resources/forecasts/mw.ts @@ -1,26 +1,30 @@ -const seasonal = { - id: 'b79ff462-eb50-49bf-89d2-d7e87717af7e', - bucket_id: 'mw', - name: 'forecasts/2024-2025_Seasonal_Rainfall_Forecast_Malawi_11_Sep_2024_Final.pdf', - owner: '', - created_at: '2024-10-14 18:12:08.013546+00', - updated_at: '2024-10-14 18:12:08.013546+00', - last_accessed_at: '2024-10-14 18:12:08.013546+00', - metadata: { - eTag: '0d83e8fa5956c75dbd7bd40d8d4811de-1', - size: 275194, - mimetype: 'application/pdf', - cacheControl: 'max-age=3600', - lastModified: '2024-10-14T18:12:08.000Z', - contentLength: 275194, - httpStatusCode: 200, +import { IForecastStorageEntry } from './types'; + +const seasonal: IForecastStorageEntry[] = [ + { + id: 'b79ff462-eb50-49bf-89d2-d7e87717af7e', + bucket_id: 'mw', + name: 'forecasts/2024-2025_Seasonal_Rainfall_Forecast_Malawi_11_Sep_2024_Final.pdf', + owner: '', + created_at: '2024-10-14 18:12:08.013546+00', + updated_at: '2024-10-14 18:12:08.013546+00', + last_accessed_at: '2024-10-14 18:12:08.013546+00', + metadata: { + eTag: '0d83e8fa5956c75dbd7bd40d8d4811de-1', + size: 275194, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:12:08.000Z', + contentLength: 275194, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', '2024-2025_Seasonal_Rainfall_Forecast_Malawi_11_Sep_2024_Final.pdf'], + version: 'fd5bed25-06af-46a3-a727-5fd81ac81eb2', + owner_id: '', }, - path_tokens: ['forecasts', '2024-2025_Seasonal_Rainfall_Forecast_Malawi_11_Sep_2024_Final.pdf'], - version: 'fd5bed25-06af-46a3-a727-5fd81ac81eb2', - owner_id: '', -}; +]; -const downscaled = [ +const downscaled: IForecastStorageEntry[] = [ { id: 'a4ac39ea-f469-419d-8bd5-99e080e00bcb', bucket_id: 'mw', diff --git a/libs/data/resources/forecasts/types.ts b/libs/data/resources/forecasts/types.ts new file mode 100644 index 000000000..6c26af8e3 --- /dev/null +++ b/libs/data/resources/forecasts/types.ts @@ -0,0 +1,6 @@ +import type { Database } from '@picsa/server-types'; + +// TODO - use general storage entry +export type IForecastStorageEntry = Database['public']['Views']['storage_objects']['Row']; + +export type IForecasts = { seasonal: IForecastStorageEntry[]; downscaled: IForecastStorageEntry[] }; diff --git a/libs/data/resources/forecasts/zm.ts b/libs/data/resources/forecasts/zm.ts new file mode 100644 index 000000000..6bbaba22c --- /dev/null +++ b/libs/data/resources/forecasts/zm.ts @@ -0,0 +1,29 @@ +import { IForecastStorageEntry } from './types'; + +const seasonal: IForecastStorageEntry[] = [ + { + id: 'c139d571-723c-4013-8246-28b0a291becf', + bucket_id: 'zm', + name: 'forecasts/ZMD Seasonal forecast 2024-25.pdf', + owner: '', + created_at: '2024-10-14 18:12:29.879524+00', + updated_at: '2024-10-14 18:12:29.879524+00', + last_accessed_at: '2024-10-14 18:12:29.879524+00', + metadata: { + eTag: 'cc62ececec1d335da2fe7230c90f1a1e-1', + size: 2111455, + mimetype: 'application/pdf', + cacheControl: 'max-age=3600', + lastModified: '2024-10-14T18:12:30.000Z', + contentLength: 2111455, + httpStatusCode: 200, + }, + path_tokens: ['forecasts', 'ZMD Seasonal forecast 2024-25.pdf'], + version: 'f5342a2a-55fb-48be-acd3-b2b82a581c5c', + owner_id: '', + }, +]; + +export const downscaled: IForecastStorageEntry[] = []; + +export default { seasonal, downscaled }; From 93a9558ab52dc7ebf2fcb065ea7e7010d1a13540 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 15 Oct 2024 15:52:33 +0100 Subject: [PATCH 4/6] chore: bump version --- .../android/app/build.gradle | 4 +- .../resources/covers/seasonal-forecast.svg | 196 +++++++++++++++--- libs/environments/src/version.ts | 2 +- package.json | 2 +- 4 files changed, 166 insertions(+), 38 deletions(-) diff --git a/apps/picsa-apps/extension-app-native/android/app/build.gradle b/apps/picsa-apps/extension-app-native/android/app/build.gradle index f50808505..064b3ca36 100644 --- a/apps/picsa-apps/extension-app-native/android/app/build.gradle +++ b/apps/picsa-apps/extension-app-native/android/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "io.picsa.extension" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 3047001 - versionName "3.47.1" + versionCode 3048000 + versionName "3.48.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/apps/picsa-tools/resources-tool/src/assets/resources/covers/seasonal-forecast.svg b/apps/picsa-tools/resources-tool/src/assets/resources/covers/seasonal-forecast.svg index 9162c0ac4..5507adc44 100644 --- a/apps/picsa-tools/resources-tool/src/assets/resources/covers/seasonal-forecast.svg +++ b/apps/picsa-tools/resources-tool/src/assets/resources/covers/seasonal-forecast.svg @@ -1,35 +1,163 @@ - - - - diff --git a/libs/environments/src/version.ts b/libs/environments/src/version.ts index a77220859..6c8b0b5b9 100644 --- a/libs/environments/src/version.ts +++ b/libs/environments/src/version.ts @@ -4,5 +4,5 @@ import packageJson from '../../../package.json'; export const APP_VERSION = { number: packageJson.version, - date: '2024-10-11', + date: '2024-10-15', }; diff --git a/package.json b/package.json index f9dcdef1c..6f681b0c3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "picsa-apps", - "version": "3.47.1", + "version": "3.48.0", "license": "See LICENSE", "scripts": { "ng": "nx", From b8f64f1cb02cab3dad2d4b2b401d4a74a566a9d1 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 15 Oct 2024 15:55:41 +0100 Subject: [PATCH 5/6] chore: update dccms link --- .../src/app/data/weather/links.ts | 2 +- .../resources/covers/seasonal-forecast.svg | 222 +++++------------- 2 files changed, 60 insertions(+), 164 deletions(-) diff --git a/apps/picsa-tools/resources-tool/src/app/data/weather/links.ts b/apps/picsa-tools/resources-tool/src/app/data/weather/links.ts index 3332a5d2a..8d77b03bd 100644 --- a/apps/picsa-tools/resources-tool/src/app/data/weather/links.ts +++ b/apps/picsa-tools/resources-tool/src/app/data/weather/links.ts @@ -28,7 +28,7 @@ export const WEATHER_LINKS: Record = { type: 'link', subtype: 'website', cover: { image: 'assets/resources/covers/dccms.jpg' }, - url: 'https://www.metmalawi.gov.mw/dccms_weather.php', + url: 'https://www.metmalawi.gov.mw/products/daily-forecast#results', priority: 10, filter: { countries: ['mw'] }, }, diff --git a/apps/picsa-tools/resources-tool/src/assets/resources/covers/seasonal-forecast.svg b/apps/picsa-tools/resources-tool/src/assets/resources/covers/seasonal-forecast.svg index 5507adc44..2adddb16c 100644 --- a/apps/picsa-tools/resources-tool/src/assets/resources/covers/seasonal-forecast.svg +++ b/apps/picsa-tools/resources-tool/src/assets/resources/covers/seasonal-forecast.svg @@ -1,163 +1,59 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 9ac23d2d805805967bb8da5217d6e99febeba66b Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 15 Oct 2024 16:05:15 +0100 Subject: [PATCH 6/6] feat: add dccms whatsapp link --- .../src/app/data/weather/links.ts | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/apps/picsa-tools/resources-tool/src/app/data/weather/links.ts b/apps/picsa-tools/resources-tool/src/app/data/weather/links.ts index 8d77b03bd..2c485495f 100644 --- a/apps/picsa-tools/resources-tool/src/app/data/weather/links.ts +++ b/apps/picsa-tools/resources-tool/src/app/data/weather/links.ts @@ -21,6 +21,17 @@ export const WEATHER_LINKS: Record = { cover: { image: 'assets/resources/covers/facebook.svg' }, filter: { countries: ['zm'] }, }, + dccms_whatsapp: { + id: 'dccms_whatsapp', + title: 'DCCMS Whatsapp', + description: 'Stay updated on #Malawi weather, climate, alerts and news.', + type: 'link', + subtype: 'whatsapp', + cover: { image: 'assets/resources/covers/whatsapp.svg' }, + url: 'https://www.whatsapp.com/channel/0029VaT21WW8PgsBmJWWGc1A', + priority: 9, + filter: { countries: ['mw'] }, + }, dccms_daily_forecast: { id: 'dccms_daily_forecast', title: 'DCCMS Daily Forecast', @@ -32,17 +43,7 @@ export const WEATHER_LINKS: Record = { priority: 10, filter: { countries: ['mw'] }, }, - dccms_facebook: { - id: 'dccms_facebook', - title: 'DCCMS Malawi', - description: 'Facebook Group', - type: 'link', - subtype: 'facebook', - cover: { image: 'assets/resources/covers/facebook.svg' }, - url: 'https://www.facebook.com/MALAWIWEATHERUPDATE', - priority: 9, - filter: { countries: ['mw'] }, - }, + dccms_twitter: { id: 'dccms_twitter', title: 'DCCMS Twitter',