Merge pull request #9 from Chia-Network/feat/autoserialnumber

Feat/autoserialnumber
Chia-Network · Sep 6, 2023 · 549fdd1 · 549fdd1
2 parents 813ddac + 7eb9e35
commit 549fdd1
Show file tree

Hide file tree

Showing 13 changed files with 91 additions and 218 deletions.
diff --git a/src/components/blocks/APIDataTable.js b/src/components/blocks/APIDataTable.js
@@ -170,7 +170,7 @@ const APIDataTable = withTheme(
         let fullRecord = null;
 
         if (actions === 'Projects') {
-          fullRecord = projects.filter(
+          fullRecord = projects?.filter(
             project =>
               project.warehouseProjectId === partialRecord.warehouseProjectId,
           )[0];

diff --git a/src/components/blocks/UnitsDetails.js b/src/components/blocks/UnitsDetails.js
@@ -102,8 +102,7 @@ const UnitsDetails = ({ data, stagingData, changeColor }) => {
             <Body size="Bold" width="100%">
               <FormattedMessage id="unit-block-start" />
             </Body>
-            {data &&
-              detailsViewData('data', data, 'unitBlockStart', changeColor)}
+            {data && detailsViewData('data', data, 'unitBlockStart', false)}
             {stagingData &&
               detailsViewData(
                 'stagingData',

diff --git a/src/components/forms/ProjectEditModal.js b/src/components/forms/ProjectEditModal.js
@@ -42,7 +42,7 @@ const ProjectEditModal = ({
 }) => {
   const projectToBeEdited = useSelector(
     state =>
-      state.climateWarehouse.projects.filter(
+      state?.climateWarehouse?.projects?.filter(
         project => project.warehouseProjectId === record.warehouseProjectId,
       )[0],
   );

diff --git a/src/components/forms/ProjectTransferModal.js b/src/components/forms/ProjectTransferModal.js
@@ -42,7 +42,7 @@ const ProjectTransferModal = ({
 }) => {
   const projectToBeTransferred = useSelector(
     state =>
-      state.climateWarehouse.projects.filter(
+      state?.climateWarehouse?.projects?.filter(
         project => project.warehouseProjectId === record.warehouseProjectId,
       )[0],
   );

diff --git a/src/components/forms/UnitCreateModal.js b/src/components/forms/UnitCreateModal.js
@@ -38,8 +38,6 @@ const emptyUnit = {
   countryJurisdictionOfOwner: '',
   inCountryJurisdictionOfOwner: '',
   unitCount: 0,
-  unitBlockEnd: '',
-  unitBlockStart: '',
   marketplace: '',
   marketplaceLink: '',
   marketplaceIdentifier: '',

diff --git a/src/components/forms/UnitDetailsForm.js b/src/components/forms/UnitDetailsForm.js
@@ -36,7 +36,7 @@ import {
   SimpleSelectStateEnum,
 } from '..';
 
-const UnitDetailsForm = () => {
+const UnitDetailsForm = ({ noUnitCount = false }) => {
   const intl = useIntl();
   const { pickLists, myProjects, issuances } = useSelector(
     store => store.climateWarehouse,
@@ -155,7 +155,8 @@ const UnitDetailsForm = () => {
                   <ToolTipContainer
                     tooltip={intl.formatMessage({
                       id: 'select-existing-project',
-                    })}>
+                    })}
+                  >
                     <DescriptionIcon height="14" width="14" />
                   </ToolTipContainer>
                 </Body>
@@ -211,7 +212,8 @@ const UnitDetailsForm = () => {
                 <ToolTipContainer
                   tooltip={intl.formatMessage({
                     id: 'units-project-location-id-description',
-                  })}>
+                  })}
+                >
                   <DescriptionIcon height="14" width="14" />
                 </ToolTipContainer>
               </Body>
@@ -249,7 +251,8 @@ const UnitDetailsForm = () => {
                 <ToolTipContainer
                   tooltip={intl.formatMessage({
                     id: 'units-unit-owner-description',
-                  })}>
+                  })}
+                >
                   <DescriptionIcon height="14" width="14" />
                 </ToolTipContainer>
               </Body>
@@ -274,108 +277,44 @@ const UnitDetailsForm = () => {
             </InputContainer>
             <FormikError name="unitOwner" />
           </StyledFieldContainer>
-          <StyledFieldContainer>
-            <StyledLabelContainer>
-              <Body>
-                <LabelContainer>
-                  *<FormattedMessage id="unit-block-start" />
-                </LabelContainer>
-                <ToolTipContainer
-                  tooltip={intl.formatMessage({
-                    id: 'units-unit-block-start-description',
-                  })}>
-                  <DescriptionIcon height="14" width="14" />
-                </ToolTipContainer>
-              </Body>
-            </StyledLabelContainer>
-            <InputContainer>
-              <StandardInput
-                variant={
-                  errors.unitBlockStart && touched.unitBlockStart
-                    ? InputVariantEnum.error
-                    : undefined
-                }
-                size={InputSizeEnum.large}
-                placeholderText={intl.formatMessage({
-                  id: 'unit-block-start',
-                })}
-                state={InputStateEnum.default}
-                value={values.unitBlockStart}
-                onChange={value => setFieldValue('unitBlockStart', value)}
-                onBlur={handleBlur}
-                name="unitBlockStart"
-              />
-            </InputContainer>
-            <FormikError name="unitBlockStart" />
-          </StyledFieldContainer>
-          <StyledFieldContainer>
-            <StyledLabelContainer>
-              <Body>
-                <LabelContainer>
-                  *<FormattedMessage id="unit-block-end" />
-                </LabelContainer>
-                <ToolTipContainer
-                  tooltip={intl.formatMessage({
-                    id: 'units-unit-block-end-description',
-                  })}>
-                  <DescriptionIcon height="14" width="14" />
-                </ToolTipContainer>
-              </Body>
-            </StyledLabelContainer>
-            <InputContainer>
-              <StandardInput
-                variant={
-                  errors.unitBlockEnd && touched.unitBlockEnd
-                    ? InputVariantEnum.error
-                    : undefined
-                }
-                size={InputSizeEnum.large}
-                placeholderText={intl.formatMessage({
-                  id: 'unit-block-end',
-                })}
-                state={InputStateEnum.default}
-                value={values.unitBlockEnd}
-                onChange={value => setFieldValue('unitBlockEnd', value)}
-                onBlur={handleBlur}
-                name="unitBlockEnd"
-              />
-            </InputContainer>
-            <FormikError name="unitBlockEnd" />
-          </StyledFieldContainer>
-          <StyledFieldContainer>
-            <StyledLabelContainer>
-              <Body>
-                <LabelContainer>
-                  *<FormattedMessage id="unit-count" />
-                </LabelContainer>
-                <ToolTipContainer
-                  tooltip={intl.formatMessage({
-                    id: 'units-unit-count-description',
-                  })}>
-                  <DescriptionIcon height="14" width="14" />
-                </ToolTipContainer>
-              </Body>
-            </StyledLabelContainer>
-            <InputContainer>
-              <StandardInput
-                variant={
-                  errors.unitCount && touched.unitCount
-                    ? InputVariantEnum.error
-                    : undefined
-                }
-                size={InputSizeEnum.large}
-                placeholderText={intl.formatMessage({
-                  id: 'unit-count',
-                })}
-                state={InputStateEnum.default}
-                value={values.unitCount}
-                onChange={value => setFieldValue('unitCount', value)}
-                onBlur={handleBlur}
-                name="unitCount"
-              />
-            </InputContainer>
-            <FormikError name="unitCount" />
-          </StyledFieldContainer>
+          {!noUnitCount && (
+            <StyledFieldContainer>
+              <StyledLabelContainer>
+                <Body>
+                  <LabelContainer>
+                    *<FormattedMessage id="unit-count" />
+                  </LabelContainer>
+                  <ToolTipContainer
+                    tooltip={intl.formatMessage({
+                      id: 'units-unit-count-description',
+                    })}
+                  >
+                    <DescriptionIcon height="14" width="14" />
+                  </ToolTipContainer>
+                </Body>
+              </StyledLabelContainer>
+              <InputContainer>
+                <StandardInput
+                  variant={
+                    errors.unitCount && touched.unitCount
+                      ? InputVariantEnum.error
+                      : undefined
+                  }
+                  size={InputSizeEnum.large}
+                  placeholderText={intl.formatMessage({
+                    id: 'unit-count',
+                  })}
+                  state={InputStateEnum.default}
+                  value={values.unitCount}
+                  onChange={value => setFieldValue('unitCount', value)}
+                  onBlur={handleBlur}
+                  name="unitCount"
+                />
+              </InputContainer>
+              <FormikError name="unitCount" />
+            </StyledFieldContainer>
+          )}
+
           <StyledFieldContainer>
             <StyledLabelContainer>
               <Body>
@@ -385,7 +324,8 @@ const UnitDetailsForm = () => {
                 <ToolTipContainer
                   tooltip={intl.formatMessage({
                     id: 'units-in-country-jurisdiction-of-owner-description',
-                  })}>
+                  })}
+                >
                   <DescriptionIcon height="14" width="14" />
                 </ToolTipContainer>
               </Body>
@@ -422,7 +362,8 @@ const UnitDetailsForm = () => {
                 <ToolTipContainer
                   tooltip={intl.formatMessage({
                     id: 'units-country-jurisdiction-of-owner-description',
-                  })}>
+                  })}
+                >
                   <DescriptionIcon height="14" width="14" />
                 </ToolTipContainer>
               </Body>
@@ -453,7 +394,8 @@ const UnitDetailsForm = () => {
                 <ToolTipContainer
                   tooltip={intl.formatMessage({
                     id: 'units-unit-type-description',
-                  })}>
+                  })}
+                >
                   <DescriptionIcon height="14" width="14" />
                 </ToolTipContainer>
               </Body>
@@ -482,7 +424,8 @@ const UnitDetailsForm = () => {
                 <ToolTipContainer
                   tooltip={intl.formatMessage({
                     id: 'units-unit-status-description',
-                  })}>
+                  })}
+                >
                   <DescriptionIcon height="14" width="14" />
                 </ToolTipContainer>
               </Body>
@@ -512,7 +455,8 @@ const UnitDetailsForm = () => {
                   <ToolTipContainer
                     tooltip={intl.formatMessage({
                       id: 'units-unit-status-reason-description',
-                    })}>
+                    })}
+                  >
                     <DescriptionIcon height="14" width="14" />
                   </ToolTipContainer>
                 </Body>
