restructured the model mirror page and added a backend check for exis…

…ting model card before allowing export
gchq · Dec 18, 2024 · 10d6251 · 10d6251
1 parent adf8a49
commit 10d6251
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 56 deletions.
diff --git a/backend/config/default.cjs b/backend/config/default.cjs
@@ -191,7 +191,7 @@ module.exports = {
         enabled: false,
       },
       export: {
-        enabled: false,
+        enabled: true,
         disclaimer: '## Example Agreement \n I agree that this model is suitable for exporting',
       },
     },

diff --git a/backend/src/services/mirroredModel.ts b/backend/src/services/mirroredModel.ts
@@ -46,6 +46,9 @@ export async function exportModel(
   if (!model.settings.mirror.destinationModelId) {
     throw BadReq(`The 'Destination Model ID' has not been set on this model.`)
   }
+  if (!model.card || !model.card.schemaId) {
+    throw BadReq('You must select a schema for your model before you can start the export process.')
+  }
   const mirroredModelId = model.settings.mirror.destinationModelId
   const auth = await authorisation.model(user, model, ModelAction.Update)
   if (!auth.success) {

diff --git a/frontend/src/entry/model/mirroredModels/ExportModelAgreement.tsx b/frontend/src/entry/model/mirroredModels/ExportModelAgreement.tsx
@@ -1,5 +1,5 @@
 import { LoadingButton } from '@mui/lab'
-import { Box, Button, Card, Checkbox, Container, FormControlLabel, Stack, Typography } from '@mui/material'
+import { Box, Button, Checkbox, FormControlLabel, Stack, Typography } from '@mui/material'
 import { postModelExportToS3 } from 'actions/model'
 import { ChangeEvent, FormEvent, useState } from 'react'
 import Restricted from 'src/common/Restricted'
@@ -46,27 +46,25 @@ export default function ExportModelAgreement({ modelId }: ExportModelAgreementPr
   }
 
   return (
-    <Container maxWidth='md'>
-      <Card sx={{ mx: 'auto', my: 4, p: 4 }}>
-        <Typography variant='h6' component='h1' color='primary' align='center'>
-          Model Export Agreement
-        </Typography>
-        <Box component='form' onSubmit={handleSubmit}>
-          <Stack spacing={2} alignItems='start' justifyContent='start'>
-            <ModelExportAgreementText />
-            <FormControlLabel
-              control={<Checkbox checked={checked} onChange={handleChecked} />}
-              label='I agree to the terms and conditions of this model export agreement'
-            />
-            <Restricted action='exportMirroredModel' fallback={<Button disabled>Submit</Button>}>
-              <LoadingButton variant='contained' loading={loading} disabled={!checked} type='submit'>
-                Submit
-              </LoadingButton>
-            </Restricted>
-            <MessageAlert message={errorMessage} severity='error' />
-          </Stack>
-        </Box>
-      </Card>
-    </Container>
+    <>
+      <Typography variant='h6' component='h1' color='primary' align='center'>
+        Model Export Agreement
+      </Typography>
+      <Box component='form' onSubmit={handleSubmit}>
+        <Stack spacing={2} alignItems='start' justifyContent='start'>
+          <ModelExportAgreementText />
+          <FormControlLabel
+            control={<Checkbox checked={checked} onChange={handleChecked} />}
+            label='I agree to the terms and conditions of this model export agreement'
+          />
+          <Restricted action='exportMirroredModel' fallback={<Button disabled>Submit</Button>}>
+            <LoadingButton variant='contained' loading={loading} disabled={!checked} type='submit'>
+              Submit
+            </LoadingButton>
+          </Restricted>
+          <MessageAlert message={errorMessage} severity='error' />
+        </Stack>
+      </Box>
+    </>
   )
 }
diff --git a/frontend/src/entry/model/mirroredModels/ExportSettings.tsx b/frontend/src/entry/model/mirroredModels/ExportSettings.tsx
@@ -1,6 +1,5 @@
-import ExpandMoreIcon from '@mui/icons-material/ExpandMore'
 import { LoadingButton } from '@mui/lab'
-import { Accordion, AccordionDetails, AccordionSummary, Box, Stack, TextField, Typography } from '@mui/material'
+import { Box, Card, Container, Divider, Stack, TextField, Typography } from '@mui/material'
 import { patchModel } from 'actions/model'
 import { ChangeEvent, FormEvent, useState } from 'react'
 import LabelledInput from 'src/common/LabelledInput'
@@ -55,25 +54,23 @@ export default function ExportSettings({ model }: ExportSettingsProps) {
 
   return (
     <>
-      <ExportModelAgreement modelId={model.id} />
-      <Accordion sx={{ borderTop: 'none' }}>
-        <AccordionSummary sx={{ pl: 0 }} expandIcon={<ExpandMoreIcon />}>
-          <Typography component='h3' variant='h6'>
-            Export Settings
-          </Typography>
-        </AccordionSummary>
-        <AccordionDetails>
+      <Container maxWidth='md'>
+        <Card sx={{ mx: 'auto', my: 4, p: 4 }}>
           <Box component='form' onSubmit={handleSave}>
-            <Stack spacing={2} alignItems='flex-start'>
-              <LabelledInput label={'Destination Model ID'} htmlFor={'destination-model-id'} required>
-                <TextField
-                  id='destination-model-id'
-                  value={destinationModelId}
-                  onChange={handleDestinationModelId}
-                  size='small'
-                />
-              </LabelledInput>
-              {/*TODO - Add the ability to filter releases needed for export (This functionality is not available on the backend)
+            <Stack spacing={3} divider={<Divider flexItem />}>
+              <>
+                <Typography variant='h6' component='h1' color='primary' align='center'>
+                  Model Export Settings
+                </Typography>
+                <LabelledInput label={'Destination Model ID'} htmlFor={'destination-model-id'} required>
+                  <TextField
+                    id='destination-model-id'
+                    value={destinationModelId}
+                    onChange={handleDestinationModelId}
+                    size='small'
+                  />
+                </LabelledInput>
+                {/*TODO - Add the ability to filter releases needed for export (This functionality is not available on the backend)
               <ReleaseSelector
                 model={model}
                 selectedReleases={selectedReleases}
@@ -82,20 +79,22 @@ export default function ExportSettings({ model }: ExportSettingsProps) {
                 requiredRolesText={requiredRolesText}
               />
                */}
-              <LoadingButton
-                sx={{ width: 'fit-content' }}
-                variant='contained'
-                data-test='createAccessRequestButton'
-                loading={loading}
-                type='submit'
-              >
-                Save
-              </LoadingButton>
-              <MessageAlert message={errorMessage} severity='error' />
+                <LoadingButton
+                  sx={{ width: 'fit-content' }}
+                  variant='contained'
+                  data-test='createAccessRequestButton'
+                  loading={loading}
+                  type='submit'
+                >
+                  Save
+                </LoadingButton>
+                <MessageAlert message={errorMessage} severity='error' />
+              </>
+              <ExportModelAgreement modelId={model.id} />
             </Stack>
           </Box>
-        </AccordionDetails>
-      </Accordion>
+        </Card>
+      </Container>
     </>
   )
 }