From a16a44208a4b2a2dd99cb0cf506c5ab68fb9855a Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 10 Dec 2019 16:44:54 -0800 Subject: [PATCH 1/4] Fixes Notebook and Inspector layout issues (#2568) * Fix linting-related issues * Fix Notebook overlay display issues --- .../res/templates/snapshotTemplate.html | 48 +++++------ src/styles/_layout.scss | 86 +++++++++++++++++++ src/styles/core.scss | 1 + src/styles/notebook.scss | 19 +++- src/ui/inspector/Properties.vue | 4 +- src/ui/layout/BrowseBar.vue | 68 --------------- 6 files changed, 131 insertions(+), 95 deletions(-) create mode 100644 src/styles/_layout.scss diff --git a/src/plugins/notebook/res/templates/snapshotTemplate.html b/src/plugins/notebook/res/templates/snapshotTemplate.html index 8ca8116ca6..5bd3220409 100644 --- a/src/plugins/notebook/res/templates/snapshotTemplate.html +++ b/src/plugins/notebook/res/templates/snapshotTemplate.html @@ -1,29 +1,29 @@ -
- -
-
-
-
-
-
{{embed.name}}
-
+
+ +
+
+
+ + {{embed.name}} +
-
-
-
- SNAPSHOT {{formatTime(embed.createdOn, 'YYYY-MM-DD HH:mm:ss')}} -
- - Annotate - -
- -
-
+
+
+ SNAPSHOT {{formatTime(embed.createdOn, 'YYYY-MM-DD HH:mm:ss')}} +
+ + Annotate +
-
\ No newline at end of file + +
+
+
+
diff --git a/src/styles/_layout.scss b/src/styles/_layout.scss new file mode 100644 index 0000000000..2bc17c1dfb --- /dev/null +++ b/src/styles/_layout.scss @@ -0,0 +1,86 @@ +/***************************************************************************** + * Open MCT, Copyright (c) 2014-2018, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT is 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. + * + * Open MCT includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +/************************** BROWSE BAR */ +.l-browse-bar { + display: flex; + align-items: center; + justify-content: space-between; + + [class*="__"] { + // Removes extraneous horizontal white space + display: inline-flex; + } + + &__start { + display: flex; + align-items: center; + flex: 1 1 auto; + margin-right: $interiorMargin; + min-width: 0; // Forces interior to compress when pushed on + } + + &__end { + display: flex; + align-items: center; + flex: 0 0 auto; + + [class*="__"] + [class*="__"] { + margin-left: $interiorMarginSm; + } + } + + &__nav-to-parent-button, + &__disclosure-button { + flex: 0 0 auto; + } + + &__nav-to-parent-button { + // This is an icon-button + $p: $interiorMargin; + margin-right: $interiorMargin; + padding-left: $p; + padding-right: $p; + + .is-editing & { + display: none; + } + } + + &__object-name--w { + align-items: center; + display: flex; + flex: 0 1 auto; + @include headerFont(1.4em); + min-width: 0; + + &:before { + // Icon + opacity: 0.5; + margin-right: $interiorMargin; + } + } + + &__object-name { + flex: 0 1 auto; + } +} diff --git a/src/styles/core.scss b/src/styles/core.scss index 7539b928fc..f83ee9ed12 100644 --- a/src/styles/core.scss +++ b/src/styles/core.scss @@ -29,6 +29,7 @@ @import "global"; @import "status"; @import "controls"; +@import "layout"; @import "forms"; @import "table"; @import "legacy"; diff --git a/src/styles/notebook.scss b/src/styles/notebook.scss index ec3f1748d5..3d1ef5ee48 100644 --- a/src/styles/notebook.scss +++ b/src/styles/notebook.scss @@ -25,7 +25,6 @@ .c-notebook { - //@include test(orange); display: flex; flex-direction: column; overflow: hidden; @@ -35,6 +34,24 @@ bottom: 0px; left: 0px; + &-snapshot { + flex: 1 1 auto; + display: flex; + flex-direction: column; + + > * + * { + margin-top: $interiorMargin; + } + + &__header { + flex: 0 0 auto; + } + + &__image { + flex: 1 1 auto; + } + } + > [class*="__"] + [class*="__"] { margin-top: $interiorMargin; } diff --git a/src/ui/inspector/Properties.vue b/src/ui/inspector/Properties.vue index b6a529a866..49efd6790f 100644 --- a/src/ui/inspector/Properties.vue +++ b/src/ui/inspector/Properties.vue @@ -30,7 +30,7 @@
Created
-
+
{{ formatTime(item.created) }}
@@ -41,7 +41,7 @@
Modified
-
+
{{ formatTime(item.modified) }}
diff --git a/src/ui/layout/BrowseBar.vue b/src/ui/layout/BrowseBar.vue index 31085fe108..a473b21bb8 100644 --- a/src/ui/layout/BrowseBar.vue +++ b/src/ui/layout/BrowseBar.vue @@ -276,71 +276,3 @@ export default { } } - - From 8ec1b9965a88103738f4544805e328a0fb5f2428 Mon Sep 17 00:00:00 2001 From: Andrew Henry Date: Wed, 11 Dec 2019 10:28:47 -0800 Subject: [PATCH 2/4] Updates to README in topic-core-refactor (#2573) * Updates to README in topic-core-refactor In preparation for merge into Master * Added section on v1.0.0 and link to Migration Guide * Minor wording change * More minor wording changes --- README.md | 96 +++++++++++++++---------------------------------------- 1 file changed, 26 insertions(+), 70 deletions(-) diff --git a/README.md b/README.md index 30666a7a30..40752aa0d5 100644 --- a/README.md +++ b/README.md @@ -9,26 +9,6 @@ Please visit our [Official Site](https://nasa.github.io/openmct/) and [Getting S Try Open MCT now with our [live demo](https://openmct-demo.herokuapp.com/). ![Demo](https://nasa.github.io/openmct/static/res/images/Open-MCT.Browse.Layout.Mars-Weather-1.jpg) -## New API - -A simpler, [easier-to-use API](https://nasa.github.io/openmct/docs/api/) -has been added to Open MCT. Changes in this -API include a move away from a declarative system of JSON configuration files -towards an imperative system based on function calls. Developers will be able -to extend and build on Open MCT by making direct function calls to a public -API. Open MCT is also being refactored to minimize the dependencies that using -Open MCT imposes on developers, such as the current requirement to use -AngularJS. - -This new API has not yet been heavily used and is likely to contain defects. -You can help by trying it out, and reporting any issues you encounter -using our GitHub issue tracker. Such issues may include bugs, suggestions, -missing documentation, or even just requests for help if you're having -trouble. - -We want Open MCT to be as easy to use, install, run, and develop for as -possible, and your feedback will help us get there! - ## Building and Running Open MCT Locally Building and running Open MCT in your local dev environment is very easy. Be sure you have [Git](https://git-scm.com/downloads) and [Node.js](https://nodejs.org/) installed, then follow the directions below. Need additional information? Check out the [Getting Started](https://nasa.github.io/openmct/getting-started/) page on our website. @@ -48,9 +28,14 @@ Building and running Open MCT in your local dev environment is very easy. Be sur Open MCT is now running, and can be accessed by pointing a web browser at [http://localhost:8080/](http://localhost:8080/) +## Open MCT v1.0.0 +This represents a major overhaul of Open MCT with significant changes under the hood. We aim to maintain backward compatibility but if you do find compatibility issues, please let us know by filing an issue in this repository. If you are having major issues with v1.0.0 please check-out the v0.15.0 tag until we can resolve them for you. + +If you are migrating an application built with Open MCT as a dependency to v1.0.0 from an earlier version, please refer to [our migration guide](https://nasa.github.io/openmct/documentation/migration-guide). + ## Documentation -Documentation is available on the [Open MCT website](https://nasa.github.io/openmct/documentation/). The documentation can also be built locally. +Documentation is available on the [Open MCT website](https://nasa.github.io/openmct/documentation/). ### Examples @@ -58,48 +43,29 @@ The clearest examples for developing Open MCT plugins are in the [tutorials](https://github.com/nasa/openmct-tutorial) provided in our documentation. -For a practical example of a telemetry adapter, see David Hudson's -[Kerbal Space Program plugin](https://github.com/hudsonfoo/kerbal-openmct), -which allows [Kerbal Space Program](https://kerbalspaceprogram.com) players -to build and use displays for their own missions in Open MCT. +We want Open MCT to be as easy to use, install, run, and develop for as +possible, and your feedback will help us get there! Feedback can be provided via [GitHub issues](https://github.com/nasa/openmct/issues), or by emailing us at [arc-dl-openmct@mail.nasa.gov](mailto:arc-dl-openmct@mail.nasa.gov). -Additional examples are available in the `examples` hierarchy of this -repository; however, be aware that these examples are -[not fully-documented](https://github.com/nasa/openmct/issues/846), so -the tutorials will likely serve as a better starting point. +## Building Applications With Open MCT -### Building the Open MCT Documentation Locally -Open MCT's documentation is generated by an -[npm](https://www.npmjs.com/)-based build. It has additional dependencies that -may not be available on every platform and thus is not covered in the standard -npm install. Ensure your system has [libcairo](http://cairographics.org/) -installed and then run the following commands: +Open MCT is built using [`npm`](http://npmjs.com/) and [`webpack`](https://webpack.js.org/). -* `npm install` -* `npm install canvas nomnoml` -* `npm run docs` +See our documentation for a guide on [building Applications with Open MCT](https://github.com/nasa/openmct/blob/master/API.md#starting-an-open-mct-application). -Documentation will be generated in `target/docs`. +## Plugins -## Deploying Open MCT +Open MCT can be extended via plugins that make calls to the Open MCT API. A plugin is a group +of software components (including source code and resources such as images and HTML templates) +that is intended to be added or removed as a single unit. -Open MCT is built using [`npm`](http://npmjs.com/) +As well as providing an extension mechanism, most of the core Open MCT codebase is also +written as plugins. -To build Open MCT for deployment: - -`npm run prepare` - -This will compile and minify JavaScript sources, as well as copy over assets. -The contents of the `dist` folder will contain a runnable Open MCT -instance (e.g. by starting an HTTP server in that directory), including: - -* `openmct.js` - Open MCT source code. -* `openmct.css` - Basic styles to load to prevent a FOUC. -* `index.html`, an example to run Open MCT in the basic configuration. +For information on writing plugins, please see [our API documentation](https://github.com/nasa/openmct/blob/master/API.md#plugins). ## Tests -Tests are written for [Jasmine 3](http://jasmine.github.io/) +Tests are written for [Jasmine 3](https://jasmine.github.io/api/3.1/global) and run by [Karma](http://karma-runner.github.io). To run: `npm test` @@ -115,7 +81,7 @@ naming convention is otherwise the same.) ### Test Reporting When `npm test` is run, test results will be written as HTML to -`target/tests`. Code coverage information is written to `target/coverage`. +`dist/reports/tests/`. Code coverage information is written to `dist/reports/coverage`. # Glossary @@ -125,11 +91,8 @@ addressed (either by updating this glossary or changing code to reflect correct usage.) Other developer documentation, particularly in-line documentation, may presume an understanding of these terms. -* _bundle_: A bundle is a removable, reusable grouping of software elements. - The application is composed of bundles. Plug-ins are bundles. For more - information, refer to framework documentation (under `platform/framework`.) -* _capability_: An object which exposes dynamic behavior or non-persistent - state associated with a domain object. +* _plugin_: A plugin is a removable, reusable grouping of software elements. + The application is composed of plugins. * _composition_: In the context of a domain object, this refers to the set of other domain objects that compose or are contained by that object. A domain object's composition is the set of domain objects that should appear @@ -144,13 +107,8 @@ documentation, may presume an understanding of these terms. * _domain object_: A meaningful object to the user; a distinct thing in the work support by Open MCT. Anything that appears in the left-hand tree is a domain object. -* _extension_: An extension is a unit of functionality exposed to the - platform in a declarative fashion by a bundle. For more - information, refer to framework documentation (under `platform/framework`.) -* _id_: A string which uniquely identifies a domain object. -* _key_: When used as an object property, this refers to the machine-readable - identifier for a specific thing in a set of things. (Most often used in the - context of extensions or other similar application-specific object sets.) +* _identifier_: A tuple consisting of a namespace and a key, which together uniquely + identifies a domain object. * _model_: The persistent state associated with a domain object. A domain object's model is a JavaScript object which can be converted to JSON without losing information (that is, it contains no methods.) @@ -162,7 +120,5 @@ documentation, may presume an understanding of these terms. a user clicks on a domain object in the tree, they are _navigating_ to it, and it is thereafter considered the _navigated_ object (until the user makes another such choice.) -* _space_: A name used to identify a persistence store. Interactions with - persistence will generally involve a `space` parameter in some form, to - distinguish multiple persistence stores from one another (for cases - where there are multiple valid persistence locations available.) +* _namespace_: A name used to identify a persistence store. A running open MCT +application could potentially use multiple persistence stores, with the From 23781fa686bf1a597fc5085e9e66625d9aa88551 Mon Sep 17 00:00:00 2001 From: Andrew Henry Date: Wed, 11 Dec 2019 14:16:24 -0800 Subject: [PATCH 3/4] Correct release number (#2575) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 40752aa0d5..d5bdf1fe02 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Building and running Open MCT in your local dev environment is very easy. Be sur Open MCT is now running, and can be accessed by pointing a web browser at [http://localhost:8080/](http://localhost:8080/) ## Open MCT v1.0.0 -This represents a major overhaul of Open MCT with significant changes under the hood. We aim to maintain backward compatibility but if you do find compatibility issues, please let us know by filing an issue in this repository. If you are having major issues with v1.0.0 please check-out the v0.15.0 tag until we can resolve them for you. +This represents a major overhaul of Open MCT with significant changes under the hood. We aim to maintain backward compatibility but if you do find compatibility issues, please let us know by filing an issue in this repository. If you are having major issues with v1.0.0 please check-out the v0.14.0 tag until we can resolve them for you. If you are migrating an application built with Open MCT as a dependency to v1.0.0 from an earlier version, please refer to [our migration guide](https://nasa.github.io/openmct/documentation/migration-guide). From 50173a4413e23d201a1f6baa8f64b2cf419aa4b3 Mon Sep 17 00:00:00 2001 From: Nikhil Date: Wed, 11 Dec 2019 14:27:13 -0800 Subject: [PATCH 4/4] Theming (#2567) * Separate Vue component styles out from SFCs. * Added 'MCT.prototype.getAssetPath' and using 'openmct.setAssetPath' to get relative path for assets. * Re-implements `openmct.plugins.Snow()`, and `openmct.plugins.Espresso()` (as well as a new theme `openmct.plugins.Maelstron()`) --- index.html | 2 + package.json | 4 +- src/MCT.js | 27 +- .../overlays/components/DialogComponent.vue | 86 ----- .../overlays/components/OverlayComponent.vue | 148 -------- .../components/ProgressDialogComponent.vue | 3 - .../overlays/components/dialog-component.scss | 81 +++++ .../components/overlay-component.scss | 142 ++++++++ src/plugins/LADTable/components/LADRow.vue | 4 - .../LADTable/components/LadTableSet.vue | 4 - .../displayLayout/components/BoxView.vue | 13 - .../components/DisplayLayout.vue | 75 ---- .../displayLayout/components/EditMarquee.vue | 60 ---- .../displayLayout/components/ImageView.vue | 15 - .../displayLayout/components/LayoutFrame.vue | 136 -------- .../components/TelemetryView.vue | 34 -- .../displayLayout/components/TextView.vue | 14 - .../displayLayout/components/box-view.scss | 8 + .../components/display-layout.scss | 70 ++++ .../components/edit-marquee.scss | 54 +++ .../displayLayout/components/image-view.scss | 10 + .../components/layout-frame.scss | 131 +++++++ .../components/telemetry-view.scss | 29 ++ .../displayLayout/components/text-view.scss | 9 + .../filters/components/FiltersView.vue | 20 -- .../filters/components/GlobalFilters.vue | 32 -- .../filters/components/filters-view.scss | 15 + .../filters/components/global-filters.scss | 28 ++ .../flexibleLayout/components/dropHint.vue | 4 - .../components/flexible-layout.scss | 320 +++++++++++++++++ .../components/flexibleLayout.vue | 325 ------------------ .../folderView/components/GridItem.vue | 126 ------- .../folderView/components/GridView.vue | 148 -------- .../folderView/components/ListItem.vue | 42 --- .../folderView/components/ListView.vue | 40 --- .../folderView/components/grid-item.scss | 121 +++++++ .../folderView/components/grid-view.scss | 143 ++++++++ .../folderView/components/list-item.scss | 37 ++ .../folderView/components/list-view.scss | 35 ++ src/plugins/plugins.js | 13 +- src/plugins/tabs/components/tabs.scss | 58 ++++ src/plugins/tabs/components/tabs.vue | 63 ---- .../components/TelemetryFilterIndicator.vue | 41 --- .../telemetryTable/components/table-cell.vue | 1 + .../components/table-configuration.vue | 3 - .../telemetryTable/components/table-row.scss | 9 + .../telemetryTable/components/table-row.vue | 12 - .../telemetryTable/components/table.scss | 175 ++++++++++ .../telemetryTable/components/table.vue | 180 ---------- .../telemetry-filter-indicator.scss | 37 ++ src/plugins/themes/espresso-theme.scss | 22 ++ src/plugins/themes/espresso.js | 7 + src/plugins/themes/installTheme.js | 18 + src/plugins/themes/maelstrom-theme.scss | 22 ++ src/plugins/themes/maelstrom.js | 7 + src/plugins/themes/snow-theme.scss | 22 ++ src/plugins/themes/snow.js | 7 + src/plugins/timeConductor/Conductor.vue | 184 ---------- src/plugins/timeConductor/ConductorAxis.vue | 84 ----- src/plugins/timeConductor/ConductorMode.vue | 19 - .../timeConductor/ConductorModeIcon.vue | 112 ------ src/plugins/timeConductor/DatePicker.vue | 101 ------ src/plugins/timeConductor/conductor-axis.scss | 79 +++++ .../timeConductor/conductor-mode-icon.scss | 107 ++++++ src/plugins/timeConductor/conductor-mode.scss | 14 + src/plugins/timeConductor/conductor.scss | 179 ++++++++++ src/plugins/timeConductor/date-picker.scss | 96 ++++++ src/styles/core.scss | 2 + src/styles/vue-styles.scss | 43 +++ src/ui/components/ObjectFrame.vue | 80 ----- src/ui/components/ObjectLabel.vue | 33 -- src/ui/components/ProgressBar.vue | 48 --- src/ui/components/ToggleSwitch.vue | 54 --- src/ui/components/object-frame.scss | 75 ++++ src/ui/components/object-label.scss | 28 ++ src/ui/components/progress-bar.scss | 43 +++ src/ui/components/search.scss | 26 ++ src/ui/components/search.vue | 31 -- src/ui/components/toggle-switch.scss | 48 +++ src/ui/inspector/Elements.vue | 38 -- src/ui/inspector/Inspector.vue | 159 --------- src/ui/inspector/Location.vue | 43 --- src/ui/inspector/elements.scss | 35 ++ src/ui/inspector/inspector.scss | 154 +++++++++ src/ui/inspector/location.scss | 38 ++ src/ui/layout/AppLogo.vue | 9 +- src/ui/layout/CreateButton.vue | 34 -- src/ui/layout/Layout.vue | 244 ------------- src/ui/layout/MCTSearch.vue | 15 - src/ui/layout/app-logo.scss | 6 + src/ui/layout/create-button.scss | 29 ++ src/ui/layout/layout.scss | 238 +++++++++++++ src/ui/layout/mct-search.scss | 10 + src/ui/layout/mct-tree.scss | 138 ++++++++ src/ui/layout/mct-tree.vue | 143 -------- src/ui/layout/pane.scss | 312 +++++++++++++++++ src/ui/layout/pane.vue | 317 ----------------- src/ui/layout/status-bar/Indicators.vue | 132 ------- .../layout/status-bar/NotificationBanner.vue | 79 ----- src/ui/layout/status-bar/indicators.scss | 127 +++++++ .../status-bar/notification-banner.scss | 74 ++++ src/ui/preview/Preview.vue | 31 -- src/ui/preview/preview.scss | 27 ++ .../toolbar/components/toolbar-checkbox.scss | 45 +++ .../toolbar/components/toolbar-checkbox.vue | 51 --- webpack.config.js | 20 +- 106 files changed, 3636 insertions(+), 3690 deletions(-) create mode 100644 src/api/overlays/components/dialog-component.scss create mode 100644 src/api/overlays/components/overlay-component.scss create mode 100644 src/plugins/displayLayout/components/box-view.scss create mode 100644 src/plugins/displayLayout/components/display-layout.scss create mode 100644 src/plugins/displayLayout/components/edit-marquee.scss create mode 100644 src/plugins/displayLayout/components/image-view.scss create mode 100644 src/plugins/displayLayout/components/layout-frame.scss create mode 100644 src/plugins/displayLayout/components/telemetry-view.scss create mode 100644 src/plugins/displayLayout/components/text-view.scss create mode 100644 src/plugins/filters/components/filters-view.scss create mode 100644 src/plugins/filters/components/global-filters.scss create mode 100644 src/plugins/flexibleLayout/components/flexible-layout.scss create mode 100644 src/plugins/folderView/components/grid-item.scss create mode 100644 src/plugins/folderView/components/grid-view.scss create mode 100644 src/plugins/folderView/components/list-item.scss create mode 100644 src/plugins/folderView/components/list-view.scss create mode 100644 src/plugins/tabs/components/tabs.scss create mode 100644 src/plugins/telemetryTable/components/table-row.scss create mode 100644 src/plugins/telemetryTable/components/table.scss create mode 100644 src/plugins/telemetryTable/components/telemetry-filter-indicator.scss create mode 100644 src/plugins/themes/espresso-theme.scss create mode 100644 src/plugins/themes/espresso.js create mode 100644 src/plugins/themes/installTheme.js create mode 100644 src/plugins/themes/maelstrom-theme.scss create mode 100644 src/plugins/themes/maelstrom.js create mode 100644 src/plugins/themes/snow-theme.scss create mode 100644 src/plugins/themes/snow.js create mode 100644 src/plugins/timeConductor/conductor-axis.scss create mode 100644 src/plugins/timeConductor/conductor-mode-icon.scss create mode 100644 src/plugins/timeConductor/conductor-mode.scss create mode 100644 src/plugins/timeConductor/conductor.scss create mode 100644 src/plugins/timeConductor/date-picker.scss create mode 100644 src/styles/vue-styles.scss create mode 100644 src/ui/components/object-frame.scss create mode 100644 src/ui/components/object-label.scss create mode 100644 src/ui/components/progress-bar.scss create mode 100644 src/ui/components/search.scss create mode 100644 src/ui/components/toggle-switch.scss create mode 100644 src/ui/inspector/elements.scss create mode 100644 src/ui/inspector/inspector.scss create mode 100644 src/ui/inspector/location.scss create mode 100644 src/ui/layout/app-logo.scss create mode 100644 src/ui/layout/create-button.scss create mode 100644 src/ui/layout/layout.scss create mode 100644 src/ui/layout/mct-search.scss create mode 100644 src/ui/layout/mct-tree.scss create mode 100644 src/ui/layout/pane.scss create mode 100644 src/ui/layout/status-bar/indicators.scss create mode 100644 src/ui/layout/status-bar/notification-banner.scss create mode 100644 src/ui/preview/preview.scss create mode 100644 src/ui/toolbar/components/toolbar-checkbox.scss diff --git a/index.html b/index.html index f73024f69e..332b04eccd 100644 --- a/index.html +++ b/index.html @@ -43,6 +43,8 @@ ].forEach( openmct.legacyRegistry.enable.bind(openmct.legacyRegistry) ); + + openmct.install(openmct.plugins.Espresso()); openmct.install(openmct.plugins.MyItems()); openmct.install(openmct.plugins.LocalStorage()); openmct.install(openmct.plugins.Generator()); diff --git a/package.json b/package.json index 6c990dc0c4..d15a69e91e 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,8 @@ "comma-separated-values": "^3.6.4", "concurrently": "^3.6.1", "copy-webpack-plugin": "^4.5.2", - "css-loader": "^1.0.0", "cross-env": "^6.0.3", + "css-loader": "^1.0.0", "d3-array": "1.2.x", "d3-axis": "1.0.x", "d3-collection": "1.0.x", @@ -63,7 +63,7 @@ "raw-loader": "^0.5.1", "request": "^2.69.0", "split": "^1.0.0", - "style-loader": "^0.21.0", + "style-loader": "^1.0.1", "v8-compile-cache": "^1.1.0", "vue": "2.5.6", "vue-loader": "^15.2.6", diff --git a/src/MCT.js b/src/MCT.js index 404153ab5a..9b2f145db5 100644 --- a/src/MCT.js +++ b/src/MCT.js @@ -38,7 +38,6 @@ define([ './ui/router/ApplicationRouter', './ui/router/Browse', '../platform/framework/src/Main', - './styles/core.scss', './styles/notebook.scss', './ui/layout/Layout.vue', '../platform/core/src/objects/DomainObjectImpl', @@ -66,7 +65,6 @@ define([ ApplicationRouter, Browse, Main, - coreStyles, NotebookStyles, Layout, DomainObjectImpl, @@ -318,11 +316,26 @@ define([ * @memberof module:openmct.MCT# * @method setAssetPath */ - MCT.prototype.setAssetPath = function (path) { - this.legacyExtension('constants', { - key: "ASSETS_PATH", - value: path - }); + MCT.prototype.setAssetPath = function (assetPath) { + this._assetPath = assetPath; + }; + + /** + * Get path to where assets are hosted. + * @memberof module:openmct.MCT# + * @method getAssetPath + */ + MCT.prototype.getAssetPath = function () { + const assetPathLength = this._assetPath && this._assetPath.length; + if (!assetPathLength) { + return '/'; + } + + if (this._assetPath[assetPathLength - 1] !== '/') { + return this._assetPath + '/'; + } + + return this._assetPath; }; /** diff --git a/src/api/overlays/components/DialogComponent.vue b/src/api/overlays/components/DialogComponent.vue index 23991c0bf6..9193d302bd 100644 --- a/src/api/overlays/components/DialogComponent.vue +++ b/src/api/overlays/components/DialogComponent.vue @@ -33,92 +33,6 @@
- -