Skip to content

Commit

Permalink
Move standard editor to its own directory
Browse files Browse the repository at this point in the history
  • Loading branch information
bl-nero authored and github-actions committed Dec 20, 2024
1 parent 4822f77 commit c01ddc0
Show file tree
Hide file tree
Showing 10 changed files with 6 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import { YamlSupportedResourceKind } from 'teleport/services/yaml/types';
import { Access } from 'teleport/services/user';
import useResources from 'teleport/components/useResources';

import { withDefaults } from './withDefaults';
import { withDefaults } from './StandardEditor/withDefaults';
import { RoleEditor } from './RoleEditor';
import { RoleEditorDialog } from './RoleEditorDialog';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import {
import { CaptureEvent, userEventService } from 'teleport/services/userEvent';

import { RoleEditor, RoleEditorProps } from './RoleEditor';
import { defaultOptions, withDefaults } from './withDefaults';
import { defaultOptions, withDefaults } from './StandardEditor/withDefaults';

// The Ace editor is very difficult to deal with in tests, especially that for
// handling its state, we are using input event, which is asynchronous. Thus,
Expand Down
4 changes: 2 additions & 2 deletions web/packages/teleport/src/Roles/RoleEditor/RoleEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ import {
newRole,
StandardEditorModel,
roleToRoleEditorModel as roleToRoleEditorModel,
} from './standardmodel';
} from './StandardEditor/standardmodel';
import { YamlEditorModel } from './yamlmodel';
import { EditorTab } from './EditorTabs';
import { EditorHeader } from './EditorHeader';
import { StandardEditor } from './StandardEditor';
import { StandardEditor } from './StandardEditor/StandardEditor';
import { YamlEditor } from './YamlEditor';

export type RoleEditorProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,12 @@ import {
import { SlideTabs } from 'design/SlideTabs';
import { RadioGroup } from 'design/RadioGroup';
import Select from 'shared/components/Select';

import { components, MultiValueProps } from 'react-select';

import { Role, RoleWithYaml } from 'teleport/services/resources';
import { LabelsInput } from 'teleport/components/LabelsInput';
import { FieldMultiInput } from 'shared/components/FieldMultiInput/FieldMultiInput';

import { FieldMultiInput } from '../../../../shared/components/FieldMultiInput/FieldMultiInput';
import { EditorSaveCancelButton } from '../Shared';

import {
roleEditorModelToRole,
Expand Down Expand Up @@ -96,7 +95,6 @@ import {
WindowsDesktopSpecValidationResult,
AccessRuleValidationResult,
} from './validation';
import { EditorSaveCancelButton } from './Shared';
import { RequiresResetToStandard } from './RequiresResetToStandard';

export type StandardEditorProps = {
Expand Down

0 comments on commit c01ddc0

Please sign in to comment.