From 1b2b2742c979e0eb5d51d1c49a8b6f6dfdbbf0e8 Mon Sep 17 00:00:00 2001
From: LouisEugeneMSFT <66701106+LouisEugeneMSFT@users.noreply.github.com>
Date: Mon, 28 Sep 2020 17:27:52 -0700
Subject: [PATCH] feat: Update Composer logic to leverage the uiSchema when
 initializing the IntellisenseField. (#4263)

* using only ui schema for mappings

* lint

Co-authored-by: Geoff Cox (Microsoft) <gcox@microsoft.com>
---
 Composer/packages/adaptive-form/src/components/FormRow.tsx  | 6 ------
 .../src/components/fields/IntellisenseField.tsx             | 5 ++++-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Composer/packages/adaptive-form/src/components/FormRow.tsx b/Composer/packages/adaptive-form/src/components/FormRow.tsx
index 5114b4c8b2..9b2a6667aa 100644
--- a/Composer/packages/adaptive-form/src/components/FormRow.tsx
+++ b/Composer/packages/adaptive-form/src/components/FormRow.tsx
@@ -35,13 +35,7 @@ export const getRowProps = (rowProps: FormRowProps, field: string) => {
   const { required = [] } = schema;
   const fieldSchema = resolvePropSchema(schema, field, definitions);
 
-  const intellisenseScopes: string[] = [];
-  if (field === 'property') {
-    intellisenseScopes.push('variable-scopes');
-  }
-
   const newUiOptions = (uiOptions.properties?.[field] as UIOptions) ?? {};
-  newUiOptions.intellisenseScopes = intellisenseScopes;
 
   return {
     id: `${id}.${field}`,
diff --git a/Composer/packages/adaptive-form/src/components/fields/IntellisenseField.tsx b/Composer/packages/adaptive-form/src/components/fields/IntellisenseField.tsx
index 3445d49aed..39d8adec9b 100644
--- a/Composer/packages/adaptive-form/src/components/fields/IntellisenseField.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/IntellisenseField.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { FieldProps } from '@bfc/extension-client';
+import { FieldProps, useShellApi } from '@bfc/extension-client';
 import { IntellisenseTextField } from '@bfc/intellisense';
 import { TextField } from 'office-ui-fabric-react/lib/TextField';
 import React from 'react';
@@ -12,12 +12,15 @@ import { FieldLabel } from '../FieldLabel';
 export const IntellisenseField: React.FC<FieldProps<string>> = function IntellisenseField(props) {
   const { id, value = '', onChange, label, description, uiOptions, required } = props;
 
+  const { projectId } = useShellApi();
+
   return (
     <>
       <FieldLabel description={description} helpLink={uiOptions?.helpLink} id={id} label={label} required={required} />
 
       <IntellisenseTextField
         id={`intellisense-${id}`}
+        projectId={projectId}
         scopes={uiOptions.intellisenseScopes || []}
         url={getIntellisenseUrl()}
         value={value}