@@ -546,7 +490,8 @@ const UnitDetailsForm = () => {
                   <ToolTipContainer
                     tooltip={intl.formatMessage({
                       id: 'units-unit-registry-link-description',
-                    })}>
+                    })}
+                  >
                     <DescriptionIcon height="14" width="14" />
                   </ToolTipContainer>
                 </Body>
@@ -579,7 +524,8 @@ const UnitDetailsForm = () => {
                 <ToolTipContainer
                   tooltip={intl.formatMessage({
                     id: 'units-vintage-year-description',
-                  })}>
+                  })}
+                >
                   <DescriptionIcon height="14" width="14" />
                 </ToolTipContainer>
               </Body>
@@ -612,7 +558,8 @@ const UnitDetailsForm = () => {
                 <ToolTipContainer
                   tooltip={intl.formatMessage({
                     id: 'units-marketplace-description',
-                  })}>
+                  })}
+                >
                   <DescriptionIcon height="14" width="14" />
                 </ToolTipContainer>
               </Body>
@@ -646,7 +593,8 @@ const UnitDetailsForm = () => {
                 <ToolTipContainer
                   tooltip={intl.formatMessage({
                     id: 'units-marketplace-identifier-description',
-                  })}>
+                  })}
+                >
                   <DescriptionIcon height="14" width="14" />
                 </ToolTipContainer>
               </Body>
