feat: custom home tags

e-picsa · Aug 10, 2024 · 4cef03d · 4cef03d
1 parent 08ae189
commit 4cef03d
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 11 deletions.
diff --git a/apps/picsa-tools/farmer-content/src/app/pages/home/farmer-home.component.html b/apps/picsa-tools/farmer-content/src/app/pages/home/farmer-home.component.html
@@ -14,9 +14,9 @@
         <h2 class="step-title">{{ step.title | translate }}</h2>
         <div class="tags-container">
           @for(tag of step.tags; track tag){
-          <span class="tag step-tag">{{ tag.label | translate }}</span>
+          <span class="tag" [attr.data-color]="tag.color">{{ tag.label | translate }}</span>
           } @for(tool of step.tools; track tool){
-          <span class="tag tool-tag">{{ tool.label | translate }}</span>
+          <span class="tag">{{ tool.label | translate }}</span>
           }
         </div>
       </div>

diff --git a/apps/picsa-tools/farmer-content/src/app/pages/home/farmer-home.component.scss b/apps/picsa-tools/farmer-content/src/app/pages/home/farmer-home.component.scss
@@ -79,12 +79,10 @@ button.mat-mdc-icon-button.nav-button {
   background: var(--tag-background, black);
   padding: 8px;
   color: white;
-  .step-tag {
-  }
 }
-.tag.tool-tag {
+.tag {
   --tag-background: var(--color-primary);
 }
-.tag.step-tag {
+.tag[data-color='secondary'] {
   --tag-background: var(--color-secondary);
 }
diff --git a/apps/picsa-tools/resources-tool/src/app/components/resource-item/file/file.ts b/apps/picsa-tools/resources-tool/src/app/components/resource-item/file/file.ts
@@ -32,7 +32,9 @@ export class ResourceItemFileComponent implements OnInit, OnDestroy {
 
   async ngOnDestroy() {
     // ensure any created file attachment uris disposed of
-    this.service.revokeFileAttachmentURIs([this.dbDoc.filename]);
+    if (this.dbDoc) {
+      this.service.revokeFileAttachmentURIs([this.dbDoc.filename]);
+    }
   }
 
   /** When attachment state changed attempt to get URI to downloaded file resource */

diff --git a/libs/data/farmer_content/data/content/0_intro.ts b/libs/data/farmer_content/data/content/0_intro.ts
@@ -17,7 +17,7 @@ const content: Omit<IFarmerContent, 'id' | 'icon_path'> = {
   slug: 'intro',
   title: translateMarker('What is PICSA?'),
   tools: [],
-  tags: [{ label: translateMarker('Tutorials') }],
+  tags: [{ label: translateMarker('Tutorials'), color: 'secondary' }],
   steps,
 };
 export default content;
diff --git a/libs/data/farmer_content/data/content/1_what_you_do.ts b/libs/data/farmer_content/data/content/1_what_you_do.ts
@@ -23,7 +23,7 @@ const content: Omit<IFarmerContent, 'id' | 'icon_path'> = {
   slug: 'what-do-you-currently-do',
   title: translateMarker('What do you currently do?'),
   tools: [seasonal_calendar],
-  tags: [],
+  tags: [{ label: translateMarker('Resource Allocation Map') }],
   steps,
   showReviewSection: true,
 };

diff --git a/libs/data/farmer_content/data/tools.ts b/libs/data/farmer_content/data/tools.ts
@@ -17,7 +17,6 @@ const TOOLS_BASE = {
     href: 'crop-probability',
     tabLabel: translateMarker('Tool'),
   },
-  // resource_allocation_map: { label: translateMarker('Resource Allocation Map'), tabLabel: translateMarker('RAM Tool') },
   seasonal_calendar: {
     label: translateMarker('Seasonal Calendar'),
     href: 'seasonal-calendar',

diff --git a/libs/data/farmer_content/types.ts b/libs/data/farmer_content/types.ts
@@ -37,7 +37,7 @@ export interface IFarmerContent {
   icon_path: string;
   title: string;
   tools: IToolData[];
-  tags: { label: string }[];
+  tags: { label: string; color?: 'primary' | 'secondary' }[];
   steps: IFarmerContentStep[];
   disabled?: boolean;
   /** Include a photo-input section as part of review */