From 656d6d6c3f0701f9afceb01c358eb047bd351bb2 Mon Sep 17 00:00:00 2001 From: Joel McKinnon Date: Wed, 18 Dec 2019 12:48:05 -0800 Subject: [PATCH] addressed review comments --- src/MCT.js | 4 ++-- .../ConditionSetViewProvider.js | 0 .../components/ConditionSet.vue | 0 src/plugins/{condition => conditionSet}/plugin.js | 8 ++++---- src/plugins/{condition => conditionSet}/pluginSpec.js | 10 +++++----- src/plugins/plugins.js | 8 ++++---- 6 files changed, 15 insertions(+), 15 deletions(-) rename src/plugins/{condition => conditionSet}/ConditionSetViewProvider.js (100%) rename src/plugins/{condition => conditionSet}/components/ConditionSet.vue (100%) rename src/plugins/{condition => conditionSet}/plugin.js (85%) rename src/plugins/{condition => conditionSet}/pluginSpec.js (90%) diff --git a/src/MCT.js b/src/MCT.js index c045b6e561..a73d6cc685 100644 --- a/src/MCT.js +++ b/src/MCT.js @@ -1,5 +1,5 @@ /***************************************************************************** - * Open MCT, Copyright (c) 2014-2018, United States Government + * Open MCT, Copyright (c) 2014-2019, United States Government * as represented by the Administrator of the National Aeronautics and Space * Administration. All rights reserved. * @@ -264,7 +264,7 @@ define([ this.install(this.plugins.GoToOriginalAction()); 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/condition/ConditionSetViewProvider.js b/src/plugins/conditionSet/ConditionSetViewProvider.js similarity index 100% rename from src/plugins/condition/ConditionSetViewProvider.js rename to src/plugins/conditionSet/ConditionSetViewProvider.js diff --git a/src/plugins/condition/components/ConditionSet.vue b/src/plugins/conditionSet/components/ConditionSet.vue similarity index 100% rename from src/plugins/condition/components/ConditionSet.vue rename to src/plugins/conditionSet/components/ConditionSet.vue diff --git a/src/plugins/condition/plugin.js b/src/plugins/conditionSet/plugin.js similarity index 85% rename from src/plugins/condition/plugin.js rename to src/plugins/conditionSet/plugin.js index 93bc7bc909..601f7dd4f3 100644 --- a/src/plugins/condition/plugin.js +++ b/src/plugins/conditionSet/plugin.js @@ -1,5 +1,5 @@ /***************************************************************************** - * Open MCT, Copyright (c) 2014-2018, United States Government + * Open MCT, Copyright (c) 2014-2019, United States Government * as represented by the Administrator of the National Aeronautics and Space * Administration. All rights reserved. * @@ -20,16 +20,16 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ -export default function ConditionSetPlugin() { +export default function plugin() { const conditionSetType = { name: 'Condition Set', key: 'conditionSet', - description: 'A set of one or more conditional rules based on user-specified criteria.', + description: 'A set of one or more conditions based on user-specified criteria.', creatable: true, cssClass: 'icon-summary-widget', initialize: function (domainObject) { domainObject.composition = []; - domainObject.telemetry = {}; + // domainObject.telemetry = {}; } }; diff --git a/src/plugins/condition/pluginSpec.js b/src/plugins/conditionSet/pluginSpec.js similarity index 90% rename from src/plugins/condition/pluginSpec.js rename to src/plugins/conditionSet/pluginSpec.js index a4d0349493..4302c7c890 100644 --- a/src/plugins/condition/pluginSpec.js +++ b/src/plugins/conditionSet/pluginSpec.js @@ -1,5 +1,5 @@ /***************************************************************************** - * Open MCT, Copyright (c) 2014-2018, United States Government + * Open MCT, Copyright (c) 2014-2019, United States Government * as represented by the Administrator of the National Aeronautics and Space * Administration. All rights reserved. * @@ -23,7 +23,7 @@ import ConditionSetPlugin from './plugin'; import { createOpenMct } from 'testTools'; -describe("The plugin", () => { +fdescribe("The plugin", () => { let openmct; let mockDomainObject; @@ -57,9 +57,9 @@ describe("The plugin", () => { expect(Array.isArray(mockDomainObject.composition)).toBeTrue(); }); - it('a telemetry object', () => { - expect(typeof mockDomainObject.telemetry === 'object').toBeTrue(); - }); + // it('a telemetry object', () => { + // expect(typeof mockDomainObject.telemetry === 'object').toBeTrue(); + // }); }); }); diff --git a/src/plugins/plugins.js b/src/plugins/plugins.js index a805684fea..28eee86949 100644 --- a/src/plugins/plugins.js +++ b/src/plugins/plugins.js @@ -1,5 +1,5 @@ /***************************************************************************** - * Open MCT, Copyright (c) 2014-2018, United States Government + * Open MCT, Copyright (c) 2014-2019, United States Government * as represented by the Administrator of the National Aeronautics and Space * Administration. All rights reserved. * @@ -47,7 +47,7 @@ define([ './goToOriginalAction/plugin', './clearData/plugin', './webPage/plugin', - './condition/plugin', + './conditionSet/plugin', './themes/espresso', './themes/maelstrom', './themes/snow' @@ -78,7 +78,7 @@ define([ GoToOriginalAction, ClearData, WebPagePlugin, - ConditionPlugin, + ConditionSetPlugin, Espresso, Maelstrom, Snow @@ -184,7 +184,7 @@ define([ plugins.GoToOriginalAction = GoToOriginalAction.default; plugins.ClearData = ClearData; plugins.WebPage = WebPagePlugin.default; - plugins.Condition = ConditionPlugin.default; + plugins.ConditionSet = ConditionSetPlugin.default; plugins.Espresso = Espresso.default; plugins.Maelstrom = Maelstrom.default; plugins.Snow = Snow.default;