Added IMS token changes.

bodyshop_translations.babel

@@ -1,4 +1,4 @@
-<babeledit_project version="1.2" be_version="2.7.1">
+<babeledit_project be_version="2.7.1" version="1.2">
     <!--
 
     BabelEdit project file
@@ -4577,6 +4577,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>localmediatoken</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>logo_img_footer_margin</name>
                                         <definition_loaded>false</definition_loaded>

client/src/components/documents-local-upload/documents-local-upload.utility.js

@@ -7,8 +7,12 @@ export const handleUpload = async ({ ev, context }) => {
   const { onError, onSuccess, onProgress, file } = ev;
   const { jobid, invoice_number, vendorid, callbackAfterUpload } = context;
 
+  const bodyshop = store.getState().user.bodyshop;
   var options = {
-    headers: { "X-Requested-With": "XMLHttpRequest" },
+    headers: {
+      "X-Requested-With": "XMLHttpRequest",
+      ims_token: bodyshop.localmediatoken,
+    },
     onUploadProgress: (e) => {
       if (!!onProgress) onProgress({ percent: (e.loaded / e.total) * 100 });
     },
@@ -22,7 +26,6 @@ export const handleUpload = async ({ ev, context }) => {
     formData.append("vendorid", vendorid);
   }
   formData.append("file", file);
-  const bodyshop = store.getState().user.bodyshop;
 
   const imexMediaServerResponse = await cleanAxios.post(
     normalizeUrl(

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.reassign.component.jsx

@@ -39,11 +39,15 @@ export function JobsDocumentsLocalGalleryReassign({
     setLoading(true);
     const selectedDocuments = allMedia[jobid].filter((m) => m.isSelected);
 
-    await cleanAxios.post(`${bodyshop.localmediaserverhttp}/jobs/move`, {
+    await cleanAxios.post(
-      from_jobid: jobid,
+      `${bodyshop.localmediaserverhttp}/jobs/move`,
-      jobid: newJobid,
+      {
-      files: selectedDocuments.map((f) => f.filename),
+        from_jobid: jobid,
-    });
+        jobid: newJobid,
+        files: selectedDocuments.map((f) => f.filename),
+      },
+      { headers: { ims_token: bodyshop.localmediatoken } }
+    );
 
     getJobMedia(jobid);
     setVisible(false);

client/src/components/shop-info/shop-info.general.component.jsx

@@ -603,6 +603,12 @@ export default function ShopInfoGeneral({ form }) {
         >
           <Input />
         </Form.Item>
+        <Form.Item
+          name={["localmediatoken"]}
+          label={t("bodyshop.fields.localmediatoken")}
+        >
+          <Input />
+        </Form.Item>
       </LayoutFormRow>
       <LayoutFormRow grow header={t("bodyshop.labels.messagingpresets")}>
         <Form.List name={["md_messaging_presets"]}>

client/src/graphql/bodyshop.queries.js

@@ -110,6 +110,7 @@ export const QUERY_BODYSHOP = gql`
       uselocalmediaserver
       localmediaserverhttp
       localmediaservernetwork
+      localmediatoken
       employees {
         user_email
         id
@@ -218,6 +219,7 @@ export const UPDATE_SHOP = gql`
         uselocalmediaserver
         localmediaserverhttp
         localmediaservernetwork
+        localmediatoken
         employees {
           id
           first_name

client/src/redux/media/media.sagas.js

@@ -9,22 +9,23 @@ export function* onSetJobMedia() {
 }
 export function* getJobMedia({ payload: jobid }) {
   try {
-    const localmediaserverhttp = (yield select(
+    const bodyshop = yield select((state) => state.user.bodyshop);
-      (state) => state.user.bodyshop.localmediaserverhttp
+    const localmediaserverhttp = bodyshop.localmediaserverhttp.trim();
-    )).trim();
 
     if (localmediaserverhttp && localmediaserverhttp !== "") {
       const imagesFetch = yield cleanAxios.post(
         `${localmediaserverhttp}/jobs/list`,
         {
           jobid,
-        }
+        },
+        { headers: { ims_token: bodyshop.localmediatoken } }
       );
       const documentsFetch = yield cleanAxios.post(
         `${localmediaserverhttp}/bills/list`,
         {
           jobid,
-        }
+        },
+        { headers: { ims_token: bodyshop.localmediatoken } }
       );
 
       yield put(
@@ -66,9 +67,8 @@ export function* onSetBillMedia() {
 }
 export function* getBillMedia({ payload: { jobid, invoice_number } }) {
   try {
-    const localmediaserverhttp = (yield select(
+    const bodyshop = yield select((state) => state.user.bodyshop);
-      (state) => state.user.bodyshop.localmediaserverhttp
+    const localmediaserverhttp = bodyshop.localmediaserverhttp.trim();
-    )).trim();
 
     if (localmediaserverhttp && localmediaserverhttp !== "") {
       const documentsFetch = yield cleanAxios.post(
@@ -76,7 +76,8 @@ export function* getBillMedia({ payload: { jobid, invoice_number } }) {
         {
           jobid,
           invoice_number,
-        }
+        },
+        { headers: { ims_token: bodyshop.localmediatoken } }
       );
 
       yield put(

client/src/translations/en_us/common.json

@@ -284,6 +284,7 @@
 				"lastnumberworkingdays": "Scoreboard - Last Number of Working Days",
 				"localmediaserverhttp": "Local Media Server - HTTP Path",
 				"localmediaservernetwork": "Local Media Server - Network Path",
+				"localmediatoken": "Local Media Server - Token",
 				"logo_img_footer_margin": "Footer Margin (px)",
 				"logo_img_header_margin": "Header Margin (px)",
 				"logo_img_path": "Shop Logo",

client/src/translations/es/common.json

@@ -284,6 +284,7 @@
 				"lastnumberworkingdays": "",
 				"localmediaserverhttp": "",
 				"localmediaservernetwork": "",
+				"localmediatoken": "",
 				"logo_img_footer_margin": "",
 				"logo_img_header_margin": "",
 				"logo_img_path": "",

client/src/translations/fr/common.json

@@ -284,6 +284,7 @@
 				"lastnumberworkingdays": "",
 				"localmediaserverhttp": "",
 				"localmediaservernetwork": "",
+				"localmediatoken": "",
 				"logo_img_footer_margin": "",
 				"logo_img_header_margin": "",
 				"logo_img_path": "",

hasura/metadata/tables.yaml

@@ -837,6 +837,7 @@
           - last_name_first
           - localmediaserverhttp
           - localmediaservernetwork
+          - localmediatoken
           - logo_img_path
           - md_categories
           - md_ccc_rates
@@ -927,6 +928,7 @@
           - last_name_first
           - localmediaserverhttp
           - localmediaservernetwork
+          - localmediatoken
           - logo_img_path
           - md_categories
           - md_ccc_rates

hasura/migrations/1652310700998_alter_table_public_bodyshops_add_column_localmediatoken/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"."bodyshops" add column "localmediatoken" text
+--  null;

hasura/migrations/1652310700998_alter_table_public_bodyshops_add_column_localmediatoken/up.sql

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