correct logic for validating connection modal (#7384)

Co-authored-by: Chris Whitten <[email protected]>
microsoft · Apr 26, 2021 · fd7a2cf · fd7a2cf
1 parent d95eef8
commit fd7a2cf
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/Composer/packages/client/__tests__/pages/botProjectsSettings/AdapterSettings.test.tsx b/Composer/packages/client/__tests__/pages/botProjectsSettings/AdapterSettings.test.tsx
@@ -41,6 +41,7 @@ const mockSchemas = {
               default: 'Adapter.Full.Type.Mock',
             },
           },
+          required: ['exampleName'],
         },
       },
     },
@@ -150,6 +151,21 @@ describe('ExternalAdapterSettings', () => {
     });
   });
 
+  it('does not proceed if required settings are missing', async () => {
+    const { getByTestId } = renderWithRecoilAndCustomDispatchers(
+      <ExternalAdapterSettings projectId={PROJECT_ID} />,
+      initRecoilState
+    );
+    const container = getByTestId('adapterSettings');
+    const configureButton = within(container).queryAllByText('Configure')[0];
+    act(() => {
+      fireEvent.click(configureButton);
+    });
+
+    const modal = getByTestId('adapterModal');
+    expect(within(modal).getByText('Configure')).toBeDisabled();
+  });
+
   it('disables an adapter', async () => {
     const initStateWithAdapter = {
       runtimeSettings: {

diff --git a/Composer/packages/client/src/pages/botProject/adapters/ExternalAdapterModal.tsx b/Composer/packages/client/src/pages/botProject/adapters/ExternalAdapterModal.tsx
@@ -34,7 +34,7 @@ type Props = {
 
 export function hasRequired(testObject: { [key: string]: JSONSchema7Type | undefined }, fields?: string[]) {
   if (fields == null || fields.length === 0) return true;
-  return fields.every((field: string) => field in testObject);
+  return fields.every((field: string) => field in testObject && testObject[field] != null);
 }
 
 function makeDefault(schema: JSONSchema7) {