ordering-ui-admin-external 1.8.2 → 1.8.3

package/src/components/MyProducts/StoreApp/index.js

@@ -1,8 +1,7 @@
-import React, { useEffect } from 'react'
+import React from 'react'
 import { useLanguage } from 'ordering-components-admin-external'
 import { useTheme } from 'styled-components'
 import { AppLayout } from '../AppLayout'
-import { removeIntercom } from '../../../utils'
 
 export const StoreApp = () => {
   const [, t] = useLanguage()
@@ -27,12 +26,6 @@ export const StoreApp = () => {
     ]
   }
 
-  useEffect(() => {
-    return () => {
-      removeIntercom()
-    }
-  }, [])
-
   return (
     <AppLayout appInfo={appInfo} />
   )

package/src/components/Stores/ImporterForm/index.js

@@ -53,7 +53,8 @@ export const ImporterFormUI = (props) => {
     isMapping,
     headerTitle,
     handleUpdateMultipleMapping,
-    defaultImporter
+    defaultImporter,
+    mappingState
   } = props
 
   const [, t] = useLanguage()
@@ -246,10 +247,10 @@ export const ImporterFormUI = (props) => {
                       }
                     }}
                     placeholder='0'
-                    defaultValue={editState?.mapping?.business_id ?? ''}
                     onChange={handleChangeMappingInput}
                     disabled={formState.loading}
                     autoComplete='off'
+                    value={mappingState?.['business_id'] || ''}
                   />
                 </InputWrapper>
               </Col>
@@ -266,10 +267,10 @@ export const ImporterFormUI = (props) => {
                       }
                     }}
                     placeholder='0'
-                    defaultValue={editState?.mapping?.external_business_id ?? ''}
                     onChange={handleChangeMappingInput}
                     disabled={formState.loading}
                     autoComplete='off'
+                    value={mappingState?.['external_business_id'] || ''}
                   />
                 </InputWrapper>
               </Col>
@@ -287,10 +288,10 @@ export const ImporterFormUI = (props) => {
                         }
                       }}
                       placeholder='0'
-                      defaultValue={editState?.mapping?.category_id ?? ''}
                       onChange={handleChangeMappingInput}
                       disabled={formState.loading}
                       autoComplete='off'
+                      value={mappingState?.['category_id'] || ''}
                     />
                   </InputWrapper>
                 </Col>
@@ -307,10 +308,10 @@ export const ImporterFormUI = (props) => {
                         }
                       }}
                       placeholder='0'
-                      defaultValue={editState?.mapping?.external_category_id ?? ''}
                       onChange={handleChangeMappingInput}
                       disabled={formState.loading}
                       autoComplete='off'
+                      value={mappingState?.['external_category_id'] || ''}
                     />
                   </InputWrapper>
                 </Col>
@@ -328,10 +329,10 @@ export const ImporterFormUI = (props) => {
                         }
                       }}
                       placeholder='0'
-                      defaultValue={editState?.mapping?.external_parent_category_id ?? ''}
                       onChange={handleChangeMappingInput}
                       disabled={formState.loading}
                       autoComplete='off'
+                      value={mappingState?.['external_parent_category_id'] || ''}
                     />
                   </InputWrapper>
                 </Col>
@@ -352,10 +353,10 @@ export const ImporterFormUI = (props) => {
                         }
                       }}
                       placeholder='0'
-                      defaultValue={editState?.mapping?.product_id ?? ''}
                       onChange={handleChangeMappingInput}
                       disabled={formState.loading}
                       autoComplete='off'
+                      value={mappingState?.['product_id'] || ''}
                     />
                   </InputWrapper>
                 </Col>
@@ -372,10 +373,10 @@ export const ImporterFormUI = (props) => {
                         }
                       }}
                       placeholder='0'
-                      defaultValue={editState?.mapping?.external_product_id ?? ''}
                       onChange={handleChangeMappingInput}
                       disabled={formState.loading}
                       autoComplete='off'
+                      value={mappingState?.['external_product_id'] || ''}
                     />
                   </InputWrapper>
                 </Col>
@@ -394,10 +395,10 @@ export const ImporterFormUI = (props) => {
                         }
                       }}
                       placeholder='0'
-                      defaultValue={editState?.mapping?.extra_id ?? ''}
                       onChange={handleChangeMappingInput}
                       disabled={formState.loading}
                       autoComplete='off'
+                      value={mappingState?.['extra_id'] || ''}
                     />
                   </InputWrapper>
                 </Col>
