Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: distrubute custom element import #395

Merged
merged 3 commits into from
Nov 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 15 additions & 3 deletions src/Hosting.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@
import { Drawer } from '@material/mwc-drawer';
import { ActionDetail, List } from '@material/mwc-list';
import { ListItem } from '@material/mwc-list/mwc-list-item';
import { html, property, query, TemplateResult } from 'lit-element';
import { until } from 'lit-html/directives/until';
import { translate } from 'lit-translate';

import '@material/mwc-drawer';
import '@material/mwc-icon';
import '@material/mwc-icon-button';
import '@material/mwc-linear-progress';
import '@material/mwc-list';
import '@material/mwc-list/mwc-list-item';
import '@material/mwc-tab';
import '@material/mwc-tab-bar';
import '@material/mwc-top-app-bar-fixed';

import { Drawer } from '@material/mwc-drawer';
import { ActionDetail, List } from '@material/mwc-list';
import { ListItem } from '@material/mwc-list/mwc-list-item';

import { Mixin, newPendingStateEvent } from './foundation.js';
import { LoggingElement } from './Logging.js';
import { Plugin, PluggingElement, pluginIcons } from './Plugging.js';
Expand Down
11 changes: 10 additions & 1 deletion src/Logging.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,20 @@ import {
TemplateResult,
} from 'lit-element';
import { ifDefined } from 'lit-html/directives/if-defined';
import { get, translate } from 'lit-translate';

import '@material/mwc-button';
import '@material/mwc-dialog';
import '@material/mwc-icon';
import '@material/mwc-icon-button';
import '@material/mwc-icon-button-toggle';
import '@material/mwc-list';
import '@material/mwc-list/mwc-list-item';
import '@material/mwc-snackbar';
import { Dialog } from '@material/mwc-dialog';
import { Snackbar } from '@material/mwc-snackbar';

