chore: resolves upstream conflicts #3
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* ci: add test github action on push * ci: fix incorrect worksflows path * ci: fix syntax error in test action * ci: add test and build action for pull requests * ci: add github action to deploy on openscd.github.io
* feat(foundation): add object/array depth utility function This function returns the (possibly infinite) depth of the nested Array/Object given as the first argument, or zero if not given an Array or Object as an argument. * feat: add finder-list component This adds a finder-list component modeled after the previous finder-pane but with the "getContents" method renamed to "read" and an additional boolean attribute "multi" which may be set to allow simultaneous selection of multiple entries at every level of the hierarchy. * refactor(menu/Help): replace finder-pane with finder-list * refactor: remove finder-pane * feat(finder-list): add methods to overwrite list item text and search field label * test(finder-list): update snapshots * chore(package): upgrade lockfile * fix(finder-list): fix getPaths with provided depth * test(finder-list): getTitle and getDisplayString * fix(finder-list): don't display leaf node content * feat(filtered-list): add abbr to search field (openscd#339) * feat(wizards/fcda): add create FCDAs capability (openscd#345) * feat(wizard/foundation): add function for data model navigation * feat(wizards/fcda): add create wizard based in finder-list * test(wizards/fcda): refactor unit tests * feat(wizarding/dataset): add ADD FCDA button to edit wizard * test(wizards/fcda): add integration test * refactor(wizards/fcda): change create function name Co-authored-by: Jakob Vogelsang <jakob.vogelsang@omicronenergy.com> Co-authored-by: Jakob Vogelsang <jakob-vogelsang@posteo.de>
* fix(editor-container): prevent margin collapse * refactor(editor-container): remove child slot name * fix(editor-container): make sure focus is triggered for slotted elements * fix(editor-container): make sure menu is in the right upper corner
* refactor(wizards/fcda): select all FCDA of wizard initialization * fix(foundation): fCDAIndentity * feat(wizards/fcda): remove unselected FCDA with update action
* fix(editor-container): missing tabindex on root editor-container * test: adapt snapshots * refactor(substation-editor): remove unused section close tag * fix(editor-container): remove overflow set padding to prevent margin collapse
…penscd#325) * refactor(foundation): change EditorAction api make reference optional * refactor(Editor): get reference onAction with undefined reference * test(Editing): add integration test * fix(lnodetype-wizard): fix getReference with addig LNodeType from template * refactor(templates): remove reference from create actions * refactor(communication): remove reference from create actions * refactor(substation): remove reference from create action * refactor(templates): remove reference from create action * refactor(communication mapping): remove reference from create action * refactor(iedimport): remove reference from create action
…l description (openscd#374) * fix(foundation): extRefIdentity definition * feat(menu/UpdateDescriptionABB): add with unit tests * test(menu/UpdateDescriptionABB): add integration tests * refactor(menu/UpdateDescriptionABB): add translations * test(menu/UpdateDescriptionABB): improve unit tests * refactor(menu/updatedescABB): minor improvement triggered by review * refactor(menu/updatedescABB): minor improvement triggered by review
…enscd#400) * feat: add action-pane component The new action-pane component is the extraction of the pure user interface part of the old editor-container component, meant to replace the latter while being usable in a more generic way. * refactor: use action-pane in place of editor-container * refactor(zeroline): use action pane (openscd#399) * refactor(zeroline): allow adding child elements to action-pane * style(action-pane): adapt styling * test(action-pane): add unit tests Co-authored-by: Jakob Vogelsang <jakob-vogelsang@posteo.de>
* Added initial Single Line Diagram editor * Fixing unit tests * First batch * Every element is a group now * Bit of refactoring * Bit of refactoring * Refactoring * Added Connectivity Node route drawing * Some refactoring * refactoring * Added terminal check for Connectivity Nodes * Very small refactoring * Finalized BusBar * First try using equipment icons * Added elements * refactoring * Added first SingleLineDiagram unit test * Fixing build * Added unit tests for foundation * Remove panzoom temporary, because it's not working correctly during testing * Small refactoring * Added different text size for different components * Remove text from Connectivity Node * Added unit tests * Added terminals * small refactoring * Refactoring * Refactoring * More refactoring * More refactoring * More refactoring + adding Panzoom * Review comment * Work after review * Removed embedded SVG implementation * refactor: make eslint happy * refactor(SingleLineDiagram): filter for ConnecitvityNode grounded * refactor(editors/singlelinediagram/sld-drawing): make use of the transform attribute * test(editors/singlelinediagram/sld-drawing): remove osolet tests * refactor(SingleLineDiagram): hide overflow of SLD * refactor: use identity string as identifier * refactor(singlelinediagram/sld-drawing): import connectivityNode directly * feat(icons): add two winding power transformer icon * refactor(SingleLineDiagram): simplify position/coordinates handling * refactor: simplify bas bar length calculation * feat(SingleLineDiagram): add PowerTransformer to SLD * fix(SingleLineDiagram): not connected route in SLD Editor (openscd#391) * Intermediate commit * Added default dimensions for ConductingEquipment * Slow revert * Make ESLint happy * Small refactoring * Removed drawRoute alias Co-authored-by: Rob Tjalma <rob@tjalma.com> * Added terminal and Connectivity Node information (openscd#402) * Added terminal/connectivity node information * Removed console.log * Some refactoring * Small refactoring * fix(translations/de): add missing German translations Thank you very much for adding these nice wizards to translate! 👍 Co-authored-by: Rob Tjalma <rob@tjalma.com> Co-authored-by: Christian Dinkel <chhildeb@gmail.com> Co-authored-by: Rob Tjalma <rob@tjalma.com> Co-authored-by: Jakob Vogelsang <jakob.vogelsang@omicronenergy.com> Co-authored-by: Christian Dinkel <chhildeb@gmail.com>
* chore: add initial web-test-runner config * refactor: distrubute custom element import statements (openscd#395) * refactor: distribute custom element imports * test: import statements in unit and integratons tests * fix: add missing import statements Co-authored-by: Christian Dinkel <chhildeb@gmail.com> * chore: remove karma config * test: remove karma path definition to testfiles * test: downgrade open-wc/testing and wtr to avoid lit2.0 collision * test: await equalSnapshot * chore: update package and package-lock * chore: update package-lock after rebase * test: remove karma base path * test: add unit and integration test group * test: add missing --group on script test * chore(web-test-runner): run tests directly on *.ts files * refactor: remove escapes from pattern string definition - conflit with wtr snapshot generation * test: remove karma snapshots add wtr snapshots * chore: update package-lock * test: make zero-line unit test fail save * chore: move snowpack config to snopack.config file Co-authored-by: Jakob Vogelsang <jakob.vogelsang@omicronenergy.com> Co-authored-by: Jakob Vogelsang <jakob-vogelsang@posteo.de>
…sion (openscd#403) * feat(SingleLineDiagram): add ortho-connector pathfinding algorithm * refactor(SingleLineDiagram): move to new ortho-connecotr * test(SingleLineDiagram): fix and add unit tests * Small unit test fix * refactor(sld-drawing): rebase to main * test: disable invalid SingleLineDiagram.test.ts * test: remove invalid SingleLineDiagram test * refactor(ortho-connector): improve performance * test(connectivitynode): add snapshot test * test(wizards/terminal): add snapshot test * fix(singlelinediagram/foundation): fail save connectivitynode allocation Co-authored-by: Rob Tjalma <rob@tjalma.com>
* Added Edit Wizard to ConductingEquipments * Whole g element is now clickable * fix(SingleLineDiagram/sld-drawing): make click event on ConductingEquipment optional Co-authored-by: Rob Tjalma <rob@tjalma.com> Co-authored-by: Jakob Vogelsang <jakob.vogelsang@omicronenergy.com>
Small fix for connecting routes to Connectivity Nodes
* feat(action-icon): add new web-component * refactor(conducting-equipment-editor): use action-icon (openscd#417) * refactor(conducting-equipment-editor): use action-icon * fix(condicting-equpment-editor): add missing import statement * refactor(ied-editor): use action-icon (openscd#418) * refactor(communication/connectedap-editor): use action-icon (openscd#420) * style(action-icon): make sure footer transform does not effect parent CSS (openscd#419) * fix(action-icon): make sure footer transform does not effect other CSS * refactor(action-icon): improve styling * refactor(action-icon): adjust action timing for header * test(action-icon): adapt snapshots * style(action-icon): minor changes Co-authored-by: Jakob Vogelsang <jakob.vogelsang@omicronenergy.com> Co-authored-by: Jakob Vogelsang <jakob-vogelsang@posteo.de>
* Initial test with 12 characters * Allow footer text in action-icon to be full size
…nt (openscd#449) * Added selector on Substation so the User can select wihich Substation to show. Signed-off-by: Dennis Labordus <dennis.labordus@alliander.com> * Refactor drawing the SLD. And fixed bug of missing cNodes. Signed-off-by: Dennis Labordus <dennis.labordus@alliander.com> * Fixed review comments. Signed-off-by: Dennis Labordus <dennis.labordus@alliander.com> * Fixed review comments. Signed-off-by: Dennis Labordus <dennis.labordus@alliander.com> * Fixed review comments. Signed-off-by: Dennis Labordus <dennis.labordus@alliander.com>
…D for Busbar/ConductingEquipment/PowerTransformer (openscd#455) * In SLD X/Y Coordinates can be updated with a Dialog. Also made changes to drawing the SLD regarding groups. * In SLD X/Y Coordinates can be updated with a Dialog. Also made changes to drawing the SLD regarding groups. * Auto size the SVG and configure the panzoom. * Added more tests for the wizards of SLD. * Updated German translation for new labels. * Fixed entering negative or invalid numbers, will set coordinate to zero. * Review comments.
* Added IED Container * Added tests * Added Access Point container * Added Server container * Added LDevice container * Added LN Container * Added DO container * Fixing unit tests IED container * Fixing Unit tests AccessPoint container * Fixing Unit tests Server container * Fix unit tests LDevice container * Added padding * fix broken test * Fixing LN container unit tests * Added IED drop down * Small addition * Added integration test for IED filter * Small refactoring * IED list is now ordered alphabetically * Refactoring * Added check for available IEDs * First batch of review adjustments * Second batch of review stuff * Some more refactoring * Batch review comments * Batch review comments * refactor(editors/IED): add german translation * feat(editors/ied): add DO elements to IED editor (openscd#454) * Added DO/SDO elements * Added DO/SDO/DOI/SDI * Added unit tests ln-container * Made methods private in ln-container * Added do-container snapshot tests * Added batch of do-container unit tests * Review comments Co-authored-by: Rob Tjalma <rob@tjalma.com> * Added basic DA container for DA/DAI show * Added BDA container * Added value css * Added Enum container * Refactoring * Refactoring + Adding Unit Tests * Added Enum Tests * Small refactoring * First review comments + Added toggle action * Bugfix when showing DA data * Small refactoring * Added toggle test for ln-container * refactor(ied/da-container,do-container): code improvements * Added consistent toggle functionality * Added da container unit tests * Added da container unit tests * Small typo * Revert browserLogs to false Co-authored-by: Jakob Vogelsang <jakob.vogelsang@omicronenergy.com> Co-authored-by: Jakob Vogelsang <jakob-vogelsang@posteo.de>
fix(editors/SingleLineDiagram): Switching substation will recalculated viewbox and reset panzoom
…penscd#469) * fix(editors/template/lnodetype-wizards): fix incorrect pattern for lnClass * test(editors/template/lnodetype): update snapshot
…penscd#448) * refactor(wizards/connectedap): move wizards * refactor(wizards/connectedap): edit wizard and its imports * test(wizards/connectedap): move wizarding tests to unit test * refactor(wizards/connectedap): update action and its tests * refactor(wizards/connectedap): create wizard its action and tests * test(connected-ap): remove leftover snapshot * refactor(wizards/connected-ap): better function naming * test(wizards/connectedap): better naming
* feat(foundation): allow dynamic wizards * test: adapt tests
openscd#424) * feat(menu/UpdateDescriptionSEL): add plug-in menu type plugin * feat(menu/UpdateDescriptionSEL): add unit tests * refactor(menu/UpdateDescriptionSEL): add better csv parser * test(menu/UpdateDescriptionSEL): update open-scd snapshot
…penscd#477) * feat(wizards/sampledvaluecontrol): add select wizard * feat(zeroline-pane): add button to trigger SMV select wizard * feat(zeroline/ied-editor): access SampledValueControl elements
…ion` (openscd#720) * feat(editors/substation/conductingequipment): allow to toggle action-icon/action-pane use * feat(editors/substation/powertransformer): allow to toggle action-icon/action-pane use * refactor(editors/substation): pass showfunctions to ConductingEquipment/PowerTransformer * fix: missing import statements * fix: typos * feat(editors/substation): add eq-function-editor (openscd#722) * feat(editors/substation/eqfunction): add action-pane based editor * feat(editors/substation): show read-only eqfunction * refactor: review request * feat(editors/substation): add read-only eq-sub-function-editor (openscd#726) * refactor(editors/substation/sub-function-editor): rename custom element * refactor(editors/substation/...function-editor): restrict access to properties and methods
…el/Bay name. (openscd#712) * Update attributes of Terminal when updating VoltageLevel/Bay name. * Added extra reference tests. * Small change. * Improved version that will include parent names when needed to search for matching references. * Fixed review comment.
… in the Subscription Editor
openscd#732) * Add action to remove IED, including references. * Updated German translations. * Fixed small issues. * Added remove button to IED Editor. * Refactor cleanup Inputs and add logic to removing IED. * Updated comments.
* feat(editors/substation): add read-only l-node-editor * feat(editors/subtation): add l-node-editor to ConductingEquipment * feat(editors/subtation): add l-node-editor to PowerTransformer * feat(editors/subtation): add l-node-editor to EqSubFunction * feat(editors/subtation): add l-node-editor to EqFunction * feat(editors/subtation): add l-node-editor to SubFunction * feat(editors/subtation): add l-node-editor to Function * feat(editors/subtation): add l-node-editor to Bay * feat(editors/subtation): add l-node-editor to VoltageLevel * feat(editors/subtation): add l-node-editor to Substation * merge with first * style(action-icon): propper highlight of focused secondary items * fix(editors/substation): unify rendering of LNode container * feat(action-icon): add hideActions property (openscd#752) * feat(action-icon): add noaction property * test(editors/substation/l-node-editor): update snapshot * refactor(action-icon): resolve review comments
… EqFunction and EqSubFunction element (openscd#731) * feat(wizards/function): add create wizard * feat(wizard/wizard-library): add create wizard for Function element * feat(wizards/subfunction): add create wizard (openscd#733) * feat(wizards/subfunction): add create wizard * feat(editors/substation/sub-function-editor): add add button * feat(wizards/eqfunction): add create wizard (openscd#737) * feat(wizards/eqsubfunction): add create wizard (openscd#757) * test(editors/substation): update snapshots
Since we're no longer running tests on Travis CI we should no longer need this file IMO.
…nscd#761) * feat(editors/substation/function-editor): add remove button * feat(editors/substation/sub-function-editor): add remove button * feat(editors/substation/eq-function-editor): add remove button * feat(editors/substation/eq-sub-function-editor): add remove button
* feat(wizards/function): add edit wizard (openscd#762) * feat(wizards/function): add edit wizard * test(editors/substation/function-editor): make linter happy * refactor(wizards/function): review comments * feat(wizards/subfunction): add edit wizard (openscd#763) * feat(wizards/eqfunction): add edit wizard (openscd#764) * feat(wizards/eqfunction): add edit wizard * refactor(wizards/eqfunction): review comments * feat(wizards/eqsubfunction): add edit wizard (openscd#765) * feat(wizards/eqsubfunction): add edit wizard * refactor(wizards/eqsubfunction): review comments
* refactor(foundation): change menu action API * fix(wizards/ied): add missing import statement
* feat(editor/substation/l-node-editor): add remmove button * refactor(editors/substation/l-node-editor): better naming
…te (openscd#781) * fix(wizard-textfield): make disabled work properly * fix(wizard-checkbox): make disabled work properly * fix(wizard-select): make disabled work properly
* Show edit button using CSS instead of JS, partially closes openscd#746 * Add hover css to dataset container, update snapshot for control blocks
openscd#766) * refactor(foundation): change menu action API * feat(wizards/lnode): add create wizards * feat(wizards/wizard-library): add LNode create wizard to library * test(editors/substation): test LNode instatiotion with function type editors * refactor(wizards/lnode): combine reference type and instace type wizard * fix(wizard-libraray): import statement * refactor(wizards/lnode): triggered by review * refactor(wizards/lnode): better uniqueLnInst function * refactor(wizards/lnode): better search for uniqeu lnInst * test(wizards/lnode): better test unique lnInst selection * fix(wizard-dialog): stabilize jump to initial page This fixes the issue we had when opening the LNode instance reference create wizard from the overflow menu of the LNodeType reference create wizard. Co-authored-by: Christian Dinkel <christian.dinkel@omicronenergy.com>
* feat(wizards/lnode): add edit wizard * test(wizards/lnode): add editing integration * test(wizards/lnode): fix snapshots * refactor(translation/de): better localization
…#782) * refactor(wizards/lnode): move lnInst generator function to foundation * feat(editors/substation/l-node-editor): add copy content button * refactor: on review comments
…penscd#787) * refactor(plugging,hosting): make plugin content loading synchronous * chore(package): remove carehtml dependency * refactor(Plugging,Hosting): make plugin content static * fix(plugging): don't store content to localStorage * test(open-scd): update snapshot * fix(nsdoc/Plugging): pass nsdoc object to plugins again Loading nsdoc from localStorage must not be asynchronous. It therefore can be used as is with the refactored plugin loading mechanism * refactor(Plugging/Setting): avoid reloading nsdoc on re-render * docs(plugging): add type annotations and doc links Co-authored-by: Jakob Vogelsang <jakob-vogelsang@posteo.de>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.