From 93af1ae48eb6e25c8919c1b150c34155eecae6be Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Mon, 25 Apr 2022 23:19:06 +0200 Subject: [PATCH] scaffolder: move TemplateEditor components into subdirectory Signed-off-by: Patrik Oldsberg --- .../DirectoryEditorContext.tsx | 2 +- .../{ => TemplateEditor}/DirectoryLoader.tsx | 2 +- .../{ => TemplateEditor}/DryRunContext.tsx | 4 ++-- .../{ => TemplateEditor}/FileBrowser.test.tsx | 0 .../{ => TemplateEditor}/FileBrowser.tsx | 2 +- .../{ => TemplateEditor}/TemplateEditor.tsx | 10 +++++----- .../TemplateEditorDryRunResults.tsx | 4 ++-- .../TemplateEditorPage/TemplateEditor/index.ts | 17 +++++++++++++++++ 8 files changed, 29 insertions(+), 12 deletions(-) rename plugins/scaffolder/src/components/TemplateEditorPage/{ => TemplateEditor}/DirectoryEditorContext.tsx (99%) rename plugins/scaffolder/src/components/TemplateEditorPage/{ => TemplateEditor}/DirectoryLoader.tsx (97%) rename plugins/scaffolder/src/components/TemplateEditorPage/{ => TemplateEditor}/DryRunContext.tsx (97%) rename plugins/scaffolder/src/components/TemplateEditorPage/{ => TemplateEditor}/FileBrowser.test.tsx (100%) rename plugins/scaffolder/src/components/TemplateEditorPage/{ => TemplateEditor}/FileBrowser.tsx (99%) rename plugins/scaffolder/src/components/TemplateEditorPage/{ => TemplateEditor}/TemplateEditor.tsx (97%) rename plugins/scaffolder/src/components/TemplateEditorPage/{ => TemplateEditor}/TemplateEditorDryRunResults.tsx (98%) create mode 100644 plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor/index.ts diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/DirectoryEditorContext.tsx b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor/DirectoryEditorContext.tsx similarity index 99% rename from plugins/scaffolder/src/components/TemplateEditorPage/DirectoryEditorContext.tsx rename to plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor/DirectoryEditorContext.tsx index 0edf390bfe..74073e797b 100644 --- a/plugins/scaffolder/src/components/TemplateEditorPage/DirectoryEditorContext.tsx +++ b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor/DirectoryEditorContext.tsx @@ -20,7 +20,7 @@ import React, { createContext, ReactNode, useContext, useEffect } from 'react'; import { TemplateDirectoryAccess, TemplateFileAccess, -} from '../../lib/filesystem'; +} from '../../../lib/filesystem'; const MAX_SIZE = 1024 * 1024; const MAX_SIZE_MESSAGE = 'This file is too large to be displayed'; diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/DirectoryLoader.tsx b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor/DirectoryLoader.tsx similarity index 97% rename from plugins/scaffolder/src/components/TemplateEditorPage/DirectoryLoader.tsx rename to plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor/DirectoryLoader.tsx index 65f0c21e32..5ba68389c8 100644 --- a/plugins/scaffolder/src/components/TemplateEditorPage/DirectoryLoader.tsx +++ b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor/DirectoryLoader.tsx @@ -20,7 +20,7 @@ import { useAsync } from '@react-hookz/web'; import { TemplateDirectoryAccess, WebFileSystemAccess, -} from '../../lib/filesystem'; +} from '../../../lib/filesystem'; interface DirectoryLoaderProps { onLoad(directory: TemplateDirectoryAccess): void; diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/DryRunContext.tsx b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor/DryRunContext.tsx similarity index 97% rename from plugins/scaffolder/src/components/TemplateEditorPage/DryRunContext.tsx rename to plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor/DryRunContext.tsx index ea687095db..68cee21b77 100644 --- a/plugins/scaffolder/src/components/TemplateEditorPage/DryRunContext.tsx +++ b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor/DryRunContext.tsx @@ -24,8 +24,8 @@ import React, { useRef, useState, } from 'react'; -import { scaffolderApiRef } from '../../api'; -import { ScaffolderDryRunResponse } from '../../types'; +import { scaffolderApiRef } from '../../../api'; +import { ScaffolderDryRunResponse } from '../../../types'; interface DryRunOptions { templateContent: string; diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/FileBrowser.test.tsx b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor/FileBrowser.test.tsx similarity index 100% rename from plugins/scaffolder/src/components/TemplateEditorPage/FileBrowser.test.tsx rename to plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor/FileBrowser.test.tsx diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/FileBrowser.tsx b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor/FileBrowser.tsx similarity index 99% rename from plugins/scaffolder/src/components/TemplateEditorPage/FileBrowser.tsx rename to plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor/FileBrowser.tsx index 705f5776c9..a815fc06f2 100644 --- a/plugins/scaffolder/src/components/TemplateEditorPage/FileBrowser.tsx +++ b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor/FileBrowser.tsx @@ -23,7 +23,7 @@ import TreeItem from '@material-ui/lab/TreeItem'; import { TemplateDirectoryAccess, TemplateFileAccess, -} from '../../lib/filesystem'; +} from '../../../lib/filesystem'; import { useAsync, useMountEffect } from '@react-hookz/web'; import { ErrorPanel, Progress } from '@backstage/core-components'; diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor.tsx b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor/TemplateEditor.tsx similarity index 97% rename from plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor.tsx rename to plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor/TemplateEditor.tsx index fa5de7f7ea..b05fe632c0 100644 --- a/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor.tsx +++ b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor/TemplateEditor.tsx @@ -39,11 +39,11 @@ import RefreshIcon from '@material-ui/icons/Refresh'; import CloseIcon from '@material-ui/icons/Close'; import CodeMirror from '@uiw/react-codemirror'; import yaml from 'yaml'; -import { FieldExtensionOptions } from '../../extensions'; -import { TemplateParameterSchema } from '../../types'; -import { MultistepJsonForm } from '../MultistepJsonForm'; -import { createValidator } from '../TemplatePage'; -import { TemplateDirectoryAccess } from '../../lib/filesystem'; +import { FieldExtensionOptions } from '../../../extensions'; +import { TemplateParameterSchema } from '../../../types'; +import { MultistepJsonForm } from '../../MultistepJsonForm'; +import { createValidator } from '../../TemplatePage'; +import { TemplateDirectoryAccess } from '../../../lib/filesystem'; import { FileBrowser } from './FileBrowser'; import { DirectoryEditorProvider, diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditorDryRunResults.tsx b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor/TemplateEditorDryRunResults.tsx similarity index 98% rename from plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditorDryRunResults.tsx rename to plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor/TemplateEditorDryRunResults.tsx index 93c42b3384..a4a14f6c73 100644 --- a/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditorDryRunResults.tsx +++ b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor/TemplateEditorDryRunResults.tsx @@ -47,8 +47,8 @@ import { yaml as yamlSupport } from '@codemirror/legacy-modes/mode/yaml'; import { StreamLanguage } from '@codemirror/stream-parser'; import { LogViewer } from '@backstage/core-components'; import { usePrevious } from '@react-hookz/web'; -import { TaskStatusStepper } from '../TaskPage/TaskPage'; -import { TaskPageLinks } from '../TaskPage/TaskPageLinks'; +import { TaskStatusStepper } from '../../TaskPage/TaskPage'; +import { TaskPageLinks } from '../../TaskPage/TaskPageLinks'; import ListItemIcon from '@material-ui/core/ListItemIcon'; import { BackstageTheme } from '@backstage/theme'; diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor/index.ts b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor/index.ts new file mode 100644 index 0000000000..f0854db3a7 --- /dev/null +++ b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor/index.ts @@ -0,0 +1,17 @@ +/* + * Copyright 2022 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export { TemplateEditor } from './TemplateEditor';