import './filtered-list.js';
import {
CommitEntry,
ifImplemented,
Expand All @@ -25,7 +35,6 @@ import {
OpenDocEvent,
SclhistoryEntry,
} from './foundation.js';
import { get, translate } from 'lit-translate';
import { getFilterIcon, iconColors } from './icons.js';
import { Plugin } from './Plugging.js';

Expand Down
15 changes: 13 additions & 2 deletions src/Plugging.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,27 @@ import wrapHtml from 'carehtml';

const html = wrapHtml(litHtml);

import '@material/mwc-button';
import '@material/mwc-dialog';
import '@material/mwc-formfield';
import '@material/mwc-icon';
import '@material/mwc-list';
import '@material/mwc-list/mwc-check-list-item';
import '@material/mwc-list/mwc-list-item';
import '@material/mwc-list/mwc-radio-list-item';
import '@material/mwc-select';
import '@material/mwc-switch';
import '@material/mwc-textfield';
import { Dialog } from '@material/mwc-dialog';
import { List } from '@material/mwc-list';
import { ListItem } from '@material/mwc-list/mwc-list-item';
import { MultiSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
import { Select } from '@material/mwc-select';
import { Switch } from '@material/mwc-switch';
import { TextField } from '@material/mwc-textfield';

import { ifImplemented, LitElementConstructor, Mixin } from './foundation.js';
import { EditingElement } from './Editing.js';
import { MultiSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
import { ListItem } from '@material/mwc-list/mwc-list-item';
import { officialPlugins } from '../public/js/plugins.js';

type PluginKind = 'editor' | 'menu' | 'validator';
Expand Down
6 changes: 6 additions & 0 deletions src/Setting.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
import { html, property, query, TemplateResult } from 'lit-element';
import { registerTranslateConfig, translate, use } from 'lit-translate';

import '@material/mwc-button';
import '@material/mwc-dialog';
import '@material/mwc-formfield';
import '@material/mwc-list/mwc-list-item';
import '@material/mwc-select';
import '@material/mwc-switch';
import { Dialog } from '@material/mwc-dialog';
import { Select } from '@material/mwc-select';
import { Switch } from '@material/mwc-switch';
Expand Down
3 changes: 2 additions & 1 deletion src/Waiting.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { html, property, TemplateResult } from 'lit-element';

import '@material/mwc-circular-progress-four-color';

import {
LitElementConstructor,
Mixin,
PendingStateDetail,
ifImplemented,
newLogEvent,
} from './foundation.js';

/** Mixin implementing
Expand Down
10 changes: 6 additions & 4 deletions src/editor-container.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@ import {
} from 'lit-element';
import { classMap } from 'lit-html/directives/class-map';

import { newWizardEvent, SCLTag, tags } from './foundation.js';

import { emptyWizard, wizards } from './wizards/wizard-library.js';

import '@material/mwc-icon-button';
import '@material/mwc-list/mwc-list-item';
import '@material/mwc-menu';
import { Menu } from '@material/mwc-menu';
import { IconButton } from '@material/mwc-icon-button';
import { ListItem } from '@material/mwc-list/mwc-list-item';

import { newWizardEvent, SCLTag, tags } from './foundation.js';
import { emptyWizard, wizards } from './wizards/wizard-library.js';

function childTags(element: Element | null | undefined): SCLTag[] {
if (!element) return [];

Expand Down
4 changes: 2 additions & 2 deletions src/editors/Communication.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { LitElement, html, TemplateResult, property, css } from 'lit-element';
import { translate, get } from 'lit-translate';

import '@material/mwc-fab';

import {
newWizardEvent,
newActionEvent,
createElement,
} from '../foundation.js';

import { selectors, styles } from './communication/foundation.js';

import './communication/subnetwork-editor.js';
import { subNetworkWizard } from './communication/subnetwork-editor.js';

Expand Down
5 changes: 3 additions & 2 deletions src/editors/Substation.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { LitElement, html, TemplateResult, property, css } from 'lit-element';
import { get } from 'lit-translate';

import { newWizardEvent } from '../foundation.js';
import { wizards } from '../wizards/wizard-library.js';
import '@material/mwc-fab';

import '../zeroline-pane.js';
import { newWizardEvent } from '../foundation.js';
import { wizards } from '../wizards/wizard-library.js';

/** An editor [[`plugin`]] for editing the `Substation` section. */
export default class SubstationPlugin extends LitElement {
Expand Down
8 changes: 6 additions & 2 deletions src/editors/Templates.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
import { LitElement, html, TemplateResult, property, css } from 'lit-element';
import { translate } from 'lit-translate';

import '@material/mwc-fab';
import '@material/mwc-icon-button';
import '@material/mwc-list';
import '@material/mwc-list/mwc-list-item';

import '../filtered-list.js';
import {
createElement,
identity,
Expand All @@ -9,8 +15,6 @@ import {
} from '../foundation.js';
import { styles } from './templates/foundation.js';

import '../filtered-list.js';

import {
createEnumTypeWizard,
eNumTypeEditWizard,
Expand Down
12 changes: 9 additions & 3 deletions src/editors/communication/connectedap-editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,18 @@ import {
import { ifDefined } from 'lit-html/directives/if-defined';
import { translate, get } from 'lit-translate';

import '@material/mwc-checkbox';
import '@material/mwc-fab';
import '@material/mwc-formfield';
import '@material/mwc-list/mwc-list-item';
import '@material/mwc-list/mwc-check-list-item';
import '@material/mwc-icon';
import { Checkbox } from '@material/mwc-checkbox';
import { List } from '@material/mwc-list';
import { ListItemBase } from '@material/mwc-list/mwc-list-item-base';

import '../../wizard-textfield.js';
import '../../filtered-list.js';
import {
EditorAction,
newWizardEvent,
Expand All @@ -25,16 +33,14 @@ import {
createElement,
ComplexAction,
} from '../../foundation.js';

import { selectors } from './foundation.js';
import {
getTypes,
typePattern,
typeNullable,
typeMaxLength,
} from './p-types.js';

import { selectors } from './foundation.js';

/** Data needed to uniquely identify an `AccessPoint` */
interface apAttributes {
iedName: string;
Expand Down
7 changes: 4 additions & 3 deletions src/editors/communication/subnetwork-editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ import {
} from 'lit-element';
import { translate, get } from 'lit-translate';

import '@material/mwc-icon-button';

import '../../wizard-textfield.js';
import './connectedap-editor.js';
import {
EditorAction,
newWizardEvent,
Expand All @@ -22,10 +26,7 @@ import {
createElement,
cloneElement,
} from '../../foundation.js';

import { styles, WizardOptions, isCreateOptions } from './foundation.js';

import './connectedap-editor.js';
import { createConnectedApWizard } from './connectedap-editor.js';

/** Initial attribute values suggested for `SubNetwork` creation */
Expand Down
5 changes: 4 additions & 1 deletion src/editors/substation/guess-wizard.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import { html } from 'lit-html';
import { html } from 'lit-element';
import { get, translate } from 'lit-translate';

import '@material/mwc-list';
import '@material/mwc-list/mwc-check-list-item';

import { List } from '@material/mwc-list';
import { ListItemBase } from '@material/mwc-list/mwc-list-item-base';

Expand Down
17 changes: 11 additions & 6 deletions src/editors/templates/datype-wizards.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
import { html } from 'lit-element';
import { get, translate } from 'lit-translate';

import '@material/mwc-button';
import '@material/mwc-list';
import '@material/mwc-list/mwc-list-item';
import '@material/mwc-select';
import { List } from '@material/mwc-list';
import { ListItem } from '@material/mwc-list/mwc-list-item';
import { Select } from '@material/mwc-select';
import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation';

import '../../wizard-textfield.js';
import {
Create,
EditorAction,
Expand All @@ -14,19 +24,14 @@ import {
WizardActor,
WizardInput,
} from '../../foundation.js';
import { createBDAWizard, editBDAWizard } from '../../wizards/bda.js';
import {
addReferencedDataTypes,
allDataTypeSelector,
unifyCreateActionArray,
updateIDNamingAction,
} from './foundation.js';

import { List } from '@material/mwc-list';
import { ListItem } from '@material/mwc-list/mwc-list-item';
import { Select } from '@material/mwc-select';
import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
import { createBDAWizard, editBDAWizard } from '../../wizards/bda.js';

export function editDaTypeWizard(
dATypeIdentity: string,
doc: XMLDocument
Expand Down
20 changes: 12 additions & 8 deletions src/editors/templates/dotype-wizards.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
import { html } from 'lit-html';
import { get, translate } from 'lit-translate';

import '@material/mwc-button';
import '@material/mwc-list';
import '@material/mwc-list/mwc-list-item';
import '@material/mwc-select';
import { Select } from '@material/mwc-select';
import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
import { ListItem } from '@material/mwc-list/mwc-list-item';
import { List } from '@material/mwc-list';

import '../../wizard-textfield.js';
import {
cloneElement,
Create,
Expand All @@ -16,7 +26,8 @@ import {
WizardActor,
WizardInput,
} from '../../foundation.js';

import { createDaWizard, editDAWizard } from '../../wizards/da.js';
import { patterns } from '../../wizards/foundation/limits.js';
import {
addReferencedDataTypes,
allDataTypeSelector,
Expand All @@ -26,13 +37,6 @@ import {
WizardOptions,
} from './foundation.js';

import { Select } from '@material/mwc-select';
import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
import { ListItem } from '@material/mwc-list/mwc-list-item';
import { List } from '@material/mwc-list';
import { createDaWizard, editDAWizard } from '../../wizards/da.js';
import { patterns } from '../../wizards/foundation/limits.js';

function updateSDoAction(element: Element): WizardActor {
return (inputs: WizardInput[]): EditorAction[] => {
const name = getValue(inputs.find(i => i.label === 'name')!)!;
Expand Down
15 changes: 10 additions & 5 deletions src/editors/templates/enumtype-wizard.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
import { html } from 'lit-element';
import { get, translate } from 'lit-translate';

import '@material/mwc-button';
import '@material/mwc-list';
import '@material/mwc-list/mwc-list-item';
import '@material/mwc-select';
import { List } from '@material/mwc-list';
import { ListItem } from '@material/mwc-list/mwc-list-item';
import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
import { Select } from '@material/mwc-select';

import '../../wizard-textfield.js';
import {
cloneElement,
createElement,
Expand All @@ -23,11 +33,6 @@ import {
WizardOptions,
} from './foundation.js';

import { List } from '@material/mwc-list';
import { ListItem } from '@material/mwc-list/mwc-list-item';
import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
import { Select } from '@material/mwc-select';

function nextOrd(parent: Element): string {
const maxOrd = Math.max(
...Array.from(parent.children).map(child =>
Expand Down
2 changes: 2 additions & 0 deletions src/editors/templates/foundation.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { css, html, TemplateResult } from 'lit-element';
import { ifDefined } from 'lit-html/directives/if-defined';

import '@material/mwc-list/mwc-list-item';

import {
cloneElement,
Create,
Expand Down
Loading