Merged in release/2022-12-16 (pull request #643)

Release/2022 12 16

bodyshop_translations.babel

@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -32670,11 +32670,53 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>updatinglabel</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                 </children>
                             </folder_node>
                             <folder_node>
                                 <name>labels</name>
                                 <children>
+                                    <concept_node>
+                                        <name>addlabel</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>archive</name>
                                         <definition_loaded>false</definition_loaded>

client/src/components/chat-conversation-list/chat-conversation-list.component.jsx

@@ -6,8 +6,8 @@ import { setSelectedConversation } from "../../redux/messaging/messaging.actions
 import { selectSelectedConversation } from "../../redux/messaging/messaging.selectors";
 import { TimeAgoFormatter } from "../../utils/DateFormatter";
 import PhoneFormatter from "../../utils/PhoneFormatter";
-import "./chat-conversation-list.styles.scss";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import "./chat-conversation-list.styles.scss";
 
 const mapStateToProps = createStructuredSelector({
   selectedConversation: selectSelectedConversation,
@@ -38,17 +38,20 @@ export function ChatConversationListComponent({
                 : null
             }`}
           >
-            {item.job_conversations.length > 0 ? (
-              <div className="chat-name">
-                {item.job_conversations.map((j, idx) => (
-                  <div key={idx}>
-                    <OwnerNameDisplay ownerObject={j.job} />
-                  </div>
-                ))}
-              </div>
-            ) : (
-              <PhoneFormatter>{item.phone_num}</PhoneFormatter>
-            )}
+            <div sryle={{ display: "inline-block" }}>
+              {item.label && <div className="chat-name">{item.label}</div>}
+              {item.job_conversations.length > 0 ? (
+                <div className="chat-name">
+                  {item.job_conversations.map((j, idx) => (
+                    <div key={idx}>
+                      <OwnerNameDisplay ownerObject={j.job} />
+                    </div>
+                  ))}
+                </div>
+              ) : (
+                <PhoneFormatter>{item.phone_num}</PhoneFormatter>
+              )}
+            </div>
             <div sryle={{ display: "inline-block" }}>
               <div>
                 {item.job_conversations.length > 0

client/src/components/chat-conversation-title/chat-conversation-title.component.jsx

@@ -3,6 +3,7 @@ import React from "react";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import ChatArchiveButton from "../chat-archive-button/chat-archive-button.component";
 import ChatConversationTitleTags from "../chat-conversation-title-tags/chat-conversation-title-tags.component";
+import ChatLabelComponent from "../chat-label/chat-label.component";
 import ChatTagRoContainer from "../chat-tag-ro/chat-tag-ro.container";
 
 export default function ChatConversationTitle({ conversation }) {
@@ -11,6 +12,7 @@ export default function ChatConversationTitle({ conversation }) {
       <PhoneNumberFormatter>
         {conversation && conversation.phone_num}
       </PhoneNumberFormatter>
+      <ChatLabelComponent conversation={conversation} />
       <ChatConversationTitleTags
         jobConversations={
           (conversation && conversation.job_conversations) || []

client/src/components/chat-label/chat-label.component.jsx

@@ -0,0 +1,67 @@
+import { PlusOutlined } from "@ant-design/icons";
+import { useMutation } from "@apollo/client";
+import { Input, notification, Spin, Tag, Tooltip } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { UPDATE_CONVERSATION_LABEL } from "../../graphql/conversations.queries";
+export default function ChatLabel({ conversation }) {
+  const [loading, setLoading] = useState(false);
+  const [editing, setEditing] = useState(false);
+  const [value, setValue] = useState(conversation.label);
+
+  const { t } = useTranslation();
+  const [updateLabel] = useMutation(UPDATE_CONVERSATION_LABEL);
+
+  const handleSave = async () => {
+    setLoading(true);
+    try {
+      const response = await updateLabel({
+        variables: { id: conversation.id, label: value },
+      });
+      if (response.errors) {
+        notification["error"]({
+          message: t("messages.errors.updatinglabel", {
+            error: JSON.stringify(response.errors),
+          }),
+        });
+      } else {
+        setEditing(false);
+      }
+    } catch (error) {
+      notification["error"]({
+        message: t("messages.errors.updatinglabel", {
+          error: JSON.stringify(error),
+        }),
+      });
+    } finally {
+      setLoading(false);
+    }
+  };
+  if (editing) {
+    return (
+      <div>
+        <Input
+          autoFocus
+          value={value}
+          onChange={(e) => setValue(e.target.value)}
+          onBlur={handleSave}
+          allowClear
+        />
+        {loading && <Spin size="small" />}
+      </div>
+    );
+  } else {
+    return conversation.label && conversation.label.trim() !== "" ? (
+      <Tag style={{ cursor: "pointer" }} onClick={() => setEditing(true)}>
+        {conversation.label}
+      </Tag>
+    ) : (
+      <Tooltip title={t("messaging.labels.addlabel")}>
+        <PlusOutlined
+          style={{ cursor: "pointer" }}
+          onClick={() => setEditing(true)}
+        />
+      </Tooltip>
+    );
+  }
+}

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

@@ -43,11 +43,9 @@ const JobSearchSelect = (
         search: value,
         ...(convertedOnly || notExported
           ? {
-              variables: {
-                ...(convertedOnly ? { isConverted: true } : {}),
-                ...(notExported ? { notExported: true } : {}),
-                ...(notInvoiced ? { notInvoiced: true } : {}),
-              },
+              ...(convertedOnly ? { isConverted: true } : {}),
+              ...(notExported ? { notExported: true } : {}),
+              ...(notInvoiced ? { notInvoiced: true } : {}),
             }
           : {}),
       },
@@ -79,6 +77,7 @@ const JobSearchSelect = (
         disabled={disabled}
         showSearch
         autoFocus
+        allowClear
         style={{
           width: "100%",
         }}

client/src/components/payable-export-all-button/payable-export-all-button.component.jsx

@@ -159,7 +159,7 @@ export function PayableExportAll({
               } else {
                 notification["error"]({
                   message: t("bills.errors.exporting", {
-                    error: JSON.stringify(billUpdateResponse.error),
+                    error: JSON.stringify(billUpdateResponse.errors),
                   }),
                 });
               }

client/src/graphql/conversations.queries.js

@@ -43,6 +43,7 @@ export const CONVERSATION_LIST_QUERY = gql`
       updated_at
       unreadcnt
       archived
+      label
       messages_aggregate(
         where: { read: { _eq: false }, isoutbound: { _eq: false } }
       ) {
@@ -88,6 +89,7 @@ export const GET_CONVERSATION_DETAILS = gql`
       id
       phone_num
       archived
+      label
       job_conversations {
         jobid
         conversationid
@@ -136,3 +138,15 @@ export const TOGGLE_CONVERSATION_ARCHIVE = gql`
     }
   }
 `;
+
+export const UPDATE_CONVERSATION_LABEL = gql`
+  mutation UPDATE_CONVERSATION_LABEL($id: uuid!, $label: String) {
+    update_conversations_by_pk(
+      pk_columns: { id: $id }
+      _set: { label: $label }
+    ) {
+      label
+      id
+    }
+  }
+`;

client/src/translations/en_us/common.json

@@ -1915,9 +1915,11 @@
 			},
 			"errors": {
 				"invalidphone": "The phone number is invalid.  Unable to open conversation. ",
-				"noattachedjobs": "No jobs have been associated to this conversation. "
+				"noattachedjobs": "No jobs have been associated to this conversation. ",
+				"updatinglabel": "Error updating label. {{error}}"
 			},
 			"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",

client/src/translations/es/common.json

@@ -1915,9 +1915,11 @@
 			},
 			"errors": {
 				"invalidphone": "",
-				"noattachedjobs": ""
+				"noattachedjobs": "",
+				"updatinglabel": ""
 			},
 			"labels": {
+				"addlabel": "",
 				"archive": "",
 				"maxtenimages": "",
 				"messaging": "Mensajería",

client/src/translations/fr/common.json

@@ -1915,9 +1915,11 @@
 			},
 			"errors": {
 				"invalidphone": "",
-				"noattachedjobs": ""
+				"noattachedjobs": "",
+				"updatinglabel": ""
 			},
 			"labels": {
+				"addlabel": "",
 				"archive": "",
 				"maxtenimages": "",
 				"messaging": "Messagerie",

hasura/metadata/tables.yaml

@@ -1241,6 +1241,7 @@
           - bodyshopid
           - created_at
           - id
+          - label
           - phone_num
           - unreadcnt
           - updated_at
@@ -1252,6 +1253,7 @@
           - bodyshopid
           - created_at
           - id
+          - label
           - phone_num
           - unreadcnt
           - updated_at
@@ -1273,6 +1275,7 @@
           - bodyshopid
           - created_at
           - id
+          - label
           - phone_num
           - unreadcnt
           - updated_at

hasura/migrations/1671125177398_alter_table_public_conversations_add_column_label/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"."conversations" add column "label" text
+--  null;

hasura/migrations/1671125177398_alter_table_public_conversations_add_column_label/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."conversations" add column "label" text
+ null;