@@ -683,7 +631,8 @@ const UnitDetailsForm = () => {
                   <ToolTipContainer
                     tooltip={intl.formatMessage({
                       id: 'units-marketplace-link-description',
-                    })}>
+                    })}
+                  >
                     <DescriptionIcon height="14" width="14" />
                   </ToolTipContainer>
                 </Body>
@@ -717,7 +666,8 @@ const UnitDetailsForm = () => {
                 <ToolTipContainer
                   tooltip={intl.formatMessage({
                     id: 'units-corresponding-adjustment-declaration-description',
-                  })}>
+                  })}
+                >
                   <DescriptionIcon height="14" width="14" />
                 </ToolTipContainer>
               </Body>
@@ -748,7 +698,8 @@ const UnitDetailsForm = () => {
                 <ToolTipContainer
                   tooltip={intl.formatMessage({
                     id: 'units-corresponding-adjustment-status-description',
-                  })}>
+                  })}
+                >
                   <DescriptionIcon height="14" width="14" />
                 </ToolTipContainer>
               </Body>
@@ -783,7 +734,8 @@ const UnitDetailsForm = () => {
                   <ToolTipContainer
                     tooltip={intl.formatMessage({
                       id: 'units-unit-tags-description',
-                    })}>
+                    })}
+                  >
                     <DescriptionIcon height="14" width="14" />
                   </ToolTipContainer>
                 </Body>

diff --git a/src/components/forms/UnitEditModal.js b/src/components/forms/UnitEditModal.js
@@ -134,6 +134,11 @@ const UnitEditModal = ({ onClose, record, modalSizeAndPosition }) => {
         if (dataToSend.serialNumberBlock) {
           delete dataToSend.serialNumberBlock;
         }
+
+        delete dataToSend.unitCount;
+        delete dataToSend.unitBlockEnd;
+        delete dataToSend.unitBlockStart;
+
         cleanObjectFromEmptyFieldsOrArrays(dataToSend);
         dispatch(updateUnitsRecord(dataToSend));
       }}
@@ -188,7 +193,7 @@ const UnitEditModal = ({ onClose, record, modalSizeAndPosition }) => {
                 value={tabValue}
                 index={0}
               >
-                <UnitDetailsForm />
+                <UnitDetailsForm noUnitCount={true} />
               </TabPanel>
               <TabPanel value={tabValue} index={1}>
                 <UnitIssuanceForm />