From 035743dd7da4962bc9521801c23ecf5caad0d9ed Mon Sep 17 00:00:00 2001
From: zhixzhan <zhixzhan@microsoft.com>
Date: Fri, 15 May 2020 12:56:54 +0800
Subject: [PATCH 1/3] do not use cache at getProjectById

---
 Composer/packages/server/src/services/project.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Composer/packages/server/src/services/project.ts b/Composer/packages/server/src/services/project.ts
index 9f62672400..69c934ce45 100644
--- 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 {

From 3641bd5e4c2cfd09dc4291b7c9b17978618f8d33 Mon Sep 17 00:00:00 2001
From: zhixzhan <zhixzhan@microsoft.com>
Date: Fri, 15 May 2020 16:21:29 +0800
Subject: [PATCH 2/3] change skill manifest to warning

---
 .../src/components/SkillForm/CreateSkillModal/index.tsx     | 6 +++++-
 .../src/components/SkillForm/CreateSkillModal/styles.ts     | 5 +++++
 Composer/packages/server/src/models/bot/skillManager.ts     | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Composer/packages/client/src/components/SkillForm/CreateSkillModal/index.tsx b/Composer/packages/client/src/components/SkillForm/CreateSkillModal/index.tsx
index 1cd6fa1557..759621b3ed 100644
--- 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
index ace34e6ad7..cfe6a2bcc9 100644
--- 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/server/src/models/bot/skillManager.ts b/Composer/packages/server/src/models/bot/skillManager.ts
index 1d61886020..f15d3fceab 100644
--- 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);
     }

From e9b17769afc0cdad688d76822abb80d0ad5087f1 Mon Sep 17 00:00:00 2001
From: zhixzhan <zhixzhan@microsoft.com>
Date: Fri, 15 May 2020 16:48:03 +0800
Subject: [PATCH 3/3] code style

---
 Composer/packages/lib/indexers/src/utils/diagnosticUtil.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Composer/packages/lib/indexers/src/utils/diagnosticUtil.ts b/Composer/packages/lib/indexers/src/utils/diagnosticUtil.ts
index a475fc6acb..3c2155eeab 100644
--- 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;
   });