Merge branch 'master' into abrown/test/fix-todo-spec

microsoft · May 15, 2020 · 95a6791 · 95a6791
2 parents d4aa9b0 + 7b618dd
commit 95a6791
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/Composer/packages/client/config/env.js b/Composer/packages/client/config/env.js
@@ -89,7 +89,7 @@ function getClientEnvironment(publicUrl) {
         GIT_SHA: getGitSha()
           .toString()
           .replace('\n', ''),
-        SDK_PACKAGE_VERSION: '4.9.0', // TODO: change this when Composer supports custom schema/custom runtime
+        SDK_PACKAGE_VERSION: '4.9.1', // TODO: change this when Composer supports custom schema/custom runtime
         COMPOSER_VERSION: '0.0.4',
         LOCAL_PUBLISH_PATH:
           process.env.LOCAL_PUBLISH_PATH || path.resolve(process.cwd(), '../../plugins/localPublish/hostedBots'),

diff --git a/Composer/packages/client/src/components/SkillForm/CreateSkillModal/index.tsx b/Composer/packages/client/src/components/SkillForm/CreateSkillModal/index.tsx
@@ -7,6 +7,7 @@ import { jsx } from '@emotion/core';
 import React, { useState, FormEvent, useEffect, useCallback, useRef } from 'react';
 import formatMessage from 'format-message';
 import { PrimaryButton, DefaultButton } from 'office-ui-fabric-react/lib/Button';
+import { Spinner, SpinnerSize } from 'office-ui-fabric-react/lib/Spinner';
 import { Stack, StackItem } from 'office-ui-fabric-react/lib/Stack';
 import { TextField } from 'office-ui-fabric-react/lib/TextField';
 import { assignDefined, Skill } from '@bfc/shared';
@@ -17,7 +18,7 @@ import { DialogTypes } from '../../DialogWrapper/styles';
 import { addSkillDialog } from '../../../constants';
 import { ISkillFormData, ISkillFormDataErrors, SkillUrlRegex, SkillNameRegex } from '../types';
 
-import { FormFieldManifestUrl, FormFieldEditName, MarginLeftSmall, FormModalBody } from './styles';
+import { FormFieldManifestUrl, FormFieldEditName, MarginLeftSmall, FormModalBody, SpinnerLabel } from './styles';
 import { validateManifestUrl } from './validateManifestUrl';
 
 export interface ICreateSkillModalProps {
@@ -180,6 +181,9 @@ const CreateSkillModal: React.FC<ICreateSkillModalProps> = props => {
               required
               autoFocus
             />
+            {isValidating && (
+              <Spinner css={SpinnerLabel} size={SpinnerSize.medium} label="validating..." labelPosition="right" />
+            )}
             <TextField
               css={FormFieldEditName}
               label={formatMessage('Custom name (optional)')}

diff --git a/Composer/packages/client/src/components/SkillForm/CreateSkillModal/styles.ts b/Composer/packages/client/src/components/SkillForm/CreateSkillModal/styles.ts
@@ -19,3 +19,8 @@ export const FormFieldEditName = css`
 export const MarginLeftSmall = css`
   margin-left: ${FontSizes.small};
 `;
+
+export const SpinnerLabel = css`
+  justify-content: left;
+  margin-top: 0.4rem;
+`;
diff --git a/Composer/packages/lib/indexers/src/utils/diagnosticUtil.ts b/Composer/packages/lib/indexers/src/utils/diagnosticUtil.ts
@@ -75,7 +75,7 @@ export function filterSectionDiagnostics(diagnostics: Diagnostic[], section: LuI
   return filteredDiags.map(d => {
     const { range } = d;
     if (range) {
-      d.range = offsetRange(range, offset);
+      return { ...d, range: offsetRange(range, offset) };
     }
     return d;
   });

diff --git a/Composer/packages/server/src/models/bot/skillManager.ts b/Composer/packages/server/src/models/bot/skillManager.ts
@@ -60,7 +60,7 @@ export const extractSkillManifestUrl = async (
       const notify = new Diagnostic(
         `Accessing skill manifest url error, ${manifestUrl}`,
         'appsettings.json',
-        DiagnosticSeverity.Error
+        DiagnosticSeverity.Warning
       );
       diagnostics.push(notify);
     }

diff --git a/Composer/packages/server/src/services/project.ts b/Composer/packages/server/src/services/project.ts
@@ -195,9 +195,6 @@ export class BotProjectService {
   public static getProjectById = async (projectId: string, user?: UserIdentity): Promise<BotProject> => {
     BotProjectService.initialize();
 
-    const cachedProject = BotProjectService.getIndexedProjectById(projectId);
-    if (cachedProject) return cachedProject;
-
     if (!BotProjectService.projectLocationMap?.[projectId]) {
       throw new Error('project not found in cache');
     } else {