@@ -414,10 +415,10 @@ export const ImporterFormUI = (props) => {
                         }
                       }}
                       placeholder='0'
-                      defaultValue={editState?.mapping?.external_extra_id ?? ''}
                       onChange={handleChangeMappingInput}
                       disabled={formState.loading}
                       autoComplete='off'
+                      value={mappingState?.['external_extra_id'] || ''}
                     />
                   </InputWrapper>
                 </Col>
@@ -436,10 +437,10 @@ export const ImporterFormUI = (props) => {
                         }
                       }}
                       placeholder='0'
-                      defaultValue={editState?.mapping?.extra_option_id ?? ''}
                       onChange={handleChangeMappingInput}
                       disabled={formState.loading}
                       autoComplete='off'
+                      value={mappingState?.['extra_option_id'] || ''}
                     />
                   </InputWrapper>
                 </Col>
@@ -456,10 +457,10 @@ export const ImporterFormUI = (props) => {
                         }
                       }}
                       placeholder='0'
-                      defaultValue={editState?.mapping?.external_extra_option_id ?? ''}
                       onChange={handleChangeMappingInput}
                       disabled={formState.loading}
                       autoComplete='off'
+                      value={mappingState?.['external_extra_option_id'] || ''}
                     />
                   </InputWrapper>
                 </Col>
@@ -478,10 +479,10 @@ export const ImporterFormUI = (props) => {
                         }
                       }}
                       placeholder='0'
-                      defaultValue={editState?.mapping?.extra_option_suboption_id ?? ''}
                       onChange={handleChangeMappingInput}
                       disabled={formState.loading}
                       autoComplete='off'
+                      value={mappingState?.['extra_option_suboption_id'] || ''}
                     />
                   </InputWrapper>
                 </Col>
@@ -498,10 +499,10 @@ export const ImporterFormUI = (props) => {
                         }
                       }}
                       placeholder='0'
-                      defaultValue={editState?.mapping?.external_extra_option_suboption_id ?? ''}
                       onChange={handleChangeMappingInput}
                       disabled={formState.loading}
                       autoComplete='off'
+                      value={mappingState?.['external_extra_option_suboption_id'] || ''}
                     />
                   </InputWrapper>
                 </Col>

package/src/utils/index.js

@@ -292,36 +292,6 @@ export const checkSiteUrl = (url, fallback) => {
   return url[url?.length - 1] === '/' ? url : `${url}/`
 }
 
-/**
- * Function to insert intercom script dynamically
- */
-export const insertIntercom = () => {
-  if (document.getElementById('intercom-sdk')) return
-
-  const script = document.createElement('script')
-  script.async = true
-  script.id = 'intercom-sdk'
-  script.defer = true
-  script.innerHTML = 'window.intercomSettings = { api_base: \'https://api-iam.intercom.io\', app_id: \'o912y2nt\' };(function () { var w = window; var ic = w.Intercom; if (typeof ic === \'function\') { ic(\'reattach_activator\'); ic(\'update\', w.intercomSettings) } else { var d = document; var i = function () { i.c(arguments) }; i.q = []; i.c = function (args) { i.q.push(args) }; w.Intercom = i; var l = function () { var s = d.createElement(\'script\'); s.type = \'text/javascript\'; s.async = true; s.src = \'https://widget.intercom.io/widget/o912y2nt\'; var x = d.getElementsByTagName(\'script\')[0]; x.parentNode.insertBefore(s, x) }; if (document.readyState === \'complete\') { l() } else if (w.attachEvent) { w.attachEvent(\'onload\', l) } else { w.addEventListener(\'load\', l, false) } } })();'
-  document.body.appendChild(script)
-}
-
-/**
- * Function to remove intercom script dynamically
- */
-export const removeIntercom = () => {
-  const intercomSDK = document.getElementById('intercom-sdk')
-  const intercomContainer = document.getElementById('intercom-container')
-  const intercomFrame = document.getElementById('intercom-frame')
-  const intercomLightWeight = document.querySelector('.intercom-lightweight-app')
-  intercomSDK && document.body.removeChild(intercomSDK)
-  intercomContainer && document.body.removeChild(intercomContainer)
-  intercomFrame && document.body.removeChild(intercomFrame)
-  intercomLightWeight && document.body.removeChild(intercomLightWeight)
-  window.Intercom = null
-  window.intercomSettings = null
-}
-
 /**
  * function to manage review comment list
  * @param {number} param0 type of reviews to return