OpenConceptLab/ocl_issues#1348 | Configuration section changes

OpenConceptLab · Sep 19, 2022 · 329d037 · 329d037
1 parent d864909
commit 329d037
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 18 deletions.
diff --git a/src/components/collections/CollectionFormConfigs.jsx b/src/components/collections/CollectionFormConfigs.jsx
@@ -37,7 +37,6 @@ const CONFIG = {
   },
   configuration: {
     title: 'Configuration',
-    subTitle: 'What type of collection would like to create?',
     type: {
       label: 'Select collection type',
       tooltip: 'The type of Source that you want to create. Note that some Collection types have special meaning.',
@@ -47,7 +46,7 @@ const CONFIG = {
       tooltip: 'A specific format for your Source. If specified, OCL will validate your Source according to rules defined in this schema.',
     },
     publicAccess: {
-      label: 'Collection visibility - who can view your collection?',
+      label: 'Visibility',
       tooltip: "The audience who can see your Collection's content. Set it to Private if your content should only be shown to authorized users or organizations."
     },
     canonicalURL: {

diff --git a/src/components/common/conceptContainerFormComponents/ConfigurationForm.jsx b/src/components/common/conceptContainerFormComponents/ConfigurationForm.jsx
@@ -64,13 +64,16 @@ const ConfigurationForm = props => {
       <div className='col-xs-12 no-side-padding'>
         <h2>{configs.title}</h2>
       </div>
+      {
+        configs.subTitle &&
+          <div className='col-xs-12 no-side-padding'>
+            <div className='col-xs-12 no-side-padding form-text-gray'>
+              {configs.subTitle}
+            </div>
+          </div>
+      }
       <div className='col-xs-12 no-side-padding'>
-        <div className='col-xs-12 no-side-padding form-text-gray'>
-          {configs.subTitle}
-        </div>
-      </div>
-      <div className='col-xs-12 no-side-padding'>
-        <div className='col-xs-12 no-side-padding form-text-gray' style={{margin: '15px 0'}}>
+        <div className='col-xs-12 no-side-padding form-text-gray' style={{margin: '10px 0'}}>
           <div className='col-xs-12 no-side-padding form-text-gray flex-vertical-center'>
             <Autocomplete
               openOnFocus
@@ -98,17 +101,14 @@ const ConfigurationForm = props => {
         </div>
       </div>
       <div className='col-xs-12 no-side-padding'>
-        <div className='col-xs-12 no-side-padding form-text-gray' style={{marginTop: '5px'}}>
-          {`Helps with formatting of your ${props.resource}`}
-        </div>
         <div className='col-xs-12 no-side-padding form-text-gray' style={{margin: '15px 0'}}>
           <div className='col-xs-12 no-side-padding form-text-gray flex-vertical-center'>
             <FormControl variant="outlined" fullWidth  size="small">
-              <InputLabel id="demo-simple-select-label">{configs.customValidationSchema.label}</InputLabel>
+              <InputLabel>{configs.customValidationSchema.label}</InputLabel>
               <Select
                 label={configs.customValidationSchema.label}
                 required
-                id="publicAccess"
+                id="customValidationSchema"
                 defaultValue="None"
                 value={customValidationSchema}
                 onChange={event => onChange('custom_validation_schema', event.target.value, setCustomValidationSchema, event.target.value === 'None' ? null : event.target.value)}
@@ -134,13 +134,12 @@ const ConfigurationForm = props => {
         </div>
       </div>
       <div className='col-xs-12 no-side-padding'>
-        <div className='col-xs-12 no-side-padding form-text-gray' style={{marginTop: '5px'}}>
-          {configs.publicAccess.label}
-        </div>
         <div className='col-xs-12 no-side-padding form-text-gray' style={{margin: '15px 0'}}>
           <div className='col-xs-12 no-side-padding form-text-gray flex-vertical-center'>
             <FormControl variant="outlined" fullWidth  size="small">
+              <InputLabel>{configs.publicAccess.label}</InputLabel>
               <Select
+                label={configs.publicAccess.label}
                 required
                 id="publicAccess"
                 defaultValue="View"

diff --git a/src/components/sources/SourceFormConfigs.jsx b/src/components/sources/SourceFormConfigs.jsx
@@ -37,7 +37,6 @@ const CONFIG = {
  },
   configuration: {
     title: 'Configuration',
-    subTitle: 'What type of source would like to create?',
     type: {
       label: 'Select source type',
       tooltip: 'The type of Source that you want to create. Note that some Source types have special meaning.',
@@ -47,7 +46,7 @@ const CONFIG = {
       tooltip: 'A specific format for your Source. If specified, OCL will validate your Source according to rules defined in this schema.',
     },
     publicAccess: {
-      label: 'Source visibility - who can view your source?',
+      label: 'Visibility',
       tooltip: "The audience who can see your Source's content. Set it to Private if your content should only be shown to authorized users or organizations."
     },
     canonicalURL: {