ordering-ui-admin-external 1.4.4 → 1.5.1

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

@@ -194,6 +194,17 @@ export const ProductDetatilsInformation = (props) => {
     }
   }, [product?.price, formState?.changes?.price])
 
+  useEffect(() => {
+    if (typeof formState?.changes?.name === 'undefined') return
+    const generateCode = {
+      target: {
+        name: 'slug',
+        value: stringToSlug(formState.changes.name)
+      }
+    }
+    handleChangeInput(generateCode)
+  }, [formState?.changes?.name])
+
   return (
     <>
       <FormInput onSubmit={formMethods.handleSubmit(onSubmit)}>
@@ -329,12 +340,12 @@ export const ProductDetatilsInformation = (props) => {
             onChange={handleChangeInput}
             disabled={formState.loading}
             autoComplete='off'
-            defaultValue={product?.slug}
+            value={formState?.changes?.slug ?? product?.slug ?? ''}
             onKeyPress={e => {
               if (e.which === 32) { e.preventDefault() }
             }}
           />
-          <Wrapper
+          {/* <Wrapper
             style={{ paddingTop: 10 }}
           >
             <Button
@@ -349,7 +360,7 @@ export const ProductDetatilsInformation = (props) => {
             >
               {formState?.loading ? t('LOADING', 'Loading') : t('AUTOGENERATE', 'Auto Generate')}
             </Button>
-          </Wrapper>
+          </Wrapper> */}
         </InputWrapper>
 
         <InventoryWrapper>

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

@@ -205,9 +205,18 @@ export const ProductExtraOptionForm = (props) => {
             <ActionsContainer top>
               <EnableWrapper>
                 <span>{t('ENABLE', 'Enable')}</span>
-                <Switch
-                  defaultChecked={optionState.option?.enabled}
-                  onChange={enabled => handleChangeOptionEnable(enabled, optionState.option?.id)}
+                <Controller
+                  name='enabled'
+                  control={control}
+                  render={({ onChange, value }) => (
+                    <Switch
+                      defaultChecked={optionState.option?.enabled}
+                      onChange={enabled => {
+                        onChange(enabled)
+                        handleChangeOptionEnable(enabled, optionState.option?.id)
+                      }}
+                    />
+                  )}
                 />
               </EnableWrapper>
             </ActionsContainer>

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

@@ -121,14 +121,30 @@ export const SeoOptions = (props) => {
   }
 
   useEffect(() => {
-    if (!isSameInfo || !isProductSeo) return
-    setFormState({
-      seo_title: data?.name,
-      seo_description: data?.description
-    })
+    if (!isSameInfo) return
+    if (isBusinessSeo) {
+      setFormState({
+        ...formState,
+        changes: {
+          seo_title: data?.name,
+          seo_description: data?.description
+        }
+      })
+    } else {
+      setFormState({
+        seo_title: data?.name,
+        seo_description: data?.description
+      })
+    }
     titleRef.current.value = data?.name
     descriptionRef.current.value = data?.description
-  }, [isSameInfo, isProductSeo])
+  }, [isSameInfo, isBusinessSeo, data])
+
+  useEffect(() => {
+    setIsSameInfo(false)
+    titleRef.current.value = data?.seo_title ?? ''
+    descriptionRef.current.value = data?.seo_description ?? ''
+  }, [data])
 
   useEffect(() => {
     return () => {
@@ -178,15 +194,13 @@ export const SeoOptions = (props) => {
             </ExamineClick>
           </SEOImage>
         </WrapperImage>
-        {isProductSeo && (
-          <UseSameInfoWrapper>
-            <label>{t('USE_SAME_PRODUCT_INFORMATION', 'Use the same as main product information')}</label>
-            <Switch
-              defaultChecked={isSameInfo || false}
-              onChange={val => setIsSameInfo(val)}
-            />
-          </UseSameInfoWrapper>
-        )}
+        <UseSameInfoWrapper>
+          <label>{t('USE_SAME_PRODUCT_INFORMATION', 'Use the same as main product information')}</label>
+          <Switch
+            defaultChecked={isSameInfo || false}
+            onChange={val => setIsSameInfo(val)}
+          />
+        </UseSameInfoWrapper>
         <WrapperShortDescription>
           <label>{t('SEO_TITLE', 'SEO Title')}</label>
           <Input

package/src/styles/Select/FirstSelect/index.js

@@ -34,7 +34,8 @@ export const Select = (props) => {
     searchBarIsCustomLayout,
     searchBarPlaceholder,
     searchBarIsNotLazyLoad,
-    isDisabled
+    isDisabled,
+    position
   } = props
 
   const [open, setOpen] = useState(false)
@@ -114,7 +115,7 @@ export const Select = (props) => {
         <Options
           className='list'
           isAbsolute
-          position='right'
+          position={position || 'right'}
           ref={dropdownReference}
         >
           {isShowSearchBar && (
@@ -133,7 +134,7 @@ export const Select = (props) => {
           <OptionsInner
             className='list-wrapper'
             optionInnerMargin={props.optionInnerMargin}
-            optionInnerMaxHeight={props.optionInnerMaxHeight}
+            optionInnerMaxHeight={props.optionInnerMaxHeight || 'initial'}
           >
             {options.map((option, i) => (
               <Option

package/src/utils/index.js

@@ -258,7 +258,7 @@ export const ribbonValues = {
  * @param {string} url URL of page
  * @param {string} fallback default URL
  */
- export const checkSiteUrl = (url, fallback) => {
+export const checkSiteUrl = (url, fallback) => {
   if (!url) return fallback
   return url[url?.length - 1] === '/' ? url : `${url}/`
 }