more pr ammendments

gchq · Sep 21, 2022 · 5f672d7 · 5f672d7
1 parent abf7d0d
commit 5f672d7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 20 deletions.
diff --git a/pages/model/[uuid]/new-version.tsx b/pages/model/[uuid]/new-version.tsx
@@ -7,7 +7,7 @@ import { useGetSchema } from '../../../data/schema'
 import LoadingBar from '../../../src/common/LoadingBar'
 import MultipleErrorWrapper from '../../../src/errors/MultipleErrorWrapper'
 import Form from '../../../src/Form/Form'
-import RenderFileTab, { RenderBasicFileTab, FileTabComplete } from '../../../src/Form/RenderFileTab'
+import RenderFileTab, { RenderBasicFileTab, fileTabComplete } from '../../../src/Form/RenderFileTab'
 import ModelExportAndSubmission from '../../../src/Form/ModelExportAndSubmission'
 import { RenderButtonsInterface } from '../../../src/Form/RenderButtons'
 import SubmissionError from '../../../src/Form/SubmissionError'
@@ -76,7 +76,7 @@ function Upload() {
 
         render: RenderFileTab,
         renderBasic: RenderBasicFileTab,
-        isComplete: FileTabComplete,
+        isComplete: fileTabComplete,
       })
     )
 

diff --git a/pages/upload.tsx b/pages/upload.tsx
@@ -9,7 +9,7 @@ import MultipleErrorWrapper from '@/src/errors/MultipleErrorWrapper'
 import Form from '@/src/Form/Form'
 import ModelExportAndSubmission from '@/src/Form/ModelExportAndSubmission'
 import { RenderButtonsInterface } from '@/src/Form/RenderButtons'
-import RenderFileTab, { FileTabComplete, RenderBasicFileTab } from '@/src/Form/RenderFileTab'
+import RenderFileTab, { fileTabComplete, RenderBasicFileTab } from '@/src/Form/RenderFileTab'
 import SchemaSelector from '@/src/Form/SchemaSelector'
 import SubmissionError from '@/src/Form/SubmissionError'
 import Wrapper from '@/src/Wrapper'
@@ -94,7 +94,7 @@ function Upload() {
 
         render: RenderFileTab,
         renderBasic: RenderBasicFileTab,
-        isComplete: FileTabComplete,
+        isComplete: fileTabComplete,
       })
     )
 

diff --git a/src/Form/RenderFileTab.tsx b/src/Form/RenderFileTab.tsx
@@ -77,11 +77,11 @@ export default function RenderFileTab({ step, splitSchema, setSplitSchema }: Ren
   )
 }
 
-export function FileTabComplete(step: Step) {
+export function fileTabComplete(step: Step) {
   const buildOptionsStep = step.state.steps.find(
     (buildOptionSchemaStep) => buildOptionSchemaStep.section === 'buildOptions'
   )
-  const hasUploadType = useMemo(() => !!buildOptionsStep.state.uploadType, [buildOptionsStep])
+  const hasUploadType = !!buildOptionsStep.state.uploadType
   if (!hasUploadType) {
     return true
   }
@@ -128,17 +128,3 @@ export function RenderBasicFileTab({ step, splitSchema, setSplitSchema }: Render
     </Box>
   )
 }
-
-export function BasicFileTabComplete(step: Step) {
-  const buildOptionsStep = useMemo(
-    () => step.state.steps.find((buildOptionSchemaStep) => buildOptionSchemaStep.section === 'buildOptions'),
-    [step]
-  )
-  return (
-    (buildOptionsStep !== undefined &&
-      buildOptionsStep.state.uploadType === ModelUploadType.Zip &&
-      step.state.binary &&
-      step.state.code) ||
-    buildOptionsStep.state.uploadType === ModelUploadType.ModelCard
-  )
-}