Add oneOf description and title (#2774)

airbytehq · Apr 7, 2021 · f5d084d · f5d084d
1 parent a7b9cd5
commit f5d084d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/airbyte-webapp/src/components/ServiceForm/components/FormSection.tsx b/airbyte-webapp/src/components/ServiceForm/components/FormSection.tsx
@@ -39,6 +39,7 @@ const ConditionSection: React.FC<{
   return (
     <GroupControls
       key={`form-field-group-${formField.fieldKey}`}
+      description={formField.description}
       title={
         <>
           {label ? <GroupLabel>{label}:</GroupLabel> : null}
@@ -86,6 +87,7 @@ const ArraySection: React.FC<{
     <GroupControls
       key={`form-variable-fields-${formField?.fieldKey}`}
       title={formField.title || formField.fieldKey}
+      description={formField.description}
     >
       <SectionContainer>
         <FieldArray

diff --git a/airbyte-webapp/src/components/ServiceForm/components/Property/GroupControls.tsx b/airbyte-webapp/src/components/ServiceForm/components/Property/GroupControls.tsx
@@ -1,5 +1,6 @@
 import React from "react";
 import styled from "styled-components";
+import { Label, TextWithHTML } from "components";
 
 const GroupTitle = styled.div`
   margin-top: -23px;
@@ -24,12 +25,18 @@ const FormGroup = styled.div`
 
 type GroupControlsProps = {
   title: React.ReactNode;
+  description?: string;
 };
 
-const GroupControls: React.FC<GroupControlsProps> = ({ title, children }) => {
+const GroupControls: React.FC<GroupControlsProps> = ({
+  title,
+  description,
+  children,
+}) => {
   return (
     <FormGroup>
       <GroupTitle>{title}</GroupTitle>
+      {description && <Label message={<TextWithHTML text={description} />} />}
       {children}
     </FormGroup>
   );

diff --git a/airbyte-webapp/src/core/form/types.ts b/airbyte-webapp/src/core/form/types.ts
@@ -31,6 +31,7 @@ type FormConditionItem = {
   fieldKey: string;
   isRequired: boolean;
   title?: string;
+  description?: string;
   conditions: { [key: string]: FormGroupItem | FormBaseItem };
 };
 
@@ -40,6 +41,7 @@ type FormObjectArrayItem = {
   fieldKey: string;
   isRequired: boolean;
   title?: string;
+  description?: string;
   properties: FormBlock;
 };
 

diff --git a/airbyte-webapp/src/core/jsonSchema/schemaToUiWidget.ts b/airbyte-webapp/src/core/jsonSchema/schemaToUiWidget.ts
@@ -45,6 +45,8 @@ export const jsonSchemaToUiWidget = (
 
     return {
       _type: "formCondition",
+      title: jsonSchema.title,
+      description: jsonSchema.description,
       path: path || key,
       fieldKey: key,
       conditions,