chore: Small pr changes.

equinor · Oct 3, 2024 · 19b943e · 19b943e
1 parent 920bb6c
commit 19b943e
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 43 deletions.
diff --git a/src/features/HandleModel/HandleModelComponent/HandleModelComponent.hooks.ts b/src/features/HandleModel/HandleModelComponent/HandleModelComponent.hooks.ts
@@ -30,14 +30,14 @@ export const validateValues = (
   const errors: ErrorType = {};
 
   if (inputValues?.name === undefined || inputValues?.name === '') {
-    errors.name = ' ';
+    errors.name = 'You must name your model';
   }
 
   if (
     inputValues?.description === undefined ||
     inputValues?.description === ''
   ) {
-    errors.description = ' ';
+    errors.description = 'You must add a description';
   }
 
   if (files && !isEdit) {

diff --git a/src/features/HandleModel/HandleModelComponent/HandleModelComponent.tsx b/src/features/HandleModel/HandleModelComponent/HandleModelComponent.tsx
@@ -8,7 +8,6 @@ import {
   Typography,
 } from '@equinor/eds-core-react';
 import { error_outlined } from '@equinor/eds-icons';
-import _ from 'lodash';
 import { useEffect, useState } from 'react';
 import { generatePath, useNavigate } from 'react-router-dom';
 import {
@@ -88,7 +87,7 @@ export const HandleModelComponent = ({
   const [fileSize, setFileSize] = useState(0);
   const [rawFile, setrawFile] = useState<File>();
 
-  const [errors, setErrors] = useState({});
+  const [errors, setErrors] = useState<ErrorType>({});
   const navigate = useNavigate();
 
   useHandleModelComponent(
@@ -137,23 +136,6 @@ export const HandleModelComponent = ({
   }
   const INIFileContent = () => <p>Not implemented yet...</p>;
 
-  const getErroMessageList = () => {
-    if (_.isEmpty(errors)) return;
-
-    const errorList: string[] = [];
-
-    Object.keys(errors).forEach(function (key) {
-      // TODO: Fix the TS error for errors[key]
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore
-      const message = errors[key];
-      errorList.push(message);
-    });
-    return errorList;
-  };
-
-  const ErrorList = getErroMessageList();
-
   return (
     <Styled.Wrapper>
       {progress !== undefined && progress <= 0 && (
@@ -180,9 +162,7 @@ export const HandleModelComponent = ({
               metadata={metadata}
               setMetadata={setMetadata}
             />
-            <Styled.ErrorDiv>
-              {!_.isEmpty(errors) && ErrorList !== undefined && ErrorList}
-            </Styled.ErrorDiv>
+            <Styled.ErrorDiv>{errors.file && errors.file}</Styled.ErrorDiv>
           </>
         )}
       </Styled.CustomContent>

diff --git a/src/features/HandleModel/ModelMetadata/ModelMetadata.tsx b/src/features/HandleModel/ModelMetadata/ModelMetadata.tsx
@@ -27,7 +27,7 @@ export const ModelMetadata = ({
               setMetadata({ ...metadata, name: e.currentTarget.value })
             }
           />
-          {errors.name && <Label label="You must name your model"></Label>}
+          {errors.name && <Label label={errors.name}></Label>}
         </Styled.InputfieldRequired>
         <Styled.InputfieldRequired>
           <Styled.TextInput
@@ -42,9 +42,7 @@ export const ModelMetadata = ({
             rows={4}
             rowsMax={8}
           />
-          {errors.description && (
-            <Label label="You must add a description"></Label>
-          )}
+          {errors.description && <Label label={errors.description}></Label>}
         </Styled.InputfieldRequired>
       </Styled.Form>
     </Styled.ModelMetadata>

diff --git a/src/features/ModelView/ModelMetadataView/ModelMetadataView.tsx b/src/features/ModelView/ModelMetadataView/ModelMetadataView.tsx
@@ -37,10 +37,10 @@ export const defaultStratColumnData: StratColumnType = {
 
 export const ModelMetadataView = ({
   modelIdParent,
-  isAddUploading,
+  uploadingProgress,
 }: {
   modelIdParent?: string;
-  isAddUploading?: boolean;
+  uploadingProgress?: number;
 }) => {
   const { isLoading, data } = useFetchModel(
     modelIdParent ? modelIdParent : undefined,
@@ -272,7 +272,7 @@ export const ModelMetadataView = ({
 
   return (
     <Styled.Wrapper>
-      {!isAddUploading && (
+      {uploadingProgress === undefined && (
         <Styled.DescriptionMeta>
           <>
             {data.data.description && (
@@ -298,16 +298,18 @@ export const ModelMetadataView = ({
           />
         </Styled.DescriptionMeta>
       )}
-      {isAddUploading && (
-        <Styled.UploadingMeta>
-          <Typography variant="body_long">
-            While your model is being uploaded, you can add some metadata like
-            outcrop analogue, stratigraphic column, or gross depositional
-            environment. Please note that at least one type of metadata is
-            required for PEPM models before they can be approved later on.
-          </Typography>
-        </Styled.UploadingMeta>
-      )}
+      {uploadingProgress !== undefined &&
+        uploadingProgress >= 0 &&
+        uploadingProgress < 100 && (
+          <Styled.UploadingMeta>
+            <Typography variant="body_long">
+              While your model is being uploaded, you can add some metadata like
+              outcrop analogue, stratigraphic column, or gross depositional
+              environment. Please note that at least one type of metadata is
+              required for PEPM models before they can be approved later on.
+            </Typography>
+          </Styled.UploadingMeta>
+        )}
 
       <Typography variant="h3" as="h2">
         Model metadata

diff --git a/src/pages/AddModel/AddModel.tsx b/src/pages/AddModel/AddModel.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable sort-imports */
 /* eslint-disable max-lines */
 /* eslint-disable max-lines-per-function */
 import { Snackbar, Typography } from '@equinor/eds-core-react';
@@ -12,8 +13,8 @@ import {
   AnalogueModelsService,
   ConvertAnalogueModelCommand,
   CreateAnalogueModelCommand,
-  JobsService,
   JobStatus,
+  JobsService,
   MetadataDto,
   UploadFileType,
   UploadsService,
@@ -313,7 +314,7 @@ export const AddModel = () => {
           <>
             <ModelMetadataView
               modelIdParent={modelId}
-              isAddUploading={progress > 0}
+              uploadingProgress={progress}
             />
           </>
         )}