Merged in release/2023-06-09 (pull request #856)

Release/2023 06 09

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

@@ -1,31 +1,14 @@
-import { Space, Button, Col } from "antd";
+import { Space } from "antd";
 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";
-import { connect } from "react-redux";
-import { setSelectedConversation } from "../../redux/messaging/messaging.actions";
-import { LeftOutlined } from "@ant-design/icons";
 
-const mapDispatchToProps = (dispatch) => ({
-  setSelectedConversation: (conversationId) =>
-    dispatch(setSelectedConversation(conversationId)),
-});
-
-function ChatConversationTitle({ conversation, setSelectedConversation }) {
+export default function ChatConversationTitle({ conversation }) {
   return (
     <Space wrap>
-      <Col sm={0}>
-        <Button
-          onClick={() => setSelectedConversation()}
-          size="small"
-          type="text"
-        >
-          <LeftOutlined />
-        </Button>
-      </Col>
       <PhoneNumberFormatter>
         {conversation && conversation.phone_num}
       </PhoneNumberFormatter>
@@ -40,5 +23,3 @@ function ChatConversationTitle({ conversation, setSelectedConversation }) {
     </Space>
   );
 }
-
-export default connect(null, mapDispatchToProps)(ChatConversationTitle);

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

@@ -112,7 +112,7 @@ export function ChatPopupComponent({
             />
 
             <Row gutter={[8, 8]} className="chat-popup-content">
-              <Col span={8} sm={8} xs={selectedConversation && 0}>
+              <Col span={8}>
                 {loading ? (
                   <LoadingSpinner />
                 ) : (

client/src/components/jobs-convert-button/jobs-convert-button.component.jsx

@@ -108,12 +108,7 @@ export function JobsConvertButton({
             },
           ]}
         >
-          <Select
-            showSearch
-            filterOption={(input, option) => {
-              return option.value.toLowerCase().includes(input.toLowerCase());
-            }}
-          >
+          <Select>
             {bodyshop.md_ins_cos.map((s, i) => (
               <Select.Option key={i} value={s.name}>
                 {s.name}

client/src/components/update-alert/update-alert.component.jsx

@@ -1,4 +1,4 @@
-import { Alert, Button, Space } from "antd";
+import { Alert, Button, Col, Row, Space } from "antd";
 import i18n from "i18next";
 import React from "react";
 import { connect } from "react-redux";
@@ -28,37 +28,43 @@ export function UpdateAlert({ updateAvailable }) {
       message={t("general.messages.newversiontitle")}
       showIcon
       icon={<AlertOutlined />}
-      description={t("general.messages.newversionmessage")}
+      description={
+        <Row gutter={[16, 16]}>
+          <Col sm={24} md={16} lg={18}>
+            {t("general.messages.newversionmessage")}
+          </Col>
+          <Col sm={24} md={8} lg={6}>
+            <Space wrap>
+              <Button
+                onClick={async () => {
+                  window.open("https://imex-online.noticeable.news/", "_blank");
+                }}
+              >
+                {i18n.t("general.actions.viewreleasenotes")}
+              </Button>
+              <Button
+                type="primary"
+                onClick={async () => {
+                  if (globalRegistration && globalRegistration.waiting) {
+                    await globalRegistration.unregister();
+                    // Makes Workbox call skipWaiting()
+                    globalRegistration.waiting.postMessage({
+                      type: "SKIP_WAITING",
+                    });
+                    // Once the service worker is unregistered, we can reload the page to let
+                    // the browser download a fresh copy of our app (invalidating the cache)
+                    window.location.reload();
+                  }
+                }}
+              >
+                {i18n.t("general.actions.refresh")}
+              </Button>
+            </Space>
+          </Col>
+        </Row>
+      }
       closable={false}
       type="warning"
-      action={
-        <Space flex>
-          <Button
-            onClick={async () => {
-              window.open("https://imex-online.noticeable.news/", "_blank");
-            }}
-          >
-            {i18n.t("general.actions.viewreleasenotes")}
-          </Button>
-          <Button
-            type="primary"
-            onClick={async () => {
-              if (globalRegistration && globalRegistration.waiting) {
-                await globalRegistration.unregister();
-                // Makes Workbox call skipWaiting()
-                globalRegistration.waiting.postMessage({
-                  type: "SKIP_WAITING",
-                });
-                // Once the service worker is unregistered, we can reload the page to let
-                // the browser download a fresh copy of our app (invalidating the cache)
-                window.location.reload();
-              }
-            }}
-          >
-            {i18n.t("general.actions.refresh")}
-          </Button>
-        </Space>
-      }
     />
   );
 }