From 5f80b3773b2d692ef759616d5c283c8647e6fd75 Mon Sep 17 00:00:00 2001 From: Joel McKinnon Date: Thu, 2 Jan 2020 15:19:57 -0800 Subject: [PATCH] restructured folders --- src/MCT.js | 1 - .../ConditionSetCompositionPolicy.js | 0 .../ConditionSetCompositionPolicySpec.js | 0 .../ConditionSetViewProvider.js | 0 .../components/ConditionCollection.vue | 0 .../components/ConditionSet.vue | 0 .../components/CurrentOutput.vue | 0 .../components/TestData.vue | 0 .../components/condition-set.scss | 0 src/plugins/condition/plugin.js | 17 ++++++++ .../pluginSpec0.js} | 0 src/plugins/conditionSet/plugin.js | 41 ------------------- src/plugins/plugins.js | 11 ++--- src/styles/vue-styles.scss | 2 +- 14 files changed, 22 insertions(+), 50 deletions(-) rename src/plugins/{conditionSet => condition}/ConditionSetCompositionPolicy.js (100%) rename src/plugins/{conditionSet => condition}/ConditionSetCompositionPolicySpec.js (100%) rename src/plugins/{conditionSet => condition}/ConditionSetViewProvider.js (100%) rename src/plugins/{conditionSet => condition}/components/ConditionCollection.vue (100%) rename src/plugins/{conditionSet => condition}/components/ConditionSet.vue (100%) rename src/plugins/{conditionSet => condition}/components/CurrentOutput.vue (100%) rename src/plugins/{conditionSet => condition}/components/TestData.vue (100%) rename src/plugins/{conditionSet => condition}/components/condition-set.scss (100%) rename src/plugins/{conditionSet/pluginSpec.js => condition/pluginSpec0.js} (100%) delete mode 100644 src/plugins/conditionSet/plugin.js diff --git a/src/MCT.js b/src/MCT.js index e962f57c8d..14a3b46a46 100644 --- a/src/MCT.js +++ b/src/MCT.js @@ -265,7 +265,6 @@ define([ this.install(this.plugins.ImportExport()); this.install(this.plugins.WebPage()); this.install(this.plugins.Condition()); - this.install(this.plugins.ConditionSet()); } MCT.prototype = Object.create(EventEmitter.prototype); diff --git a/src/plugins/conditionSet/ConditionSetCompositionPolicy.js b/src/plugins/condition/ConditionSetCompositionPolicy.js similarity index 100% rename from src/plugins/conditionSet/ConditionSetCompositionPolicy.js rename to src/plugins/condition/ConditionSetCompositionPolicy.js diff --git a/src/plugins/conditionSet/ConditionSetCompositionPolicySpec.js b/src/plugins/condition/ConditionSetCompositionPolicySpec.js similarity index 100% rename from src/plugins/conditionSet/ConditionSetCompositionPolicySpec.js rename to src/plugins/condition/ConditionSetCompositionPolicySpec.js diff --git a/src/plugins/conditionSet/ConditionSetViewProvider.js b/src/plugins/condition/ConditionSetViewProvider.js similarity index 100% rename from src/plugins/conditionSet/ConditionSetViewProvider.js rename to src/plugins/condition/ConditionSetViewProvider.js diff --git a/src/plugins/conditionSet/components/ConditionCollection.vue b/src/plugins/condition/components/ConditionCollection.vue similarity index 100% rename from src/plugins/conditionSet/components/ConditionCollection.vue rename to src/plugins/condition/components/ConditionCollection.vue diff --git a/src/plugins/conditionSet/components/ConditionSet.vue b/src/plugins/condition/components/ConditionSet.vue similarity index 100% rename from src/plugins/conditionSet/components/ConditionSet.vue rename to src/plugins/condition/components/ConditionSet.vue diff --git a/src/plugins/conditionSet/components/CurrentOutput.vue b/src/plugins/condition/components/CurrentOutput.vue similarity index 100% rename from src/plugins/conditionSet/components/CurrentOutput.vue rename to src/plugins/condition/components/CurrentOutput.vue diff --git a/src/plugins/conditionSet/components/TestData.vue b/src/plugins/condition/components/TestData.vue similarity index 100% rename from src/plugins/conditionSet/components/TestData.vue rename to src/plugins/condition/components/TestData.vue diff --git a/src/plugins/conditionSet/components/condition-set.scss b/src/plugins/condition/components/condition-set.scss similarity index 100% rename from src/plugins/conditionSet/components/condition-set.scss rename to src/plugins/condition/components/condition-set.scss diff --git a/src/plugins/condition/plugin.js b/src/plugins/condition/plugin.js index b55ca2c806..8609f2413a 100644 --- a/src/plugins/condition/plugin.js +++ b/src/plugins/condition/plugin.js @@ -19,8 +19,20 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ +import ConditionSetViewProvider from './ConditionSetViewProvider.js'; export default function ConditionPlugin() { + const conditionSetType = { + name: 'Condition Set', + key: 'conditionSet', + description: 'A set of one or more conditions based on user-specified criteria.', + creatable: true, + cssClass: 'icon-folder', + initialize: function (domainObject) { + domainObject.composition = []; + } + }; + return function install(openmct) { openmct.types.addType('condition', { name: 'Condition', @@ -31,5 +43,10 @@ export default function ConditionPlugin() { domainObject.composition = []; } }); + + openmct.types.addType('conditionSet', conditionSetType); + + openmct.objectViews.addProvider(new ConditionSetViewProvider(openmct)); + } } diff --git a/src/plugins/conditionSet/pluginSpec.js b/src/plugins/condition/pluginSpec0.js similarity index 100% rename from src/plugins/conditionSet/pluginSpec.js rename to src/plugins/condition/pluginSpec0.js diff --git a/src/plugins/conditionSet/plugin.js b/src/plugins/conditionSet/plugin.js deleted file mode 100644 index c117aef4ba..0000000000 --- a/src/plugins/conditionSet/plugin.js +++ /dev/null @@ -1,41 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2019, 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. - *****************************************************************************/ -import ConditionSetViewProvider from './ConditionSetViewProvider.js'; - -export default function plugin() { - const conditionSetType = { - name: 'Condition Set', - key: 'conditionSet', - description: 'A set of one or more conditions based on user-specified criteria.', - creatable: true, - cssClass: 'icon-folder', - initialize: function (domainObject) { - domainObject.composition = []; - } - }; - - return function install(openmct) { - openmct.objectViews.addProvider(new ConditionSetViewProvider(openmct)); - - openmct.types.addType('conditionSet', conditionSetType); - }; -} diff --git a/src/plugins/plugins.js b/src/plugins/plugins.js index fad18084ef..7492b95340 100644 --- a/src/plugins/plugins.js +++ b/src/plugins/plugins.js @@ -47,11 +47,10 @@ define([ './goToOriginalAction/plugin', './clearData/plugin', './webPage/plugin', - './conditionSet/plugin', + './condition/plugin', './themes/espresso', './themes/maelstrom', - './themes/snow', - './condition/plugin' + './themes/snow' ], function ( _, UTCTimeSystem, @@ -79,11 +78,10 @@ define([ GoToOriginalAction, ClearData, WebPagePlugin, - ConditionSetPlugin, + ConditionPlugin, Espresso, Maelstrom, - Snow, - ConditionPlugin + Snow ) { var bundleMap = { LocalStorage: 'platform/persistence/local', @@ -186,7 +184,6 @@ define([ plugins.GoToOriginalAction = GoToOriginalAction.default; plugins.ClearData = ClearData; plugins.WebPage = WebPagePlugin.default; - plugins.ConditionSet = ConditionSetPlugin.default; plugins.Espresso = Espresso.default; plugins.Maelstrom = Maelstrom.default; plugins.Snow = Snow.default; diff --git a/src/styles/vue-styles.scss b/src/styles/vue-styles.scss index ac5551fd94..d11f5f0f45 100644 --- a/src/styles/vue-styles.scss +++ b/src/styles/vue-styles.scss @@ -1,7 +1,7 @@ @import "../api/overlays/components/dialog-component.scss"; @import "../api/overlays/components/overlay-component.scss"; @import "../plugins/condition/components/condition.scss"; -@import "../plugins/conditionSet/components/condition-set.scss"; +@import "../plugins/condition/components/condition-set.scss"; @import "../plugins/displayLayout/components/box-view.scss"; @import "../plugins/displayLayout/components/display-layout.scss"; @import "../plugins/displayLayout/components/edit-marquee.scss";