Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

fix: .form extension for form dialog schema files #4735

Merged
hatpick merged 1 commit into from
Nov 9, 2020
Merged

fix: .form extension for form dialog schema files #4735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Composer/packages/client/src/pages/form-dialog/VisualFormDialogSchemaEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import { JsonEditor } from '@bfc/code-editor';
import { FormDialogSchemaEditor } from '@bfc/form-dialogs';
import { FileExtensions } from '@bfc/shared';
import styled from '@emotion/styled';
import { NeutralColors } from '@uifabric/fluent-theme';
import formatMessage from 'format-message';
Expand Down Expand Up @@ -113,7 +114,7 @@ export const VisualFormDialogSchemaEditor = React.memo((props: Props) => {
editorId={`${projectId}:${schema.id}`}
isGenerating={generationInProgress}
schema={schema}
schemaExtension=".form-dialog"
schemaExtension={FileExtensions.FormDialogSchema}
templates={templates}
onGenerateDialog={onGenerate}
onSchemaUpdated={onSchemaUpdated}
Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/client/src/recoilModel/persistence/FilePersistence.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ class FilePersistence {

private getFormDialogSchemaFileChanges(current: FormDialogSchema[], previous: FormDialogSchema[]) {
const changeItems = this.getDifferenceItems(current, previous);
const changes = this.getFileChanges(FileExtensions.FormDialog, changeItems);
const changes = this.getFileChanges(FileExtensions.FormDialogSchema, changeItems);
return changes;
}

Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/client/src/recoilModel/persistence/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export enum ChangeType {

export enum FileExtensions {
Dialog = '.dialog',
FormDialog = '.form-dialog',
FormDialogSchema = '.form',
DialogSchema = '.dialog.schema',
Manifest = '.json',
Lu = '.lu',
Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/form-dialogs/src/demo/DemoApp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ const InternalDemoApp = () => {
allowUndo
editorId={selectedItemId}
schema={selectedItem}
schemaExtension=".form-dialog"
schemaExtension=".form"
templates={templates}
// eslint-disable-next-line no-console
onGenerateDialog={() => {}}
Expand Down
4 changes: 2 additions & 2 deletions Composer/packages/lib/indexers/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class Indexer {
{
[FileExtensions.lg]: [],
[FileExtensions.Lu]: [],
[FileExtensions.FormDialog]: [],
[FileExtensions.FormDialogSchema]: [],
[FileExtensions.QnA]: [],
[FileExtensions.Dialog]: [],
[FileExtensions.DialogSchema]: [],
Expand Down Expand Up @@ -95,7 +95,7 @@ class Indexer {
skills: skillIndexer.index(skillContent, settings.skill),
botProjectSpaceFiles: botProjectSpaceIndexer.index(result[FileExtensions.BotProjectSpace]),
jsonSchemaFiles: jsonSchemaFileIndexer.index(result[FileExtensions.Json]),
formDialogSchemas: formDialogSchemaIndexer.index(result[FileExtensions.FormDialog]),
formDialogSchemas: formDialogSchemaIndexer.index(result[FileExtensions.FormDialogSchema]),
recognizers: recognizerIndexer.index(recognizers),
crossTrainConfig: crossTrainConfigIndexer.index(crossTrainConfigs),
};
Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/lib/indexers/src/utils/fileExtensions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

export enum FileExtensions {
Dialog = '.dialog',
FormDialog = '.form-dialog',
FormDialogSchema = '.form',
DialogSchema = '.schema',
Lu = '.lu',
QnA = '.qna',
Expand Down
4 changes: 2 additions & 2 deletions Composer/packages/server/src/models/bot/botProject.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export class BotProject implements IBotProject {
public get formDialogSchemaFiles() {
const files: FileInfo[] = [];
this.files.forEach((file) => {
if (file.name.endsWith('.form-dialog')) {
if (file.name.endsWith(FileExtensions.FormDialogSchema)) {
files.push(file);
}
});
Expand Down Expand Up @@ -749,7 +749,7 @@ export class BotProject implements IBotProject {
const patterns = [
'**/*.dialog',
'**/*.dialog.schema',
'**/*.form-dialog',
'**/*.form',
'**/*.lg',
'**/*.lu',
'**/*.qna',
Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/types/src/indexers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import { DialogSetting } from './index';
export enum FileExtensions {
Dialog = '.dialog',
DialogSchema = '.schema',
FormDialogSchema = '.form',
Manifest = '.json',
Lu = '.lu',
Lg = '.lg',
Qna = '.qna',
SourceQnA = '.source.qna',
Setting = 'appsettings.json',
FormDialogSchema = '.form-dialog',
BotProject = '.botproj',
Json = '.json',
}
Expand Down