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.

Sign up for GitHub

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

chore: fix divergent files in compas package #297

Merged
merged 4 commits into from
Dec 7, 2023
Merged

chore: fix divergent files in compas package #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
14cce51
chore: fix divergent files in compas package
Stef3st Nov 20, 2023
3696b7d
chore: fixed divergent files in compas openscd
Stef3st Nov 23, 2023
1150034
chore: fixed import
Stef3st Nov 23, 2023
b414b9c
Merge branch 'main' into 294-fix-divergent-files-in-compas-open-scd-v…
juancho0202 Dec 4, 2023
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
457 changes: 0 additions & 457 deletions packages/compas-open-scd/src/Editing.ts
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions packages/compas-open-scd/src/Plugging.ts
View file
Open in desktop
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just talked to Sander and mentioned how ridiculous it is that we're modifying the Plugging mixin only to account for the OCL Validator being tagged as "WIP" and I told him if it's ok we just remove the plugin from the plugin.js list and so this file can be removed as well.

Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { Switch } from '@material/mwc-switch';
import { TextField } from '@material/mwc-textfield';

import { ifImplemented, Mixin } from 'open-scd/src/foundation.js';
import { EditingElement } from './Editing.js';
import { EditingElement } from 'open-scd/src/Editing.js';
import { officialPlugins } from '../public/js/plugins.js';
import { Nsdoc } from 'open-scd/src/foundation/nsdoc.js';
import { HistoringElement } from './Historing.js';
Expand Down Expand Up @@ -99,7 +99,7 @@ function staticTagHtml(

type PluginKind = 'editor' | 'menu' | 'validator';
const menuPosition = ['top', 'middle', 'bottom'] as const;
type MenuPosition = typeof menuPosition[number];
type MenuPosition = (typeof menuPosition)[number];

export type Plugin = {
name: string;
Expand Down
2 changes: 1 addition & 1 deletion packages/compas-open-scd/src/Setting.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
import { Language, languages, loader } from './translations/loader.js';

import 'open-scd/src/WizardDivider.js';
import { WizardDialog } from './wizard-dialog.js';
import { WizardDialog } from 'open-scd/src/wizard-dialog.js';

import {
iec6185072,
Expand Down
2 changes: 1 addition & 1 deletion packages/compas-open-scd/src/compas/Compasing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { html, query, state, property, TemplateResult } from 'lit-element';

import { Mixin } from 'open-scd/src/foundation.js';
import { EditingElement } from '../Editing.js';
import { EditingElement } from 'open-scd/src/Editing.js';

import { CompasUserInfoService } from '../compas-services/CompasUserInfoService.js';

Expand Down
2 changes: 1 addition & 1 deletion packages/compas-open-scd/src/menu/CompasUpdateSubstation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { get } from 'lit-translate';
import { newWizardEvent, Wizard } from 'open-scd/src/foundation.js';

import { DocRetrievedEvent } from '../compas/CompasOpen.js';
import { mergeSubstation } from './UpdateSubstation.js';
import { mergeSubstation } from 'open-scd/src/menu/UpdateSubstation.js';

import '../compas/CompasOpen.js';

Expand Down
150 changes: 0 additions & 150 deletions packages/compas-open-scd/src/menu/UpdateSubstation.ts
View file
Open in desktop

This file was deleted.

7 changes: 5 additions & 2 deletions packages/compas-open-scd/src/open-scd.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@ import {

import { ListItem } from '@material/mwc-list/mwc-list-item';

import { newOpenDocEvent, newPendingStateEvent } from 'open-scd/src/foundation.js';
import {
newOpenDocEvent,
newPendingStateEvent,
} from 'open-scd/src/foundation.js';
import { getTheme } from 'open-scd/src/themes.js';

import { Editing } from './Editing.js';
import { Editing } from 'open-scd/src/Editing.js';
import { Hosting } from './Hosting.js';
import { Historing } from './Historing.js';
import { Plugging } from './Plugging.js';
Expand Down
Loading