merge conflicts

scientist-softserv · Jan 31, 2024 · 408f54b · 408f54b
2 parents f61295a + b26d96d
commit 408f54b
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 18 deletions.
diff --git a/pages/requests/new/[ware].js b/pages/requests/new/[ware].js
@@ -10,6 +10,7 @@ import {
  Loading,
  Notice,
  ShippingDetails,
+ TextBox,
  Title,
 } from '@scientist-softserv/webstore-component-library'
 import {
@@ -20,12 +21,14 @@ import {
  requestFormHeaderBg,
  sendRequestToVendor,
  useInitializeRequest,
+ useOneWare,
 } from '../../../utils'
 
 const NewRequest = ({ session }) => {
  const router = useRouter()
  const accessToken = session?.accessToken
  const wareID = router.query.id
+ const { ware } = useOneWare(wareID, accessToken)
  const { dynamicForm, isLoadingInitialRequest, isInitialRequestError } = useInitializeRequest(wareID, accessToken)
  const oneWeekFromNow = addDays((new Date()), 7).toISOString().slice(0, 10)
  const disabled = session === null ? true : false
@@ -176,23 +179,30 @@ const NewRequest = ({ session }) => {
  <div className='container'>
  <Title title={dynamicForm.name || ''} addClass='my-4' />
  {dynamicForm.schema ? (
- <Form
- formData={formData}
- onChange={e => setFormData(e.formData)}
- onSubmit={handleSubmit}
- schema={dynamicForm.schema}
- uiSchema={dynamicForm.uiSchema}
- validator={validator}
- disabled={disabled}
- >
- <StandardRequestOptions
- defaultRequiredDate={oneWeekFromNow}
- requestForm={requestForm}
- updateRequestForm={updateRequestForm}
- buttonDisabled={buttonDisabled || disabled}
- disabled={disabled}
+ <>
+ <TextBox
+ text={ware.snippet}
+ size='large'
+ style={{ fontWeight: '550' }}
  />
- </Form>
+ <Form
+ formData={formData}
+ onChange={e => setFormData(e.formData)}
+ onSubmit={handleSubmit}
+ schema={dynamicForm.schema}
+ uiSchema={dynamicForm.uiSchema}
+ validator={validator}
+ disabled={disabled}
+ >
+ <StandardRequestOptions
+ defaultRequiredDate={oneWeekFromNow}
+ requestForm={requestForm}
+ updateRequestForm={updateRequestForm}
+ buttonDisabled={buttonDisabled || disabled}
+ disabled={disabled}
+ />
+ </Form>
+ </>
  ) : (
  <BsForm
  onSubmit={handleSubmit}

diff --git a/utils/api/configurations.js b/utils/api/configurations.js
@@ -314,14 +314,22 @@ export const configureDynamicFormUiSchema = (schema, defaultOptions) => {
 
  if(fields[key].helper) fieldOptions['ui:help'] = fields[key].helper
  if(fields[key].placeholder) fieldOptions['ui:placeholder'] = fields[key].placeholder
- if(fields[key].type) fieldOptions['ui:inputType'] = fields[key].type
- if(fields[key].type === 'checkbox') fieldOptions['ui:widget'] = 'checkboxes'
  if(fields[key].rows) {
  fieldOptions['ui:options']= {
  widget: 'textarea',
  rows: fields[key].rows,
  }
  }
+ switch(fields[key].type) {
+ case 'checkbox':
+ fieldOptions['ui:widget'] = 'checkboxes'
+ break
+ case 'radio':
+ fieldOptions['ui:widget'] = 'radio'
+ break
+ default:
+ fieldOptions['ui:inputType'] = fields[key].type
+ }
 
  UiSchema[key] = fieldOptions
  }

diff --git a/utils/theme/globals.scss b/utils/theme/globals.scss
@@ -27,3 +27,7 @@ footer {
 .form-group.field-array .checkbox input {
  margin-right: 10px;
 }
+
+.field-radio-group .radio input {
+ margin-right: 10px;
+}