IO-2604 Add vendor tags to search select & vendor edit screen.

client/src/components/vendor-search-select/vendor-search-select.component.jsx

@@ -52,6 +52,7 @@ const VendorSearchSelect = ({ value, onChange, options, onSelect, disabled, pref
             >
               {label}
             </div>
+
             {discount && discount !== 0 ? <Tag color="green">{`${discount * 100}%`}</Tag> : null}
           </div>
         );
@@ -116,6 +117,11 @@ const VendorSearchSelect = ({ value, onChange, options, onSelect, disabled, pref
                 {o.name}
               </div>
               <Space style={{ marginLeft: "1rem" }}>
+                {o.tags?.map((tag, idx) => (
+                  <Tag key={idx} style={{ marginLeft: "0.5rem" }}>
+                    {tag}
+                  </Tag>
+                ))}
                 {o.phone && showPhone && <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>}
                 {o.discount && o.discount !== 0 ? <Tag color="green">{`${o.discount * 100}%`}</Tag> : null}
               </Space>

client/src/components/vendors-form/vendors-form.component.jsx

@@ -1,7 +1,7 @@
 import { DeleteFilled } from "@ant-design/icons";
 import { useApolloClient } from "@apollo/client";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { Button, Divider, Form, Input, InputNumber, Space, Switch } from "antd";
+import { Button, Divider, Form, Input, InputNumber, Select, Space, Switch } from "antd";
 import { PageHeader } from "@ant-design/pro-layout";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -179,6 +179,18 @@ export function VendorsFormComponent({
         }
       </LayoutFormRow>
 
+      <Form.Item
+        name="tags"
+        label={t("vendor.fields.tags")}
+        rules={[
+          {
+            //message: t("general.validation.required"),
+            type: "array"
+          }
+        ]}
+      >
+        <Select mode="tags" />
+      </Form.Item>
       {DmsAp.treatment === "on" && (
         <Form.Item label={t("vendors.fields.dmsid")} name="dmsid">
           <Input />

client/src/components/vendors-list/vendors-list.component.jsx

@@ -1,5 +1,5 @@
 import { SyncOutlined } from "@ant-design/icons";
-import { Button, Card, Input, Space, Table } from "antd";
+import { Button, Card, Input, Space, Table, Tag } from "antd";
 import queryString from "query-string";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -38,6 +38,18 @@ export default function VendorsListComponent({ handleNewVendor, loading, handleO
       title: t("vendors.fields.city"),
       dataIndex: "city",
       key: "city"
+    },
+    {
+      title: t("vendors.fields.tags"),
+      dataIndex: "tags",
+      key: "tags",
+      render: (text, record) => (
+        <Space>
+          {record?.tags?.map((tag, idx) => (
+            <Tag key={idx}>{tag}</Tag>
+          ))}
+        </Space>
+      )
     }
   ];
 

client/src/graphql/vendors.queries.js

@@ -19,6 +19,7 @@ export const QUERY_VENDOR_BY_ID = gql`
       active
       phone
       dmsid
+      tags
     }
   }
 `;
@@ -54,6 +55,7 @@ export const QUERY_ALL_VENDORS = gql`
       city
       phone
       active
+      tags
     }
   }
 `;
@@ -89,6 +91,7 @@ export const QUERY_ALL_VENDORS_FOR_ORDER = gql`
       email
       active
       phone
+      tags
     }
     jobs(where: { id: { _eq: $jobId } }) {
       v_make_desc
@@ -105,6 +108,7 @@ export const SEARCH_VENDOR_AUTOCOMPLETE = gql`
       cost_center
       active
       favorite
+      tags
     }
   }
 `;
@@ -124,6 +128,7 @@ export const SEARCH_VENDOR_AUTOCOMPLETE_WITH_ADDR = gql`
       email
       state
       active
+      tags
     }
   }
 `;

client/src/translations/en_us/common.json

@@ -426,6 +426,11 @@
 				"messagingtext": "Messaging Preset Text",
 				"noteslabel": "Note Label",
 				"notestext": "Note Text",
+				"notifications": {
+					"description": "Select employees to automatically follow new jobs and receive notifications for job updates.",
+					"invalid_followers": "Invalid selection. Please select valid employees.",
+					"placeholder": "Search for employees"
+				},
 				"partslocation": "Parts Location",
 				"phone": "Phone",
 				"prodtargethrs": "Production Target Hours",
@@ -648,15 +653,9 @@
 				"use_paint_scale_data": "Use Paint Scale Data for Job Costing?",
 				"uselocalmediaserver": "Use Local Media Server?",
 				"website": "Website",
-        "zip_post": "Zip/Postal Code",
+				"zip_post": "Zip/Postal Code"
-        "notifications": {
-          "description": "Select employees to automatically follow new jobs and receive notifications for job updates.",
-          "placeholder": "Search for employees",
-          "invalid_followers": "Invalid selection. Please select valid employees."
-        }
 			},
 			"labels": {
-        "consent_settings": "Phone Number Opt-Out List",
 				"2tiername": "Name => RO",
 				"2tiersetup": "2 Tier Setup",
 				"2tiersource": "Source => RO",
@@ -667,6 +666,7 @@
 				"apptcolors": "Appointment Colors",
 				"businessinformation": "Business Information",
 				"checklists": "Checklists",
+				"consent_settings": "Phone Number Opt-Out List",
 				"csiq": "CSI Questions",
 				"customtemplates": "Custom Templates",
 				"defaultcostsmapping": "Default Costs Mapping",
@@ -704,6 +704,9 @@
 				"messagingpresets": "Messaging Presets",
 				"notemplatesavailable": "No templates available to add.",
 				"notespresets": "Notes Presets",
+				"notifications": {
+					"followers": "Notifications"
+				},
 				"orderstatuses": "Order Statuses",
 				"partslocations": "Parts Locations",
 				"partsscan": "Parts Scanning",
@@ -734,10 +737,7 @@
 				"ssbuckets": "Job Size Definitions",
 				"systemsettings": "System Settings",
 				"task-presets": "Task Presets",
-        "workingdays": "Working Days",
+				"workingdays": "Working Days"
-        "notifications": {
-          "followers": "Notifications"
-        }
 			},
 			"operations": {
 				"contains": "Contains",
@@ -783,6 +783,15 @@
 				"completed": "Job checklist completed."
 			}
 		},
+		"consent": {
+			"associated_owners": "Associated Owners",
+			"created_at": "Opt-Out Date",
+			"no_owners": "No Associated Owners",
+			"phone_1": "Phone 1",
+			"phone_2": "Phone 2",
+			"phone_number": "Phone Number",
+			"text_body": "Users can opt out of receiving SMS messages by replying with keywords such as STOP, UNSUBSCRIBE, CANCEL, END, QUIT, STOPALL, REVOKE and OPTOUT. To opt back in, users can reply with START, YES, or UNSTOP. Even after opting out, users can still send messages to us, which will be received and processed as needed. Ensure customers are informed to reply with these keywords to manage their messaging preferences. After opting out, users receive a confirmation message and will not receive further messages until they opt back in."
+		},
 		"contracts": {
 			"actions": {
 				"changerate": "Change Contract Rates",
@@ -1235,11 +1244,11 @@
 				"fcm": "You must allow notification permissions to have real time messaging.  Click to try again.",
 				"notfound": "No record was found.",
 				"sizelimit": "The selected items exceed the size limit.",
-        "submit-for-testing": "Error submitting Job for testing.",
 				"sub_status": {
 					"expired": "The subscription for this shop has expired. Please contact Sales to reactivate.",
 					"trial-expired": "The trial for this shop has expired. Please contact Sales to reactivate."
-        }
+				},
+				"submit-for-testing": "Error submitting Job for testing."
 			},
 			"itemtypes": {
 				"contract": "CC Contract",
@@ -1659,8 +1668,6 @@
 				"adjustment_bottom_line": "Adjustments",
 				"adjustmenthours": "Adjustment Hours",
 				"alt_transport": "Alt. Trans.",
-        "estimate_sent_approval": "Estimate Sent for Approval",
-        "estimate_approved": "Estimate Approved",
 				"area_of_damage_impact": {
 					"10": "Left Front Side",
 					"11": "Left Front Corner",
@@ -1783,6 +1790,8 @@
 				"est_ct_ln": "Estimator Last Name",
 				"est_ea": "Estimator Email",
 				"est_ph1": "Estimator Phone #",
+				"estimate_approved": "Estimate Approved",
+				"estimate_sent_approval": "Estimate Sent for Approval",
 				"federal_tax_payable": "Federal Tax Payable",
 				"federal_tax_rate": "Federal Tax Rate",
 				"flat_rate_ats": "Flat Rate ATS?",
@@ -1966,8 +1975,6 @@
 				"scheddates": "Schedule Dates"
 			},
 			"labels": {
-        "sent": "",
-        "approved": "",
 				"accountsreceivable": "Accounts Receivable",
 				"act_price_ppc": "New Part Price",
 				"actual_completion_inferred": "$t(jobs.fields.actual_completion) inferred using $t(jobs.fields.scheduled_completion).",
@@ -1982,6 +1989,7 @@
 				"alreadyaddedtoscoreboard": "Job has already been added to scoreboard. Saving will update the previous entry.",
 				"alreadyclosed": "This Job has already been closed.",
 				"appointmentconfirmation": "Send confirmation to customer?",
+				"approved": "",
 				"associationwarning": "Any changes to associations will require updating the data from the new parent record to the Job.",
 				"audit": "Audit Trail",
 				"available": "Available",
@@ -2172,6 +2180,7 @@
 				"sales": "Sales",
 				"savebeforeconversion": "You have unsaved changes on the Job.  Please save them before converting it. ",
 				"scheduledinchange": "The scheduled in is based off the latest appointment. To change this date,  please schedule or reschedule the Job. ",
+				"sent": "",
 				"specialcoveragepolicy": "Special Coverage Policy Applies",
 				"state_tax_amt": "Provincial/State Taxes",
 				"subletsnotcompleted": "Outstanding Sublets",
@@ -2388,15 +2397,16 @@
 			},
 			"errors": {
 				"invalidphone": "The phone number is invalid.  Unable to open conversation. ",
+				"no_consent": "This phone number has opted-out of Messaging.",
 				"noattachedjobs": "No Jobs have been associated to this conversation. ",
-        "updatinglabel": "Error updating label. {{error}}",
+				"updatinglabel": "Error updating label. {{error}}"
-        "no_consent": "This phone number has opted-out of Messaging."
 			},
 			"labels": {
 				"addlabel": "Add a label to this conversation.",
 				"archive": "Archive",
 				"maxtenimages": "You can only select up to a maximum of 10 images at a time.",
 				"messaging": "Messaging",
+				"no_consent": "Opted-out",
 				"noallowtxt": "This customer has not indicated their permission to be messaged.",
 				"nojobs": "Not associated to any Job.",
 				"nopush": "Polling Mode Enabled",
@@ -2406,8 +2416,7 @@
 				"selectmedia": "Select Media",
 				"sentby": "Sent by {{by}} at {{time}}",
 				"typeamessage": "Send a message...",
-        "unarchive": "Unarchive",
+				"unarchive": "Unarchive"
-        "no_consent": "Opted-out"
 			},
 			"render": {
 				"conversation_list": "Conversation List"
@@ -2427,6 +2436,7 @@
 			"fields": {
 				"createdby": "Created By",
 				"critical": "Critical",
+				"pinned": "",
 				"private": "Private",
 				"text": "Contents",
 				"type": "Type",
@@ -2445,6 +2455,7 @@
 				"addtorelatedro": "Add to Related ROs",
 				"newnoteplaceholder": "Add a note...",
 				"notetoadd": "Note to Add",
+				"pinned_note": "",
 				"systemnotes": "System Notes",
 				"usernotes": "User Notes"
 			},
@@ -2467,11 +2478,15 @@
 				"fcm": "Push"
 			},
 			"labels": {
-        "auto-add": "Automatically watch Jobs I import",
-        "auto-add-success": "Auto watcher status successfully changed.",
-        "auto-add-failure": "Something went wrong updating your auto watcher status.",
 				"add-watchers": "Add Watchers",
 				"add-watchers-team": "Add Team Members",
+				"auto-add": "Automatically watch Jobs I import",
+				"auto-add-description": "",
+				"auto-add-failure": "Something went wrong updating your auto watcher status.",
+				"auto-add-off": "",
+				"auto-add-on": "",
+				"auto-add-success": "Auto watcher status successfully changed.",
+				"employee-notification": "Notifications are disabled because you do not have an associated Employee record.",
 				"employee-search": "Search for an Employee",
 				"mark-all-read": "Mark All Read",
 				"new-notification-title": "New Notification:",
@@ -2488,8 +2503,7 @@
 				"teams-search": "Search for a Team",
 				"unwatch": "Unwatch",
 				"watch": "Watch",
-        "watching-issue": "Watching",
+				"watching-issue": "Watching"
-        "employee-notification": "Notifications are disabled because you do not have an associated Employee record."
 			},
 			"scenarios": {
 				"alternate-transport-changed": "Alternate Transport Changed",
@@ -3299,17 +3313,10 @@
 				"updated": "Scoreboard updated."
 			}
 		},
-    "tasks": {
+		"settings": {
-      "labels": {
+			"title": "Phone Number Opt-Out List"
-        "my_tasks_center": "Task Center",
-        "go_to_job": "Go to Job",
-        "overdue": "Overdue",
-        "due_today": "Today",
-        "upcoming": "Upcoming",
-        "no_due_date": "Incomplete",
-        "ro-number": "RO #{{ro_number}}",
-        "no_tasks": "No Tasks Found"
 		},
+		"tasks": {
 			"actions": {
 				"edit": "Edit Task",
 				"new": "New Task",
@@ -3324,9 +3331,6 @@
 				"myTasks": "Mine",
 				"refresh": "Refresh"
 			},
-      "errors": {
-        "load_failure": "Failed to load Tasks."
-      },
 			"date_presets": {
 				"completion": "Completion",
 				"day": "Day",
@@ -3340,6 +3344,9 @@
 				"tomorrow": "Tomorrow",
 				"two_weeks": "Two Weeks"
 			},
+			"errors": {
+				"load_failure": "Failed to load Tasks."
+			},
 			"failures": {
 				"completed": "Failed to toggle Task completion.",
 				"created": "Failed to create Task.",
@@ -3374,6 +3381,16 @@
 				"remind_at": "Remind At",
 				"title": "Title"
 			},
+			"labels": {
+				"due_today": "Today",
+				"go_to_job": "Go to Job",
+				"my_tasks_center": "Task Center",
+				"no_due_date": "Incomplete",
+				"no_tasks": "No Tasks Found",
+				"overdue": "Overdue",
+				"ro-number": "RO #{{ro_number}}",
+				"upcoming": "Upcoming"
+			},
 			"placeholders": {
 				"assigned_to": "Select an Employee",
 				"billid": "Select a Bill",
@@ -3873,6 +3890,7 @@
 				"state": "Province/State",
 				"street1": "Street",
 				"street2": "Address 2",
+				"tags": "Tags",
 				"taxid": "Tax ID",
 				"terms": "Payment Terms",
 				"zip": "Zip/Postal Code"
@@ -3889,18 +3907,6 @@
 			"validation": {
 				"unique_vendor_name": "You must enter a unique vendor name."
 			}
-    },
-    "consent": {
-      "phone_number": "Phone Number",
-      "associated_owners": "Associated Owners",
-      "created_at": "Opt-Out Date",
-      "no_owners": "No Associated Owners",
-      "phone_1": "Phone 1",
-      "phone_2": "Phone 2",
-      "text_body": "Users can opt out of receiving SMS messages by replying with keywords such as STOP, UNSUBSCRIBE, CANCEL, END, QUIT, STOPALL, REVOKE and OPTOUT. To opt back in, users can reply with START, YES, or UNSTOP. Even after opting out, users can still send messages to us, which will be received and processed as needed. Ensure customers are informed to reply with these keywords to manage their messaging preferences. After opting out, users receive a confirmation message and will not receive further messages until they opt back in."
-    },
-    "settings": {
-      "title": "Phone Number Opt-Out List"
 		}
 	}
 }

client/src/translations/es/common.json

@@ -426,6 +426,11 @@
 				"messagingtext": "",
 				"noteslabel": "",
 				"notestext": "",
+				"notifications": {
+					"description": "",
+					"invalid_followers": "",
+					"placeholder": ""
+				},
 				"partslocation": "",
 				"phone": "",
 				"prodtargethrs": "",
@@ -648,15 +653,9 @@
 				"use_paint_scale_data": "",
 				"uselocalmediaserver": "",
 				"website": "",
-        "zip_post": "",
+				"zip_post": ""
-        "notifications": {
-          "description": "",
-          "placeholder": "",
-          "invalid_followers": ""
-        }
 			},
 			"labels": {
-        "consent_settings": "",
 				"2tiername": "",
 				"2tiersetup": "",
 				"2tiersource": "",
@@ -667,6 +666,7 @@
 				"apptcolors": "",
 				"businessinformation": "",
 				"checklists": "",
+				"consent_settings": "",
 				"csiq": "",
 				"customtemplates": "",
 				"defaultcostsmapping": "",
@@ -704,6 +704,9 @@
 				"messagingpresets": "",
 				"notemplatesavailable": "",
 				"notespresets": "",
+				"notifications": {
+					"followers": ""
+				},
 				"orderstatuses": "",
 				"partslocations": "",
 				"partsscan": "",
@@ -734,10 +737,7 @@
 				"ssbuckets": "",
 				"systemsettings": "",
 				"task-presets": "",
-        "workingdays": "",
+				"workingdays": ""
-        "notifications": {
-          "followers": ""
-        }
 			},
 			"operations": {
 				"contains": "",
@@ -783,6 +783,15 @@
 				"completed": ""
 			}
 		},
+		"consent": {
+			"associated_owners": "",
+			"created_at": "",
+			"no_owners": "",
+			"phone_1": "",
+			"phone_2": "",
+			"phone_number": "",
+			"text_body": ""
+		},
 		"contracts": {
 			"actions": {
 				"changerate": "",
@@ -1235,11 +1244,11 @@
 				"fcm": "",
 				"notfound": "",
 				"sizelimit": "",
-        "submit-for-testing": "",
 				"sub_status": {
 					"expired": "",
 					"trial-expired": ""
-        }
+				},
+				"submit-for-testing": ""
 			},
 			"itemtypes": {
 				"contract": "",
@@ -1651,8 +1660,6 @@
 				"voiding": ""
 			},
 			"fields": {
-        "estimate_sent_approval": "",
-        "estimate_approved": "",
 				"active_tasks": "",
 				"actual_completion": "Realización real",
 				"actual_delivery": "Entrega real",
@@ -1783,6 +1790,8 @@
 				"est_ct_ln": "Apellido del tasador",
 				"est_ea": "Correo electrónico del tasador",
 				"est_ph1": "Número de teléfono del tasador",
+				"estimate_approved": "",
+				"estimate_sent_approval": "",
 				"federal_tax_payable": "Impuesto federal por pagar",
 				"federal_tax_rate": "",
 				"flat_rate_ats": "",
@@ -1966,8 +1975,6 @@
 				"scheddates": ""
 			},
 			"labels": {
-        "sent": "",
-        "approved": "",
 				"accountsreceivable": "",
 				"act_price_ppc": "",
 				"actual_completion_inferred": "",
@@ -1982,6 +1989,7 @@
 				"alreadyaddedtoscoreboard": "",
 				"alreadyclosed": "",
 				"appointmentconfirmation": "¿Enviar confirmación al cliente?",
+				"approved": "",
 				"associationwarning": "",
 				"audit": "",
 				"available": "",
@@ -2172,6 +2180,7 @@
 				"sales": "",
 				"savebeforeconversion": "",
 				"scheduledinchange": "",
+				"sent": "",
 				"specialcoveragepolicy": "",
 				"state_tax_amt": "",
 				"subletsnotcompleted": "",
@@ -2388,15 +2397,16 @@
 			},
 			"errors": {
 				"invalidphone": "",
+				"no_consent": "",
 				"noattachedjobs": "",
-        "updatinglabel": "",
+				"updatinglabel": ""
-        "no_consent": ""
 			},
 			"labels": {
 				"addlabel": "",
 				"archive": "",
 				"maxtenimages": "",
 				"messaging": "Mensajería",
+				"no_consent": "",
 				"noallowtxt": "",
 				"nojobs": "",
 				"nopush": "",
@@ -2406,8 +2416,7 @@
 				"selectmedia": "",
 				"sentby": "",
 				"typeamessage": "Enviar un mensaje...",
-        "unarchive": "",
+				"unarchive": ""
-        "no_consent": ""
 			},
 			"render": {
 				"conversation_list": ""
@@ -2427,6 +2436,7 @@
 			"fields": {
 				"createdby": "Creado por",
 				"critical": "Crítico",
+				"pinned": "",
 				"private": "Privado",
 				"text": "Contenido",
 				"type": "",
@@ -2445,6 +2455,7 @@
 				"addtorelatedro": "",
 				"newnoteplaceholder": "Agrega una nota...",
 				"notetoadd": "",
+				"pinned_note": "",
 				"systemnotes": "",
 				"usernotes": ""
 			},
@@ -2467,13 +2478,15 @@
 				"fcm": ""
 			},
 			"labels": {
-        "auto-add-on": "",
-        "auto-add-off": "",
-        "auto-add-success": "",
-        "auto-add-failure": "",
-        "auto-add-description": "",
 				"add-watchers": "",
 				"add-watchers-team": "",
+				"auto-add": "",
+				"auto-add-description": "",
+				"auto-add-failure": "",
+				"auto-add-off": "",
+				"auto-add-on": "",
+				"auto-add-success": "",
+				"employee-notification": "",
 				"employee-search": "",
 				"mark-all-read": "",
 				"new-notification-title": "",
@@ -2490,8 +2503,7 @@
 				"teams-search": "",
 				"unwatch": "",
 				"watch": "",
-        "watching-issue": "",
+				"watching-issue": ""
-        "employee-notification": ""
 			},
 			"scenarios": {
 				"alternate-transport-changed": "",
@@ -3301,17 +3313,10 @@
 				"updated": ""
 			}
 		},
-    "tasks": {
+		"settings": {
-      "labels": {
+			"title": ""
-        "my_tasks_center": "",
-        "go_to_job": "",
-        "overdue": "",
-        "due_today": "",
-        "upcoming": "",
-        "no_due_date": "",
-        "ro-number": "",
-        "no_tasks": ""
 		},
+		"tasks": {
 			"actions": {
 				"edit": "",
 				"new": "",
@@ -3326,9 +3331,6 @@
 				"myTasks": "",
 				"refresh": ""
 			},
-      "errors": {
-        "load_failure": ""
-      },
 			"date_presets": {
 				"completion": "",
 				"day": "",
@@ -3342,6 +3344,9 @@
 				"tomorrow": "",
 				"two_weeks": ""
 			},
+			"errors": {
+				"load_failure": ""
+			},
 			"failures": {
 				"completed": "",
 				"created": "",
@@ -3376,6 +3381,16 @@
 				"remind_at": "",
 				"title": ""
 			},
+			"labels": {
+				"due_today": "",
+				"go_to_job": "",
+				"my_tasks_center": "",
+				"no_due_date": "",
+				"no_tasks": "",
+				"overdue": "",
+				"ro-number": "",
+				"upcoming": ""
+			},
 			"placeholders": {
 				"assigned_to": "",
 				"billid": "",
@@ -3875,6 +3890,7 @@
 				"state": "Provincia del estado",
 				"street1": "calle",
 				"street2": "Dirección 2",
+				"tags": "",
 				"taxid": "Identificación del impuesto",
 				"terms": "Términos de pago",
 				"zip": "código postal"
@@ -3891,18 +3907,6 @@
 			"validation": {
 				"unique_vendor_name": ""
 			}
-    },
-    "consent": {
-      "phone_number": "",
-      "associated_owners": "",
-      "created_at": "",
-      "no_owners": "",
-      "phone_1": "",
-      "phone_2": "",
-      "text_body": ""
-    },
-    "settings": {
-      "title": ""
 		}
 	}
 }

client/src/translations/fr/common.json

@@ -426,6 +426,11 @@
 				"messagingtext": "",
 				"noteslabel": "",
 				"notestext": "",
+				"notifications": {
+					"description": "",
+					"invalid_followers": "",
+					"placeholder": ""
+				},
 				"partslocation": "",
 				"phone": "",
 				"prodtargethrs": "",
@@ -648,15 +653,9 @@
 				"use_paint_scale_data": "",
 				"uselocalmediaserver": "",
 				"website": "",
-        "zip_post": "",
+				"zip_post": ""
-        "notifications": {
-          "description": "",
-          "placeholder": "",
-          "invalid_followers": ""
-        }
 			},
 			"labels": {
-        "consent_settings": "",
 				"2tiername": "",
 				"2tiersetup": "",
 				"2tiersource": "",
@@ -667,6 +666,7 @@
 				"apptcolors": "",
 				"businessinformation": "",
 				"checklists": "",
+				"consent_settings": "",
 				"csiq": "",
 				"customtemplates": "",
 				"defaultcostsmapping": "",
@@ -704,6 +704,9 @@
 				"messagingpresets": "",
 				"notemplatesavailable": "",
 				"notespresets": "",
+				"notifications": {
+					"followers": ""
+				},
 				"orderstatuses": "",
 				"partslocations": "",
 				"partsscan": "",
@@ -734,10 +737,7 @@
 				"ssbuckets": "",
 				"systemsettings": "",
 				"task-presets": "",
-        "workingdays": "",
+				"workingdays": ""
-        "notifications": {
-          "followers": ""
-        }
 			},
 			"operations": {
 				"contains": "",
@@ -783,6 +783,15 @@
 				"completed": ""
 			}
 		},
+		"consent": {
+			"associated_owners": "Associated Owners",
+			"created_at": "Opt-Out Date",
+			"no_owners": "No Associated Owners",
+			"phone_1": "Phone 1",
+			"phone_2": "Phone 2",
+			"phone_number": "Phone Number",
+			"text_body": ""
+		},
 		"contracts": {
 			"actions": {
 				"changerate": "",
@@ -1235,11 +1244,11 @@
 				"fcm": "",
 				"notfound": "",
 				"sizelimit": "",
-        "submit-for-testing": "",
 				"sub_status": {
 					"expired": "",
 					"trial-expired": ""
-        }
+				},
+				"submit-for-testing": ""
 			},
 			"itemtypes": {
 				"contract": "",
@@ -1651,8 +1660,6 @@
 				"voiding": ""
 			},
 			"fields": {
-        "estimate_sent_approval": "",
-        "estimate_approved": "",
 				"active_tasks": "",
 				"actual_completion": "Achèvement réel",
 				"actual_delivery": "Livraison réelle",
@@ -1783,6 +1790,8 @@
 				"est_ct_ln": "Nom de l'évaluateur",
 				"est_ea": "Courriel de l'évaluateur",
 				"est_ph1": "Numéro de téléphone de l'évaluateur",
+				"estimate_approved": "",
+				"estimate_sent_approval": "",
 				"federal_tax_payable": "Impôt fédéral à payer",
 				"federal_tax_rate": "",
 				"flat_rate_ats": "",
@@ -1966,8 +1975,6 @@
 				"scheddates": ""
 			},
 			"labels": {
-        "sent": "",
-        "approved": "",
 				"accountsreceivable": "",
 				"act_price_ppc": "",
 				"actual_completion_inferred": "",
@@ -1982,6 +1989,7 @@
 				"alreadyaddedtoscoreboard": "",
 				"alreadyclosed": "",
 				"appointmentconfirmation": "Envoyer une confirmation au client?",
+				"approved": "",
 				"associationwarning": "",
 				"audit": "",
 				"available": "",
@@ -2172,6 +2180,7 @@
 				"sales": "",
 				"savebeforeconversion": "",
 				"scheduledinchange": "",
+				"sent": "",
 				"specialcoveragepolicy": "",
 				"state_tax_amt": "",
 				"subletsnotcompleted": "",
@@ -2388,15 +2397,16 @@
 			},
 			"errors": {
 				"invalidphone": "",
+				"no_consent": "",
 				"noattachedjobs": "",
-        "updatinglabel": "",
+				"updatinglabel": ""
-        "no_consent": ""
 			},
 			"labels": {
 				"addlabel": "",
 				"archive": "",
 				"maxtenimages": "",
 				"messaging": "Messagerie",
+				"no_consent": "",
 				"noallowtxt": "",
 				"nojobs": "",
 				"nopush": "",
@@ -2406,8 +2416,7 @@
 				"selectmedia": "",
 				"sentby": "",
 				"typeamessage": "Envoyer un message...",
-        "unarchive": "",
+				"unarchive": ""
-        "no_consent": ""
 			},
 			"render": {
 				"conversation_list": ""
@@ -2427,6 +2436,7 @@
 			"fields": {
 				"createdby": "Créé par",
 				"critical": "Critique",
+				"pinned": "",
 				"private": "privé",
 				"text": "Contenu",
 				"type": "",
@@ -2445,6 +2455,7 @@
 				"addtorelatedro": "",
 				"newnoteplaceholder": "Ajouter une note...",
 				"notetoadd": "",
+				"pinned_note": "",
 				"systemnotes": "",
 				"usernotes": ""
 			},
@@ -2467,13 +2478,15 @@
 				"fcm": ""
 			},
 			"labels": {
-        "auto-add-on": "",
-        "auto-add-off": "",
-        "auto-add-success": "",
-        "auto-add-failure": "",
-        "auto-add-description": "",
 				"add-watchers": "",
 				"add-watchers-team": "",
+				"auto-add": "",
+				"auto-add-description": "",
+				"auto-add-failure": "",
+				"auto-add-off": "",
+				"auto-add-on": "",
+				"auto-add-success": "",
+				"employee-notification": "",
 				"employee-search": "",
 				"mark-all-read": "",
 				"new-notification-title": "",
@@ -2490,8 +2503,7 @@
 				"teams-search": "",
 				"unwatch": "",
 				"watch": "",
-        "watching-issue": "",
+				"watching-issue": ""
-        "employee-notification": ""
 			},
 			"scenarios": {
 				"alternate-transport-changed": "",
@@ -3301,17 +3313,10 @@
 				"updated": ""
 			}
 		},
-    "tasks": {
+		"settings": {
-      "labels": {
+			"title": ""
-        "my_tasks_center": "",
-        "go_to_job": "",
-        "overdue": "",
-        "due_today": "",
-        "upcoming": "",
-        "no_due_date": "",
-        "ro-number": "",
-        "no_tasks": ""
 		},
+		"tasks": {
 			"actions": {
 				"edit": "",
 				"new": "",
@@ -3326,9 +3331,6 @@
 				"myTasks": "",
 				"refresh": ""
 			},
-      "errors": {
-        "load_failure": ""
-      },
 			"date_presets": {
 				"completion": "",
 				"day": "",
@@ -3342,6 +3344,9 @@
 				"tomorrow": "",
 				"two_weeks": ""
 			},
+			"errors": {
+				"load_failure": ""
+			},
 			"failures": {
 				"completed": "",
 				"created": "",
@@ -3376,6 +3381,16 @@
 				"remind_at": "",
 				"title": ""
 			},
+			"labels": {
+				"due_today": "",
+				"go_to_job": "",
+				"my_tasks_center": "",
+				"no_due_date": "",
+				"no_tasks": "",
+				"overdue": "",
+				"ro-number": "",
+				"upcoming": ""
+			},
 			"placeholders": {
 				"assigned_to": "",
 				"billid": "",
@@ -3875,6 +3890,7 @@
 				"state": "Etat / Province",
 				"street1": "rue",
 				"street2": "Adresse 2 ",
+				"tags": "",
 				"taxid": "Identifiant de taxe",
 				"terms": "Modalités de paiement",
 				"zip": "Zip / code postal"
@@ -3891,18 +3907,6 @@
 			"validation": {
 				"unique_vendor_name": ""
 			}
-    },
-    "consent": {
-      "phone_number": "Phone Number",
-      "associated_owners": "Associated Owners",
-      "created_at": "Opt-Out Date",
-      "no_owners": "No Associated Owners",
-      "phone_1": "Phone 1",
-      "phone_2": "Phone 2",
-      "text_body": ""
-    },
-    "settings": {
-      "title": ""
 		}
 	}
 }

client/src/utils/RenderTemplate.js

@@ -302,7 +302,6 @@ export const fetchFilterData = async ({ name }) => {
     const jsReportFilters = await cleanAxios.get(`${server}/odata/assets?$filter=name eq '${name}.filters'`, {
       headers: { Authorization: jsrAuth }
     });
-    console.log("🚀 ~ fetchFilterData ~ jsReportFilters:", jsReportFilters);
 
     let parsedFilterData;
     let useShopSpecificTemplate = false;

hasura/metadata/tables.yaml

@@ -4909,6 +4909,7 @@
           - critical
           - id
           - jobid
+          - pinned
           - private
           - text
           - type
@@ -4923,6 +4924,7 @@
           - critical
           - id
           - jobid
+          - pinned
           - private
           - text
           - type
@@ -4947,6 +4949,7 @@
           - critical
           - id
           - jobid
+          - pinned
           - private
           - text
           - type
@@ -7120,6 +7123,7 @@
           - state
           - street1
           - street2
+          - tags
           - updated_at
           - zip
   select_permissions:
@@ -7143,6 +7147,7 @@
           - state
           - street1
           - street2
+          - tags
           - updated_at
           - zip
         filter:
@@ -7176,6 +7181,7 @@
           - state
           - street1
           - street2
+          - tags
           - updated_at
           - zip
         filter:

hasura/migrations/1753201013074_alter_table_public_vendors_add_column_tags/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."vendors" add column "tags" jsonb
+--  not null default jsonb_build_array();

hasura/migrations/1753201013074_alter_table_public_vendors_add_column_tags/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."vendors" add column "tags" jsonb
+ not null default jsonb_build_array();