Compare commits

...

106 Commits

Author SHA1 Message Date
bfa604efa0 Condition Widgets trigger hundreds of persistence calls. #5137 2022-04-29 02:03:23 -07:00
e75befafbd Dynamic dial-type Gauge sizing by height and width (#5129)
* Improve sizing strategy for gauges.
* Do not install gauge by default for now

Co-authored-by: Nikhil <nikhil.k.mandlik@nasa.gov>
Co-authored-by: Jamie Vigliotta <jamie.j.vigliotta@nasa.gov>
Co-authored-by: Andrew Henry <akhenry@gmail.com>
2022-04-28 14:03:35 -07:00
d7d06b59ea Gauge edit enabled 2.0.3 (#5133)
* Gauge plugin #4896, add edit mode
2022-04-28 13:32:12 -07:00
8b4a55a7ec Fix transactions overwriting latest objects with stale objects on save (#5132)
* use object (map) instead of set to track dirty objects
* fix tests due to internals change

Co-authored-by: Nikhil <nikhil.k.mandlik@nasa.gov>
2022-04-28 12:43:30 -07:00
2519e601d7 Added animation styling for POS and CAM; adjusted cutoff for isNewImage (#5116)
* Added animation styling for POS and CAM; adjusted cutoff for isNewImage

* Remove animation from POS and CAM
2022-04-28 12:03:42 -07:00
b7b205621b added telemetry collection to alphanumeric telemetry view (#5131) 2022-04-28 11:35:35 -07:00
3d2d932323 [LAD Tables] Use Telemetry Collections (#5127)
* Use telemetry collections to handle bounds checks
2022-04-28 11:21:58 -07:00
ce28dd2b9f Handle scrolling to focused image on resize/new data (#5121)
* Scroll to focused image when view resizes - this will force scrolling to focused image when going to/from view large mode

* Scroll to the right if there is no paused focused image
2022-04-28 10:44:53 -07:00
286a533dad Fix tick values for plots ticks in log mode and null check (#5119)
* [2297] When there is no display range or range, skip setting the range value when auto scale is turned off.

* If the formatted value is a number and a float, set precision to 2 decimal points.

* Fix value assignment

* Use whole numbers in log mode

* Revert whole numbers fix - need floats for values between 0 and 1.
2022-04-26 13:40:19 -07:00
378a4ca282 Release 2.0.3 2022-04-25 11:58:50 -07:00
fff3ce0acf [Telemetry Collection] Telemetry table excluding start and end bound values #5095 (#5096) 2022-04-23 01:49:38 +00:00
db5cb2517f Telemetry Table performance marks (#5107)
Co-authored-by: unlikelyzero <jchill2@gmail.com>
Co-authored-by: David Tsay <3614296+davetsay@users.noreply.github.com>
2022-04-22 17:49:50 -07:00
5236f1c796 Sort and merge incoming telemetry (#5042)
* use sort and merge sorted strategy for incoming data
* add shortcut for merging to beginning or end of existing rows

Co-authored-by: Andrew Henry <akhenry@gmail.com>
2022-04-22 23:51:47 +00:00
1ed253cb07 Show image thumbnails in layout views - 4884 (#5099)
* Only show thumbnails if image view is > 400px high

Co-authored-by: Andrew Henry <akhenry@gmail.com>
Co-authored-by: Charles Hacskaylo <charlesh88@gmail.com>
2022-04-22 16:14:59 -07:00
a6553ba010 Delete gauge.e2eSpec.js (#5105)
Deletes the erroneously committed e2e spec for gauges.

Co-authored-by: Shefali Joshi <simplyrender@gmail.com>
2022-04-22 22:20:15 +00:00
cf6bc5be2d Search fix identifier (#4947)
* use identifier not key for object get calls
* re-index on composition or name changes only
* search should account for namespaces

Co-authored-by: Scott Bell <scott@traclabs.com>
Co-authored-by: Nikhil <nikhil.k.mandlik@nasa.gov>
2022-04-22 15:15:37 -07:00
a53a3a0297 Add gauge 4896 (#4919)
* Add new Gauge component

Co-authored-by: Charles Hacskaylo <charlesh88@gmail.com>
Co-authored-by: Jamie V <jamie.j.vigliotta@nasa.gov>
Co-authored-by: John Hill <john.c.hill@nasa.gov>
Co-authored-by: Andrew Henry <akhenry@gmail.com>
2022-04-22 14:58:08 -07:00
402cd15726 Log plots 2 / custom ticks (#4931)
* add some types to XAxisModel

* Add UI to toggle log mode.

* handle autoscale toggle for logMode

* add log plot tests

* test log ticks work after refresh

* add an initial manually-created visual snapshot test of log plot chart

* update plot unit tests for log mode

* remove scale variable for now

* make v-for keys unique per template to avoid a small performance hazard of v-for markup in the same subtree of a template having clashing keys (Vue quirk)

Co-authored-by: unlikelyzero <jchill2@gmail.com>
Co-authored-by: John Hill <john.c.hill@nasa.gov>
Co-authored-by: Shefali Joshi <simplyrender@gmail.com>
2022-04-20 14:28:46 -07:00
a5580912e3 fix a couple flaky tests (#5061)
* fix: forgot to increase maxDiffPixels for one snapshot test, making it more chance to flake. let's see if this work

* hopefully fix PerformanceIndicator test flakes

* hopefully actually fix PerfIndicator test this time

* ok, *finally* fix PerfIndicator test... hopefully...

* simplify PerfIndicator test to check only for positive fps value
2022-04-20 10:41:09 -07:00
54d1b8991c [Build] Add support for node18 (#5091) 2022-04-19 15:05:08 -07:00
7b6acee793 Bump karma-spec-reporter from 0.0.33 to 0.0.34 (#5086)
Bumps [karma-spec-reporter](https://github.com/tmcgee123/karma-spec-reporter) from 0.0.33 to 0.0.34.
- [Release notes](https://github.com/tmcgee123/karma-spec-reporter/releases)
- [Commits](https://github.com/tmcgee123/karma-spec-reporter/compare/v0.0.33...v0.0.34)

---
updated-dependencies:
- dependency-name: karma-spec-reporter
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: John Hill <john.c.hill@nasa.gov>
2022-04-19 21:21:23 +00:00
04e1c60e5c Prepare for 2.0.3 release (#5087)
Co-authored-by: John Hill <john.c.hill@nasa.gov>
2022-04-19 18:53:38 +00:00
91bcd78d40 fix preview by checking before accessing key, fix delay of resize, by using leading:true option of debounce (#5054) 2022-04-19 18:34:26 +00:00
a3c0e073c8 Plots y axis and legend fixes (#5062)
* [5058] Change the unit if the yKey changes after initialization

* [5057] Show y axis label when more than one series is present with the same range value

* Fix typo for model length check

Co-authored-by: David Tsay <3614296+davetsay@users.noreply.github.com>
2022-04-19 17:37:01 +00:00
21ae9f45c1 Bump resolve-url-loader from 4.0.0 to 5.0.0 (#4870)
Bumps [resolve-url-loader](https://github.com/bholloway/resolve-url-loader/tree/HEAD/packages/resolve-url-loader) from 4.0.0 to 5.0.0.
- [Release notes](https://github.com/bholloway/resolve-url-loader/releases)
- [Changelog](https://github.com/bholloway/resolve-url-loader/blob/v5/packages/resolve-url-loader/CHANGELOG.md)
- [Commits](https://github.com/bholloway/resolve-url-loader/commits/5.0.0/packages/resolve-url-loader)

---
updated-dependencies:
- dependency-name: resolve-url-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jamie V <jamie.j.vigliotta@nasa.gov>
Co-authored-by: Nikhil Mandlik <nikhil.k.mandlik@nasa.gov>
2022-04-18 15:48:03 -07:00
0a40c8dd0b Bump moment-duration-format from 2.2.2 to 2.3.2 (#5010)
Bumps [moment-duration-format](https://github.com/jsmreese/moment-duration-format) from 2.2.2 to 2.3.2.
- [Release notes](https://github.com/jsmreese/moment-duration-format/releases)
- [Commits](https://github.com/jsmreese/moment-duration-format/compare/2.2.2...2.3.2)

---
updated-dependencies:
- dependency-name: moment-duration-format
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: John Hill <john.c.hill@nasa.gov>
2022-04-17 20:18:13 +00:00
ef1ea8e712 Bump actions/upload-artifact from 2 to 3 (#5049)
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: John Hill <john.c.hill@nasa.gov>
2022-04-17 19:53:45 +00:00
5c4fad77ff Bump karma from 6.3.17 to 6.3.18 (#5071)
Bumps [karma](https://github.com/karma-runner/karma) from 6.3.17 to 6.3.18.
- [Release notes](https://github.com/karma-runner/karma/releases)
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md)
- [Commits](https://github.com/karma-runner/karma/compare/v6.3.17...v6.3.18)

---
updated-dependencies:
- dependency-name: karma
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-16 10:26:40 -07:00
dbac9e6cd2 Bump vue-eslint-parser from 8.2.0 to 8.3.0 (#5065)
Bumps [vue-eslint-parser](https://github.com/vuejs/vue-eslint-parser) from 8.2.0 to 8.3.0.
- [Release notes](https://github.com/vuejs/vue-eslint-parser/releases)
- [Commits](https://github.com/vuejs/vue-eslint-parser/compare/v8.2.0...v8.3.0)

---
updated-dependencies:
- dependency-name: vue-eslint-parser
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-14 17:22:30 -07:00
4b7bcf9c89 Bump eslint from 8.11.0 to 8.13.0 (#5056)
Bumps [eslint](https://github.com/eslint/eslint) from 8.11.0 to 8.13.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.11.0...v8.13.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: John Hill <john.c.hill@nasa.gov>
2022-04-14 16:39:07 +00:00
2b42abd495 Update package.json (#5050)
Co-authored-by: Jamie V <jamie.j.vigliotta@nasa.gov>
2022-04-14 09:10:02 -07:00
1f2102b845 Fix duration to milliseconds converter (#5064) 2022-04-14 08:27:38 -07:00
2ccb90aa41 De-reactify tables (#5046) 2022-04-11 14:34:52 -07:00
525496fbca fix: autoscale turned off could cause errors (#5040)
* fix: autoscale turned off could cause errors

* remove commented code

* add tests for plot ticks

* make sure autoscale tests use a certain window size so they work consistently

* add commented code to use once playwright snapshot testing is fixed

* default the user selected range to the current range prior to when they turn off autoscale

* add snapshot tests for plots autoscale turned off test
2022-04-11 11:22:44 -07:00
47099786cb release 2.0.2 merge to master (#5044)
* Fix version number

* temp remove e2e-ci until percy fix (#5032)

* [Imagery] Improve View Large Action Performance (#5024)

* added the ability to pass the element you would like to enlarge to the view large action
* Example of performance marks (#5027)
Co-authored-by: John Hill <john.c.hill@nasa.gov>
Co-authored-by: unlikelyzero <jchill2@gmail.com>
Co-authored-by: Andrew Henry <andrew.k.henry@nasa.gov>

* [Notebooks] Transactions for entry creation/editing (#4917)

* adding transactions to notebook entry editing

Co-authored-by: Nikhil <nikhil.k.mandlik@nasa.gov>
Co-authored-by: Andrew Henry <andrew.k.henry@nasa.gov>

* Revert "temp remove e2e-ci until percy fix (#5032)" (#5047)

This reverts commit 5b4ba7772a.

Co-authored-by: John Hill <john.c.hill@nasa.gov>
Co-authored-by: Jamie V <jamie.j.vigliotta@nasa.gov>
Co-authored-by: Nikhil <nikhil.k.mandlik@nasa.gov>
Co-authored-by: Andrew Henry <andrew.k.henry@nasa.gov>
2022-04-08 11:35:34 -07:00
3a11291a3b Set flex direction to row reverse to right-align imagery thumbnails (#4934)
* Set flex direction to row reverse so thumbnails are right-aligned

* Flex direction to justify content

Co-authored-by: John Hill <john.c.hill@nasa.gov>
Co-authored-by: Jamie V <jamie.j.vigliotta@nasa.gov>
Co-authored-by: Shefali Joshi <simplyrender@gmail.com>
2022-04-06 11:45:01 -05:00
476f1b2579 Freshness Indicators (#5002)
* Added animation-delay and animation-duration properties to inline styles

* Accept config options from plugin

* Lint fix

* Lint remove trailing space

* Lint: blank line

* Make default values consistent

* Removal of default css and cleanup

* Updated the default values for image freshness

Co-authored-by: John Hill <john.c.hill@nasa.gov>
2022-04-06 16:26:00 +00:00
6153ad8e1e Add new timelist view and plugin (#4766)
* Add new timelist view and plugin
* Add inspector properties
* calculate list bounds to show/hide events
* Add timer to track 'Now' for timelist
* Styling for Timelist view

Co-authored-by: Charles Hacskaylo <charlesh88@gmail.com>
Co-authored-by: Nikhil <nikhil.k.mandlik@nasa.gov>
Co-authored-by: Jamie V <jamie.j.vigliotta@nasa.gov>
2022-04-05 14:48:32 -07:00
77c0b16050 [Build] Update broken transitive percy package and override core-js (#5030)
* Update package.json

* Update package.json

* Update package.json

* override percy/cli install and move core-js

* Update package.json

* published fix

* Attempt without specific dependency

* Attempt without specific dependency

* revert

Co-authored-by: unlikelyzero <jchill2@gmail.com>
2022-04-05 13:41:33 -07:00
d19088cec6 Conditional styles for stacked plots (#4965) 2022-03-31 14:47:58 -07:00
43afb39e56 Added soft assertion for exampleImagery e2e (#5021) 2022-03-30 14:16:59 -07:00
cd8c332fb5 Bump @types/jasmine from 3.10.4 to 4.0.1 (#5018)
Bumps [@types/jasmine](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jasmine) from 3.10.4 to 4.0.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jasmine)

---
updated-dependencies:
- dependency-name: "@types/jasmine"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-30 21:11:51 +00:00
b899475939 Bump mini-css-extract-plugin from 2.4.5 to 2.6.0 (#4926)
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 2.4.5 to 2.6.0.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v2.4.5...v2.6.0)

---
updated-dependencies:
- dependency-name: mini-css-extract-plugin
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Nikhil <nikhil.k.mandlik@nasa.gov>
2022-03-30 13:03:12 -07:00
cc1f7659f9 Bump sass-loader from 12.4.0 to 12.6.0 (#4871)
* Bump sass-loader from 12.4.0 to 12.6.0

Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 12.4.0 to 12.6.0.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v12.4.0...v12.6.0)

---
updated-dependencies:
- dependency-name: sass-loader
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* update sass": "1.49.9"

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jamie V <jamie.j.vigliotta@nasa.gov>
Co-authored-by: Nikhil <nikhil.k.mandlik@nasa.gov>
2022-03-30 18:04:40 +00:00
0d5539be96 Bump moment-timezone from 0.5.28 to 0.5.34 (#5005)
Bumps [moment-timezone](https://github.com/moment/moment-timezone) from 0.5.28 to 0.5.34.
- [Release notes](https://github.com/moment/moment-timezone/releases)
- [Changelog](https://github.com/moment/moment-timezone/blob/develop/changelog.md)
- [Commits](https://github.com/moment/moment-timezone/compare/0.5.28...0.5.34)

---
updated-dependencies:
- dependency-name: moment-timezone
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-30 11:00:07 -07:00
0a511e6155 remove file loader as dependency (#5012) 2022-03-30 18:58:26 +02:00
47b6d19de8 Bump webpack-dev-middleware from 3.7.3 to 5.3.1 (#4829)
* Bump webpack-dev-middleware from 3.7.3 to 5.3.1

Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 3.7.3 to 5.3.1.
- [Release notes](https://github.com/webpack/webpack-dev-middleware/releases)
- [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-middleware/compare/v3.7.3...v5.3.1)

---
updated-dependencies:
- dependency-name: webpack-dev-middleware
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fixed config to support updated webpack-dev-middleware

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jamie V <jamie.j.vigliotta@nasa.gov>
Co-authored-by: Andrew Henry <akhenry@gmail.com>
2022-03-30 00:58:49 +00:00
3fd93f47bc Remove html-loader (#4991)
* Bump html-loader from 0.5.5 to 3.1.0

Bumps [html-loader](https://github.com/webpack-contrib/html-loader) from 0.5.5 to 3.1.0.
- [Release notes](https://github.com/webpack-contrib/html-loader/releases)
- [Changelog](https://github.com/webpack-contrib/html-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/html-loader/compare/v0.5.5...v3.1.0)

---
updated-dependencies:
- dependency-name: html-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix asset loading and make clean idempotent

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Scott Bell <scott@traclabs.com>
Co-authored-by: John Hill <john.c.hill@nasa.gov>
2022-03-29 23:11:15 +00:00
651e61954c Type annotations (#4789)
* add some types to XAxisModel

* some more type defs and small code tweaks while getting familiar with plots

* more type annotations and a few small tweaks

* more type annotations and small tweaks to make types show

* add mocha types

* Add karma and jasmine, too

* further simplify plot canvas creation

* further simplify plot canvas creation

* update types, avoid runtime behavior in type definition that breaks SeriesCollection

* undo the changes to MctChart, improve it later

* lint fix

Co-authored-by: unlikelyzero <jchill2@gmail.com>
Co-authored-by: John Hill <john.c.hill@nasa.gov>
Co-authored-by: Jamie V <jamie.j.vigliotta@nasa.gov>
2022-03-29 14:39:49 -07:00
d30ec4c757 Bump sass from 1.49.0 to 1.49.9 (#4985)
Bumps [sass](https://github.com/sass/dart-sass) from 1.49.0 to 1.49.9.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.49.0...1.49.9)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Henry <andrew.k.henry@nasa.gov>
2022-03-28 21:01:11 -07:00
3c24733476 Update package.json (#5004) 2022-03-28 17:32:05 -07:00
04d00fac3d relax text assertion to be any number (#5001) 2022-03-28 11:20:55 -07:00
150909d4b9 [Build] Remove testing and support for node12 (#4963)
* Remove all node12 testing other than platform

* add lighthouse to our deps now that 12 is deprecated

* removing 12 from platform pr

* Updated config.yml

Co-authored-by: unlikelyzero <jchill2@gmail.com>
Co-authored-by: Shefali Joshi <simplyrender@gmail.com>
2022-03-25 18:11:41 +00:00
2b599a7ff4 Fix Cursor Grab while panning (#4957)
Co-authored-by: John Hill <john.c.hill@nasa.gov>
2022-03-25 11:07:05 -07:00
824a597825 remove raw-loader as a dependency (#4998)
* remove raw-loader as a dependency

* move clock to correct dir and response to canvas clicking
2022-03-25 09:13:10 -07:00
cf5edf2db0 [clock] Timezone dropdown will collapse when clicked outside or on dropdown icon again (#4956)
* Fix timezone dropdown collapse issue

* Dropdown should collapse when click outside

* Fix Lint error

* add e2e test for autocomplete

* updates based of code review

* Typo fixed

* Modification based on review

Co-authored-by: Scott Bell <scott@traclabs.com>
2022-03-24 13:10:32 +01:00
0705d321da invert npmignore to include what we want (#4605)
* invert npmignore to include what we want
* remove line for no-longer-existent src/**/*.spec.js files from npmignore
* cleanup npmignore comments
* remove platform dirs from npmignore, they were removed from the repo
* remove one more platform reference from npmignore
* publish example/ and app.js, at least for now

Co-authored-by: John Hill <john.c.hill@nasa.gov>
Co-authored-by: Shefali Joshi <simplyrender@gmail.com>
Co-authored-by: Jamie V <jamie.j.vigliotta@nasa.gov>
2022-03-23 22:37:36 +00:00
dad0768d57 Prepare for sprint 2.0.2 (#4990)
Co-authored-by: John Hill <john.c.hill@nasa.gov>
2022-03-23 22:32:37 +00:00
9643dbe918 Bump @percy/cli from 1.0.0-beta.75 to 1.0.0-beta.76 (#4989)
Bumps [@percy/cli](https://github.com/percy/cli/tree/HEAD/packages/cli) from 1.0.0-beta.75 to 1.0.0-beta.76.
- [Release notes](https://github.com/percy/cli/releases)
- [Commits](https://github.com/percy/cli/commits/v1.0.0-beta.76/packages/cli)

---
updated-dependencies:
- dependency-name: "@percy/cli"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: John Hill <john.c.hill@nasa.gov>
2022-03-23 22:00:32 +00:00
594f9d3e9a 2.0.1 release merged into master (#4971)
* Correctly use creatable attribute and persistability when working with domainObjects (#4898) (#4936)

* making move action location check persistability

* adding persistence check instead of creatability for styles

* added check for link action to make sure parent is persistable

* debug

* adding parent to link action and move action form location controls so they can be used in the form

* adding parent persistability check for duplicate

* updating multilple actions appliesTo methods to check for persistability

* updated the tree to not require an initial selection if being used in a form

* remove noneditable folder plugin

* added persistence check for the parent, in the create wizard

* minor name change

* removing noneditabl folder from default plugins as well

* checking the correct parent for persistability in create wizard

* importing file-saver correctly

* updated tests for import as json

* changes addressing PR review: using consts, removing comments, removing unneccessary code

Co-authored-by: Scott Bell <scott@traclabs.com>

Co-authored-by: Jamie V <jamie.j.vigliotta@nasa.gov>
Co-authored-by: Scott Bell <scott@traclabs.com>

* Fix display layout items getting cut off on the bottom (like plots) (#4903)

* Fix display layout items getting cut off on the bottom (like plots)
Also fix Vue warnings

* Add partial e2e test for this bug fix. WIP.

* Address review comments

Co-authored-by: John Hill <john.c.hill@nasa.gov>

* Link action fix (#4945)

* handling edge case for linking a root item

* added location to viper plans (couch search folder) set to ROOT, added a check to remove action for alias (so you can remove linked nonpersistable items)

* added check for no parent in remove action (which means it is a root item)

* updating test

* Update time conductor inputs realtime (#4877)

* Update time conductor inputs realtime

* Update moveObjects.e2e.spec.js

* Update importAsJson.e2e.spec.js

* Update default.spec.js

Co-authored-by: Jamie V <jamie.j.vigliotta@nasa.gov>
Co-authored-by: Scott Bell <scott@traclabs.com>
Co-authored-by: John Hill <john.c.hill@nasa.gov>
2022-03-23 14:53:39 -07:00
0f9e727675 34 - Image Pan and Zoom (#4736) 2022-03-23 21:10:50 +00:00
0cf30940c8 Bump karma-chrome-launcher from 3.1.0 to 3.1.1 (#4987)
Bumps [karma-chrome-launcher](https://github.com/karma-runner/karma-chrome-launcher) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/karma-runner/karma-chrome-launcher/releases)
- [Changelog](https://github.com/karma-runner/karma-chrome-launcher/blob/master/CHANGELOG.md)
- [Commits](https://github.com/karma-runner/karma-chrome-launcher/compare/v3.1.0...v3.1.1)

---
updated-dependencies:
- dependency-name: karma-chrome-launcher
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: John Hill <john.c.hill@nasa.gov>
2022-03-23 19:37:49 +00:00
3a2381b90b Bump webpack-hot-middleware from 2.22.3 to 2.25.1 (#4969)
Bumps [webpack-hot-middleware](https://github.com/webpack-contrib/webpack-hot-middleware) from 2.22.3 to 2.25.1.
- [Release notes](https://github.com/webpack-contrib/webpack-hot-middleware/releases)
- [Commits](https://github.com/webpack-contrib/webpack-hot-middleware/compare/v2.22.3...v2.25.1)

---
updated-dependencies:
- dependency-name: webpack-hot-middleware
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-23 18:30:55 +00:00
94def56bcb Bump request from 2.69.0 to 2.88.2 (#4982)
Bumps [request](https://github.com/request/request) from 2.69.0 to 2.88.2.
- [Release notes](https://github.com/request/request/releases)
- [Changelog](https://github.com/request/request/blob/master/CHANGELOG.md)
- [Commits](https://github.com/request/request/commits)

---
updated-dependencies:
- dependency-name: request
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: John Hill <john.c.hill@nasa.gov>
2022-03-23 16:21:04 +00:00
93a796353d Bump printj from 1.2.1 to 1.3.1 (#4981)
Bumps [printj](https://github.com/SheetJS/printj) from 1.2.1 to 1.3.1.
- [Release notes](https://github.com/SheetJS/printj/releases)
- [Commits](https://github.com/SheetJS/printj/commits)

---
updated-dependencies:
- dependency-name: printj
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-23 08:03:37 -07:00
18ff16052a Bump jasmine-core from 4.0.0 to 4.0.1 (#4980)
Bumps [jasmine-core](https://github.com/jasmine/jasmine) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/jasmine/jasmine/releases)
- [Changelog](https://github.com/jasmine/jasmine/blob/main/RELEASE.md)
- [Commits](https://github.com/jasmine/jasmine/compare/v4.0.0...v4.0.1)

---
updated-dependencies:
- dependency-name: jasmine-core
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-22 21:00:28 -07:00
f1c7fa337d Bump raw-loader from 0.5.1 to 4.0.2 (#4978)
Bumps [raw-loader](https://github.com/webpack-contrib/raw-loader) from 0.5.1 to 4.0.2.
- [Release notes](https://github.com/webpack-contrib/raw-loader/releases)
- [Changelog](https://github.com/webpack-contrib/raw-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/raw-loader/commits/v4.0.2)

---
updated-dependencies:
- dependency-name: raw-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: John Hill <john.c.hill@nasa.gov>
2022-03-23 03:29:04 +00:00
557f29f9bb bump git-rev-sync and add tests (#4959)
Co-authored-by: unlikelyzero <jchill2@gmail.com>
2022-03-22 20:20:39 -07:00
255ebc9a37 Bump core-js from 3.20.3 to 3.21.1 (#4970)
Bumps [core-js](https://github.com/zloirock/core-js) from 3.20.3 to 3.21.1.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/compare/v3.20.3...v3.21.1)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-22 18:03:09 -07:00
ca7fbe58e3 code coverage with babel istanbul (#4649)
* WIP add instanbul code coverage to vue files

* move webpack coverage config to a separate file for test:coverage, pin dependencies, remove istanbul-instrumenter-loader

* dont include node_modules in babel config, it breaks istanbul for some reason

* ignore spec files from coverage

* document coverage files, remove unused karma config

* use test instead of test:coverage in config.yml, disable code and link to issue to enable coverage in Vue <template>s
2022-03-22 16:04:23 -07:00
b347f35892 Bump file-loader from 6.1.0 to 6.2.0 (#4834)
Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases)
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v6.1.0...v6.2.0)

---
updated-dependencies:
- dependency-name: file-loader
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jamie V <jamie.j.vigliotta@nasa.gov>
Co-authored-by: Shefali Joshi <simplyrender@gmail.com>
2022-03-22 13:33:02 -07:00
28d5d72834 Event Generator now shows data in fixed time mode (#4883)
* fixed issue and added tests
* exclude leaky test
* ignore case when looking for testing instructions
2022-03-21 15:37:49 -07:00
0df33730f7 on route change, calling showTab (#4955) 2022-03-21 16:29:47 -05:00
7b2ff8fa15 [Docs] add browserlist and linting capability (#4811)
* add browserlist to package.json

* add browserlist linting

* add eslint compat package

* Add blurb about browser support

* add ios safari

* remove node

* add comment and simple disable

Co-authored-by: unlikelyzero <jchill2@gmail.com>
Co-authored-by: Jamie V <jamie.j.vigliotta@nasa.gov>
Co-authored-by: Scott Bell <scott@traclabs.com>
2022-03-21 20:27:18 +01:00
d80b692354 Update eslint (#4554)
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 7.20.0 to 8.0.3.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v7.20.0...v8.0.3)

---
updated-dependencies:
- dependency-name: eslint-plugin-vue
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
* bump eslint to 8.11.0
* bump eslint-plugin-vue to 8.5.0
* disable eslint rule for multi-word component names. TODO enable it and follow conventions

Co-authored-by: Nikhil Mandlik <nikhil.k.mandlik@nasa.gov>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: John Hill <john.c.hill@nasa.gov>
Co-authored-by: unlikelyzero <jchill2@gmail.com>
Co-authored-by: Andrew Henry <akhenry@gmail.com>
2022-03-21 11:40:35 -07:00
4205abdc80 Add Example Generator end to end test (#4949)
* add test

* added name to test and changed comment
2022-03-18 06:57:50 -07:00
492ff2fa64 [e2e] Persistence tests (#4943)
* initial setup for createButton e2e test

* insignificant change

* export as json

* import tests

* added first of two tests

* add stub

* fixme

* move objects

* added test for menu options for non persistable items

* removing "only" for debuggin test

* removing debug code

* soft assertion for multiple expects

Co-authored-by: unlikelyzero <jchill2@gmail.com>
2022-03-17 14:30:45 -07:00
93a81a1369 [CI] Update GHA to include a specific playwright dependency version (#4944)
* Update e2e-pr.yml

* Update e2e-pr.yml

* Update e2e-pr.yml

* visual

Co-authored-by: Nikhil <nikhil.k.mandlik@nasa.gov>
2022-03-16 22:05:50 +00:00
482d8f392c Domain object properties validation not working always (#4893)
* Domain object properties validation not working always #4849

* stub of a test

* set local execution to chrome

* skip visual test

* use input event for changes and throttle update.

* moved file to correct location

* fixed e2e tests.

Co-authored-by: unlikelyzero <jchill2@gmail.com>
Co-authored-by: John Hill <john.c.hill@nasa.gov>
2022-03-16 21:53:58 +00:00
67234c70a4 [Build] 🐰🐰🐰 Remove the last carrots 🐰🐰🐰 (#4941)
* [Build] 🐰🐰🐰 Remove the last carrots 🐰🐰🐰

* Update package.json

Co-authored-by: Khalid Adil <khalidadil29@gmail.com>
2022-03-16 21:44:41 +00:00
e9680e975f Form validation error messages are not being displayed properly (#4887)
* Form validation error messages are not being displayed properly #4697

* e2e Tests

* fixed element.checkValidity test

* remove comment

* adding timeconductor tests

* rename

Co-authored-by: Jamie V <jamie.j.vigliotta@nasa.gov>
Co-authored-by: unlikelyzero <jchill2@gmail.com>
2022-03-16 13:54:46 -07:00
e691a89682 Correctly use creatable attribute and persistability when working with domainObjects (#4898)
* making move action location check persistability

* adding persistence check instead of creatability for styles

* added check for link action to make sure parent is persistable

* debug

* adding parent to link action and move action form location controls so they can be used in the form

* adding parent persistability check for duplicate

* updating multilple actions appliesTo methods to check for persistability

* updated the tree to not require an initial selection if being used in a form

* remove noneditable folder plugin

* added persistence check for the parent, in the create wizard

* minor name change

* removing noneditabl folder from default plugins as well

* checking the correct parent for persistability in create wizard

* importing file-saver correctly

* updated tests for import as json

* changes addressing PR review: using consts, removing comments, removing unneccessary code

Co-authored-by: Scott Bell <scott@traclabs.com>
2022-03-14 21:20:06 +01:00
bcd668594d Add source maps to map plan properties to expected properties (#4933) 2022-03-11 10:40:05 -08:00
5471e13d9e Bump @braintree/sanitize-url from 5.0.2 to 6.0.0 (#4928)
Bumps [@braintree/sanitize-url](https://github.com/braintree/sanitize-url) from 5.0.2 to 6.0.0.
- [Release notes](https://github.com/braintree/sanitize-url/releases)
- [Changelog](https://github.com/braintree/sanitize-url/blob/main/CHANGELOG.md)
- [Commits](https://github.com/braintree/sanitize-url/compare/v5.0.2...v6.0.0)

---
updated-dependencies:
- dependency-name: "@braintree/sanitize-url"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 19:53:39 -08:00
dae446808e Update with CRUD Operation (#4930)
Co-authored-by: unlikelyzero <jchill2@gmail.com>
2022-03-09 06:45:10 -08:00
ee9e47f487 Bump @playwright/test from 1.19.1 to 1.19.2 (#4905)
Bumps [@playwright/test](https://github.com/Microsoft/playwright) from 1.19.1 to 1.19.2.
- [Release notes](https://github.com/Microsoft/playwright/releases)
- [Commits](https://github.com/Microsoft/playwright/compare/v1.19.1...v1.19.2)

---
updated-dependencies:
- dependency-name: "@playwright/test"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: John Hill <john.c.hill@nasa.gov>
2022-03-08 18:49:48 -08:00
003b1ffede Bump actions/setup-node from 2 to 3 (#4900)
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2 to 3.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-07 18:33:18 -08:00
16cb5f3911 [CI] Remove warning output for eslint on platform workflow (#4906) 2022-03-03 14:07:54 -08:00
74b83903c9 Bump actions/checkout from 2 to 3 (#4904)
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-02 09:59:13 -08:00
6a470fba1a Static root plugin not loading after namespace/key changes in OpenMCT #4684
Static root plugin not loading after namespace/key changes in OpenMCT
2022-02-28 11:51:34 -08:00
4e7debabb1 [Notebook] Add active user to entries (#4764)
* if user provider, user added to notebook enntries and snapshot entries, updated code to work with asynnc nature of user api

Co-authored-by: Andrew Henry <akhenry@gmail.com>
Co-authored-by: Nikhil <nikhil.k.mandlik@nasa.gov>
2022-02-22 12:37:47 -08:00
384e36920c 3175 - Enable listening to clearData action for Imagery (#4733)
* Add clearData listener for imageryData module

* Remove commented out code

* Updated imagery clear data test

* Adjusted telemetry stub to return empty array if data cleared

* Remove forced test

* Restub telemetry before

* Cleanup and reset clear data boolean after

* Remove double blank line

Co-authored-by: Scott Bell <scott@traclabs.com>
Co-authored-by: Andrew Henry <akhenry@gmail.com>
2022-02-18 08:48:48 -06:00
d4429f9686 Bump cross-env from 6.0.3 to 7.0.3 (#4837)
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 6.0.3 to 7.0.3.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v6.0.3...v7.0.3)

---
updated-dependencies:
- dependency-name: cross-env
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-17 10:34:14 -08:00
0b2d08078b [CI] Add windows OS and Mac OS to CI testing (#4840)
* Update e2e tests to run on windows and linux

* Add pr-platform to run against all supported archictures

* Update dependabot to run pr:platform

* Update to run in fail-fast false

* remove x86

* Update pr-platform.yml

Co-authored-by: unlikelyzero <jchill2@gmail.com>
2022-02-17 14:52:46 +00:00
3bbc9e1582 [CI] Enable Per PR Lighthouse CI Execution, Run nightly (#4817)
* [CI] Add lighthouse to our deps to track with dependabot

lighthouse ci is still actively maintained and will be following a traditional release model. We should continue to use this package until it's functionality is replaced in playwright

* Add lighthouse to dependencies to track with dependabot

* Allow lighthouse to be triggered from PRs

* Update lighthouse.yml

* add lhci scrript

* bump to 16

* remove from deps until node 18

* document steps and add caching. Revert to 14

* ignore exit codes

* add secret for app

* remove env for baseline

Co-authored-by: unlikelyzero <jchill2@gmail.com>
Co-authored-by: Nikhil <nikhil.k.mandlik@nasa.gov>
2022-02-16 17:12:00 -08:00
af0420361b [CI] Update playwright to 1.19.1 (#4873)
* [CI] Update playwright to 1.19.1

* Update config.yml
2022-02-16 15:12:09 -08:00
896f0ca3f4 Bump moment from 2.25.3 to 2.29.1 (#4869)
Bumps [moment](https://github.com/moment/moment) from 2.25.3 to 2.29.1.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/moment/moment/compare/2.25.3...2.29.1)

---
updated-dependencies:
- dependency-name: moment
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-16 11:22:51 -08:00
28c5405a01 Bump actions/github-script from 5 to 6 (#4853)
Bumps [actions/github-script](https://github.com/actions/github-script) from 5 to 6.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15 15:31:06 -08:00
d114353556 [CI] Update PR Cop to run on more events (#4855)
* [CI] Update PR Cop to run on more events

* Update prcop.yml

* Update prcop.yml

* Update e2e PR

* Update e2e-visual.yml
2022-02-15 14:13:52 -08:00
f40398807e [CI] Update CI to use node16 by default (#4868)
* Update node versions to 16

* New Line

Co-authored-by: unlikelyzero <jchill2@gmail.com>
2022-02-15 14:08:53 -08:00
81f440e1e6 [Docs] Update Github Bug Report Template with envinfo (#4858)
* [Docs] Update Github Bug Report Template with envinfo

* Moving Impact Checklist to bottom so that folks can file and click without markdown x

* Add to npm run scripts
2022-02-15 14:00:37 -08:00
c6d6400131 [CI] Bump playwright to 1.19.0 (#4856)
* bump playwright

* remove playwright dependency and leave playwrite/test

Co-authored-by: unlikelyzero <jchill2@gmail.com>
2022-02-15 10:57:24 -06:00
55828af1ec Bump file-saver from 1.3.8 to 2.0.5 (#4830)
* Bump file-saver from 1.3.8 to 2.0.5

Bumps [file-saver](https://github.com/eligrey/FileSaver.js) from 1.3.8 to 2.0.5.
- [Release notes](https://github.com/eligrey/FileSaver.js/releases)
- [Changelog](https://github.com/eligrey/FileSaver.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eligrey/FileSaver.js/commits)

---
updated-dependencies:
- dependency-name: file-saver
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix paths

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Scott Bell <scott@traclabs.com>
2022-02-15 14:07:58 +01:00
34b951f4c6 Bumped dependency versions to fix build issues in Node 16 and later (#4866)
Co-authored-by: John Hill <john.c.hill@nasa.gov>
2022-02-14 17:15:21 -08:00
a7d4006fee Sprint 2.0.1 (#4861)
* Prep for release 1.8.6

* Update version to 2.0.1
2022-02-14 13:00:32 -08:00
a71485f820 Prep for release 1.8.6 (#4859) 2022-02-14 10:13:08 -08:00
261 changed files with 10801 additions and 2972 deletions

View File

@ -2,7 +2,7 @@ version: 2.1
executors: executors:
pw-focal-development: pw-focal-development:
docker: docker:
- image: mcr.microsoft.com/playwright:v1.18.1-focal - image: mcr.microsoft.com/playwright:v1.19.2-focal
environment: environment:
NODE_ENV: development # Needed to ensure 'dist' folder created and devDependencies installed NODE_ENV: development # Needed to ensure 'dist' folder created and devDependencies installed
parameters: parameters:
@ -76,7 +76,7 @@ jobs:
node-version: <<parameters.node-version>> node-version: <<parameters.node-version>>
- run: npm audit --audit-level=low - run: npm audit --audit-level=low
- generate_and_store_version_and_filesystem_artifacts - generate_and_store_version_and_filesystem_artifacts
node14-lint: lint:
parameters: parameters:
node-version: node-version:
type: string type: string
@ -101,7 +101,7 @@ jobs:
equal: [ "FirefoxESR", <<parameters.browser>> ] equal: [ "FirefoxESR", <<parameters.browser>> ]
steps: steps:
- browser-tools/install-firefox: - browser-tools/install-firefox:
version: "91.4.0esr" #https://archive.mozilla.org/pub/firefox/releases/ version: "91.7.1esr" #https://archive.mozilla.org/pub/firefox/releases/
- when: - when:
condition: condition:
equal: [ "FirefoxHeadless", <<parameters.browser>> ] equal: [ "FirefoxHeadless", <<parameters.browser>> ]
@ -113,7 +113,7 @@ jobs:
steps: steps:
- browser-tools/install-chrome: - browser-tools/install-chrome:
replace-existing: false replace-existing: false
- run: npm run test:coverage -- --browsers=<<parameters.browser>> - run: npm run test -- --browsers=<<parameters.browser>>
- save_cache_cmd: - save_cache_cmd:
node-version: <<parameters.node-version>> node-version: <<parameters.node-version>>
- store_test_results: - store_test_results:
@ -141,32 +141,33 @@ jobs:
workflows: workflows:
overall-circleci-commit-status: #These jobs run on every commit overall-circleci-commit-status: #These jobs run on every commit
jobs: jobs:
- node14-lint: - lint:
node-version: lts/fermium name: node16-lint
- unit-test: node-version: lts/gallium
name: node12-chrome
node-version: lts/erbium
browser: ChromeHeadless
- unit-test: - unit-test:
name: node14-chrome name: node14-chrome
node-version: lts/fermium node-version: lts/fermium
browser: ChromeHeadless browser: ChromeHeadless
post-steps: post-steps:
- upload_code_covio - upload_code_covio
- unit-test:
name: node16-chrome
node-version: lts/gallium
browser: ChromeHeadless
- unit-test:
name: node18-chrome
node-version: "18"
browser: ChromeHeadless
- e2e-test: - e2e-test:
name: e2e-ci name: e2e-ci
node-version: lts/fermium node-version: lts/gallium
suite: ci suite: ci
the-nightly: #These jobs do not run on PRs, but against master at night the-nightly: #These jobs do not run on PRs, but against master at night
jobs: jobs:
- unit-test: - unit-test:
name: node12-firefoxESR-nightly name: node16-firefoxESR-nightly
node-version: lts/erbium node-version: lts/gallium
browser: FirefoxESR browser: FirefoxESR
- unit-test:
name: node12-chrome-nightly
node-version: lts/erbium
browser: ChromeHeadless
- unit-test: - unit-test:
name: node14-firefox-nightly name: node14-firefox-nightly
node-version: lts/fermium node-version: lts/fermium
@ -175,11 +176,19 @@ workflows:
name: node14-chrome-nightly name: node14-chrome-nightly
node-version: lts/fermium node-version: lts/fermium
browser: ChromeHeadless browser: ChromeHeadless
- unit-test:
name: node16-chrome-nightly
node-version: lts/gallium
browser: ChromeHeadless
- unit-test:
name: node18-chrome
node-version: "18"
browser: ChromeHeadless
- npm-audit: - npm-audit:
node-version: lts/fermium node-version: lts/gallium
- e2e-test: - e2e-test:
name: e2e-full-nightly name: e2e-full-nightly
node-version: lts/fermium node-version: lts/gallium
suite: full suite: full
triggers: triggers:
- schedule: - schedule:

View File

@ -11,12 +11,14 @@ module.exports = {
}, },
"extends": [ "extends": [
"eslint:recommended", "eslint:recommended",
"plugin:compat/recommended",
"plugin:vue/recommended", "plugin:vue/recommended",
"plugin:you-dont-need-lodash-underscore/compatible" "plugin:you-dont-need-lodash-underscore/compatible"
], ],
"parser": "vue-eslint-parser", "parser": "vue-eslint-parser",
"parserOptions": { "parserOptions": {
"parser": "babel-eslint", "parser": "@babel/eslint-parser",
"requireConfigFile": false,
"allowImportExportEverywhere": true, "allowImportExportEverywhere": true,
"ecmaVersion": 2015, "ecmaVersion": 2015,
"ecmaFeatures": { "ecmaFeatures": {
@ -35,7 +37,6 @@ module.exports = {
"no-inner-declarations": "off", "no-inner-declarations": "off",
"no-use-before-define": ["error", "nofunc"], "no-use-before-define": ["error", "nofunc"],
"no-caller": "error", "no-caller": "error",
"no-sequences": "error",
"no-irregular-whitespace": "error", "no-irregular-whitespace": "error",
"no-new": "error", "no-new": "error",
"no-shadow": "error", "no-shadow": "error",
@ -239,13 +240,12 @@ module.exports = {
], ],
"vue/max-attributes-per-line": ["error", { "vue/max-attributes-per-line": ["error", {
"singleline": 1, "singleline": 1,
"multiline": { "multiline": 1,
"max": 1,
"allowFirstLine": true
}
}], }],
"vue/first-attribute-linebreak": "error",
"vue/multiline-html-element-content-newline": "off", "vue/multiline-html-element-content-newline": "off",
"vue/singleline-html-element-content-newline": "off", "vue/singleline-html-element-content-newline": "off",
"vue/multi-word-component-names": "off", // TODO enable, align with conventions
"vue/no-mutating-props": "off" "vue/no-mutating-props": "off"
}, },

View File

@ -17,15 +17,6 @@ assignees: ''
#### Expected vs Current Behavior #### Expected vs Current Behavior
<!--- Tell us what should have happened --> <!--- Tell us what should have happened -->
#### Impact Check List
<!--- Please select from the following options -->
- [ ] Data loss or misrepresented data?
- [ ] Regression? Did this used to work or has it always been broken?
- [ ] Is there a workaround available?
- [ ] Does this impact a critical component?
- [ ] Is this just a visual bug with no functional impact?
#### Steps to Reproduce #### Steps to Reproduce
<!--- Provide a link to a live example, or an unambiguous set of steps to --> <!--- Provide a link to a live example, or an unambiguous set of steps to -->
<!--- reproduce this bug. Include code to reproduce, if relevant --> <!--- reproduce this bug. Include code to reproduce, if relevant -->
@ -35,10 +26,20 @@ assignees: ''
4. 4.
#### Environment #### Environment
<!--- If encountered on local machine, execute the following:
<!--- npx envinfo --system --browsers --npmPackages --binaries --languages --markdown -->
* Open MCT Version: <!--- date of build, version, or SHA --> * Open MCT Version: <!--- date of build, version, or SHA -->
* Deployment Type: <!--- npm dev? VIPER Dev? openmct-yamcs? --> * Deployment Type: <!--- npm dev? VIPER Dev? openmct-yamcs? -->
* OS: * OS:
* Browser: * Browser:
#### Impact Check List
<!--- Please select from the following options -->
- [ ] Data loss or misrepresented data?
- [ ] Regression? Did this used to work or has it always been broken?
- [ ] Is there a workaround available?
- [ ] Does this impact a critical component?
- [ ] Is this just a visual bug with no functional impact?
#### Additional Information #### Additional Information
<!--- Include any screenshots, gifs, or logs which will expedite triage --> <!--- Include any screenshots, gifs, or logs which will expedite triage -->

View File

@ -11,6 +11,8 @@ updates:
- "dependencies" - "dependencies"
- "pr:e2e" - "pr:e2e"
- "pr:daveit" - "pr:daveit"
- "pr:visual"
- "pr:platform"
- package-ecosystem: "github-actions" - package-ecosystem: "github-actions"
directory: "/" directory: "/"

View File

@ -28,7 +28,7 @@ jobs:
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v2 uses: actions/checkout@v3
# Initializes the CodeQL tools for scanning. # Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL - name: Initialize CodeQL

View File

@ -2,15 +2,22 @@ name: "e2e-pr"
on: on:
workflow_dispatch: workflow_dispatch:
pull_request: pull_request:
types: [ labeled ] types:
- labeled
- opened
jobs: jobs:
e2e-full: e2e-full:
if: ${{ github.event.label.name == 'pr:e2e' }} if: ${{ github.event.label.name == 'pr:e2e' }}
runs-on: ubuntu-latest runs-on: ${{ matrix.os }}
strategy:
matrix:
os:
- ubuntu-latest
- windows-latest
steps: steps:
- name: Trigger Success - name: Trigger Success
uses: actions/github-script@v5 uses: actions/github-script@v6
with: with:
script: | script: |
github.rest.issues.createComment({ github.rest.issues.createComment({
@ -19,20 +26,20 @@ jobs:
repo: "openmct", repo: "openmct",
body: 'Started e2e Run. Follow along: https://github.com/nasa/openmct/actions/runs/' + context.runId body: 'Started e2e Run. Follow along: https://github.com/nasa/openmct/actions/runs/' + context.runId
}) })
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions/setup-node@v2 - uses: actions/setup-node@v3
with: with:
node-version: '14' node-version: '16'
- run: npx playwright install-deps - run: npx playwright@1.19.2 install
- run: npm install - run: npm install
- run: npm run test:e2e:full - run: npm run test:e2e:full
- name: Archive test results - name: Archive test results
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
path: test-results path: test-results
- name: Test success - name: Test success
if: ${{ success() }} if: ${{ success() }}
uses: actions/github-script@v5 uses: actions/github-script@v6
with: with:
script: | script: |
github.rest.issues.createComment({ github.rest.issues.createComment({
@ -43,7 +50,7 @@ jobs:
}) })
- name: Test failure - name: Test failure
if: ${{ failure() }} if: ${{ failure() }}
uses: actions/github-script@v5 uses: actions/github-script@v6
with: with:
script: | script: |
github.rest.issues.createComment({ github.rest.issues.createComment({

View File

@ -4,6 +4,7 @@ on:
pull_request: pull_request:
types: types:
- labeled - labeled
- opened
schedule: schedule:
- cron: '28 21 * * 1-5' - cron: '28 21 * * 1-5'
@ -12,11 +13,11 @@ jobs:
if: ${{ github.event.label.name == 'pr:visual' }} || ${{ github.event.workflow_dispatch }} || ${{ github.event.schedule }} if: ${{ github.event.label.name == 'pr:visual' }} || ${{ github.event.workflow_dispatch }} || ${{ github.event.schedule }}
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions/setup-node@v2 - uses: actions/setup-node@v3
with: with:
node-version: '14' node-version: '16'
- run: npx playwright install-deps - run: npx playwright@1.19.2 install
- run: npm install - run: npm install
- name: Run the e2e visual tests - name: Run the e2e visual tests
run: npm run test:e2e:visual run: npm run test:e2e:visual

View File

@ -10,12 +10,12 @@ jobs:
e2e: e2e:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: with:
ref: ${{ github.event.inputs.version }} ref: ${{ github.event.inputs.version }}
- uses: actions/setup-node@v2 - uses: actions/setup-node@v3
with: with:
node-version: '14' node-version: '16'
- run: npm install - run: npm install
- name: Run the e2e tests - name: Run the e2e tests
run: npm run test:e2e:ci run: npm run test:e2e:ci

View File

@ -5,16 +5,94 @@ on:
version: version:
description: 'Which branch do you want to test?' # Limited to branch for now description: 'Which branch do you want to test?' # Limited to branch for now
required: false required: false
default: 'master' default: 'master'
pull_request:
types:
- labeled
jobs: jobs:
lighthouse: lighthouse-pr:
if: ${{ github.event.label.name == 'pr:lighthouse' }}
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - name: Checkout Master for Baseline
uses: actions/checkout@v3
with:
ref: master #explicitly checkout master for baseline
- name: Install Node 16
uses: actions/setup-node@v3
with:
node-version: '16'
- name: Cache node modules
uses: actions/cache@v2
env:
cache-name: cache-node-modules
with:
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}
- name: npm install with lighthouse cli
run: npm install && npm install -g @lhci/cli
- name: Run lhci against master to generate baseline and ignore exit codes
run: lhci autorun || true
- name: Perform clean checkout of PR
uses: actions/checkout@v3
with:
clean: true
- name: Install Node version which is compatible with PR
uses: actions/setup-node@v3
- name: npm install with lighthouse cli
run: npm install && npm install -g @lhci/cli
- name: Run lhci with PR
run: lhci autorun
env:
LHCI_GITHUB_APP_TOKEN: ${{ secrets.LHCI_GITHUB_APP_TOKEN }}
lighthouse-nightly:
if: ${{ github.event.schedule }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install Node 16
uses: actions/setup-node@v3
with:
node-version: '16'
- name: Cache node modules
uses: actions/cache@v2
env:
cache-name: cache-node-modules
with:
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}
- name: npm install with lighthouse cli
run: npm install && npm install -g @lhci/cli
- name: Run lhci against master to generate baseline
run: lhci autorun
env:
LHCI_GITHUB_APP_TOKEN: ${{ secrets.LHCI_GITHUB_APP_TOKEN }}
lighthouse-dispatch:
if: ${{ github.event.workflow_dispatch }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with: with:
ref: ${{ github.event.inputs.version }} ref: ${{ github.event.inputs.version }}
- uses: actions/setup-node@v2 - name: Install Node 14
uses: actions/setup-node@v3
with: with:
node-version: '14' node-version: '16'
- run: npm install && npm install -g @lhci/cli #Don't want to include this in our deps - name: Cache node modules
- run: lhci autorun uses: actions/cache@v3
env:
cache-name: cache-node-modules
with:
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}
- name: npm install with lighthouse cli
run: npm install && npm install -g @lhci/cli
- name: Run lhci against master to generate baseline
run: lhci autorun

View File

@ -11,10 +11,10 @@ jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions/setup-node@v2 - uses: actions/setup-node@v3
with: with:
node-version: 14 node-version: 16
- run: npm install - run: npm install
- run: npm test - run: npm test
@ -22,10 +22,10 @@ jobs:
needs: build needs: build
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions/setup-node@v2 - uses: actions/setup-node@v3
with: with:
node-version: 14 node-version: 16
registry-url: https://registry.npmjs.org/ registry-url: https://registry.npmjs.org/
- run: npm install - run: npm install
- run: npm publish --access public --tag unstable - run: npm publish --access public --tag unstable

34
.github/workflows/pr-platform.yml vendored Normal file
View File

@ -0,0 +1,34 @@
name: "pr-platform"
on:
workflow_dispatch:
pull_request:
types: [ labeled ]
jobs:
e2e-full:
if: ${{ github.event.label.name == 'pr:platform' }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os:
- ubuntu-latest
- macos-latest
- windows-latest
node_version:
- 14
- 16
- 18
architecture:
- x64
name: Node ${{ matrix.node_version }} - ${{ matrix.architecture }} on ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node_version }}
architecture: ${{ matrix.architecture }}
- run: npm install
- run: npm test
- run: npm run lint -- --quiet

View File

@ -1,12 +1,15 @@
name: PRcop name: PRCop
on: on:
pull_request: pull_request:
types: types:
- opened
- reopened
- edited - edited
- synchronize - synchronize
- ready_for_review - ready_for_review
- review_requested - review_requested
- review_request_removed
pull_request_review_comment: pull_request_review_comment:
types: types:
- created - created
@ -14,7 +17,7 @@ on:
jobs: jobs:
prcop: prcop:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: PRcop name: Template Check
steps: steps:
- name: Linting Pull Request - name: Linting Pull Request
uses: makaroni4/prcop@v1.0.35 uses: makaroni4/prcop@v1.0.35

View File

@ -1,44 +1,27 @@
*.scssc # Ignore everything first (will not ignore special files like LICENSE.md,
*.zip # README.md, and package.json)...
*.gzip /**/*
*.tgz
*.DS_Store
*.sass-cache # ...but include these folders...
*COMPILE.css !/dist/**/*
!/src/**/*
# Intellij project configuration files # We might be able to remove this if it is not imported by any project directly.
*.idea # https://github.com/nasa/openmct/issues/4992
*.iml !/example/**/*
# External dependencies # We will remove this in https://github.com/nasa/openmct/issues/4922
!/app.js
# Build output # ...except for these files in the above folders.
target /src/**/*Spec.js
/src/**/test/
# TODO move test utils into test/ folders
/src/utils/testing.js
# Mac OS X Finder # Also include these special top-level files.
.DS_Store !copyright-notice.js
!copyright-notice.html
# Closed source libraries !index.html
closed-lib !openmct.js
!SECURITY.md
# Node, Bower dependencies
node_modules
bower_components
Procfile
# Protractor logs
protractor/logs
# npm-debug log
npm-debug.log
# Infra and tests
.circleci
.github
e2e
codecov.yml
lighthouserc.yml
*.Spec.js
karma.conf.js

5
.npmrc
View File

@ -1,9 +1,4 @@
loglevel=warn loglevel=warn
# Temporary: istanbul-instrumenter-loader is working with webpack 5, but states
# webpack 4 being the latest version it supports, so this legacy-peer-deps
# allows us to install it anyway.
legacy-peer-deps=true
#Prevent folks from ignoring an important error when building from source #Prevent folks from ignoring an important error when building from source
engine-strict=true engine-strict=true

View File

@ -65,6 +65,12 @@ Open MCT is built using [`npm`](http://npmjs.com/) and [`webpack`](https://webpa
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). 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).
## Compatibility
This is a fast moving project and we do our best to test and support the widest possible range of browsers, operating systems, and nodejs APIs. We have a published list of support available in our package.json's `browserslist` key.
If you encounter an issue with a particular browser, OS, or nodejs API, please file a [GitHub issue](https://github.com/nasa/openmct/issues/new/choose)
## Plugins ## Plugins
Open MCT can be extended via plugins that make calls to the Open MCT API. A plugin is a group Open MCT can be extended via plugins that make calls to the Open MCT API. A plugin is a group

2
app.js
View File

@ -64,7 +64,7 @@ app.use(require('webpack-dev-middleware')(
compiler, compiler,
{ {
publicPath: '/dist', publicPath: '/dist',
logLevel: 'warn' stats: 'errors-warnings'
} }
)); ));

9
babel.coverage.js Normal file
View File

@ -0,0 +1,9 @@
// This is a Babel config that webpack.coverage.js uses in order to instrument
// code with coverage instrumentation.
const babelConfig = {
plugins: [['babel-plugin-istanbul', {
extension: ['.js', '.vue']
}]]
};
module.exports = babelConfig;

View File

@ -0,0 +1,62 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2022, 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.
*****************************************************************************/
/*
This test suite is dedicated to tests which verify branding related components.
*/
const { test, expect } = require('@playwright/test');
test.describe('Branding tests', () => {
test('About Modal launches with basic branding properties', async ({ page }) => {
// Go to baseURL
await page.goto('/', { waitUntil: 'networkidle' });
// Click About button
await page.click('.l-shell__app-logo');
// Verify that the NASA Logo Appears
await expect(await page.locator('.c-about__image')).toBeVisible();
// Modify the Build information in 'about' Modal
const versionInformationLocator = page.locator('ul.t-info.l-info.s-info');
await expect(versionInformationLocator).toBeEnabled();
await expect.soft(versionInformationLocator).toContainText(/Version: \d/);
await expect.soft(versionInformationLocator).toContainText(/Build Date: ((?:Mon|Tue|Wed|Thu|Fri|Sat|Sun))/);
await expect.soft(versionInformationLocator).toContainText(/Revision: \b[0-9a-f]{5,40}\b/);
await expect.soft(versionInformationLocator).toContainText(/Branch: ./);
});
test('Verify Links in About Modal', async ({ page }) => {
// Go to baseURL
await page.goto('/', { waitUntil: 'networkidle' });
// Click About button
await page.click('.l-shell__app-logo');
// Verify that clicking on the third party licenses information opens up another tab on licenses url
const [page2] = await Promise.all([
page.waitForEvent('popup'),
page.locator('text=click here for third party licensing information').click()
]);
expect(page2.waitForURL('**\/licenses**')).toBeTruthy();
});
});

View File

@ -0,0 +1,62 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2022, 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.
*****************************************************************************/
/*
This test suite is dedicated to tests which verify the basic operations surrounding the example event generator.
*/
const { test, expect } = require('@playwright/test');
test.describe('Example Event Generator Operations', () => {
test('Can create example event generator with a name', async ({ page }) => {
//Go to baseURL
await page.goto('/', { waitUntil: 'networkidle' });
// let's make an event generator
await page.locator('button:has-text("Create")').click();
// Click li:has-text("Event Message Generator")
await page.locator('li:has-text("Event Message Generator")').click();
// Click text=Properties Title Notes >> input[type="text"]
await page.locator('text=Properties Title Notes >> input[type="text"]').click();
// Fill text=Properties Title Notes >> input[type="text"]
await page.locator('text=Properties Title Notes >> input[type="text"]').fill('Test Event Generator');
// Press Enter
await page.locator('text=Properties Title Notes >> input[type="text"]').press('Enter');
// Click text=OK
await Promise.all([
page.waitForNavigation({ url: /.*&view=table/ }),
page.locator('text=OK').click()
]);
await expect(page.locator('.l-browse-bar__object-name')).toContainText('Test Event Generator');
// Click button:has-text("Fixed Timespan")
await page.locator('button:has-text("Fixed Timespan")').click();
});
test.fixme('telemetry is coming in for test event', async ({ page }) => {
// Go to object created in step one
// Verify the telemetry table is filled with > 1 row
});
test.fixme('telemetry is sorted by time ascending', async ({ page }) => {
// Go to object created in step one
// Verify the telemetry table has a class with "is-sorting asc"
});
});

View File

@ -0,0 +1,166 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2022, 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.
*****************************************************************************/
/*
This test suite is dedicated to tests which verify the basic operations surrounding conditionSets.
*/
const { test, expect } = require('@playwright/test');
test.describe('Sine Wave Generator', () => {
test('Create new Sine Wave Generator Object and validate create Form Logic', async ({ page }) => {
//Go to baseURL
await page.goto('/', { waitUntil: 'networkidle' });
//Click the Create button
await page.click('button:has-text("Create")');
// Click Sine Wave Generator
await page.click('text=Sine Wave Generator');
// Verify that the each required field has required indicator
// Title
await expect(page.locator('.c-form-row__state-indicator').first()).toHaveClass(['c-form-row__state-indicator req']);
// Verify that the Notes row does not have a required indicator
await expect(page.locator('.c-form__section div:nth-child(3) .form-row .c-form-row__state-indicator')).not.toContain('.req');
// Period
await expect(page.locator('.c-form__section div:nth-child(4) .form-row .c-form-row__state-indicator')).toHaveClass(['c-form-row__state-indicator req']);
// Amplitude
await expect(page.locator('.c-form__section div:nth-child(5) .form-row .c-form-row__state-indicator')).toHaveClass(['c-form-row__state-indicator req']);
// Offset
await expect(page.locator('.c-form__section div:nth-child(6) .form-row .c-form-row__state-indicator')).toHaveClass(['c-form-row__state-indicator req']);
// Data Rate
await expect(page.locator('.c-form__section div:nth-child(7) .form-row .c-form-row__state-indicator')).toHaveClass(['c-form-row__state-indicator req']);
// Phase
await expect(page.locator('.c-form__section div:nth-child(8) .form-row .c-form-row__state-indicator')).toHaveClass(['c-form-row__state-indicator req']);
// Randomness
await expect(page.locator('.c-form__section div:nth-child(9) .form-row .c-form-row__state-indicator')).toHaveClass(['c-form-row__state-indicator req']);
// Verify that by removing value from required text field shows invalid indicator
await page.locator('text=Properties Title Notes Period Amplitude Offset Data Rate (hz) Phase (radians) Ra >> input[type="text"]').fill('');
await expect(page.locator('.c-form-row__state-indicator').first()).toHaveClass(['c-form-row__state-indicator req invalid']);
// Verify that by adding value to empty required text field changes invalid to valid indicator
await page.locator('text=Properties Title Notes Period Amplitude Offset Data Rate (hz) Phase (radians) Ra >> input[type="text"]').fill('non empty');
await expect(page.locator('.c-form-row__state-indicator').first()).toHaveClass(['c-form-row__state-indicator req valid']);
// Verify that by removing value from required number field shows invalid indicator
await page.locator('.field.control.l-input-sm input').first().fill('');
await expect(page.locator('.c-form__section div:nth-child(4) .form-row .c-form-row__state-indicator')).toHaveClass(['c-form-row__state-indicator req invalid']);
// Verify that by adding value to empty required number field changes invalid to valid indicator
await page.locator('.field.control.l-input-sm input').first().fill('3');
await expect(page.locator('.c-form__section div:nth-child(4) .form-row .c-form-row__state-indicator')).toHaveClass(['c-form-row__state-indicator req valid']);
// Verify that can change value of number field by up/down arrows keys
// Click .field.control.l-input-sm input >> nth=0
await page.locator('.field.control.l-input-sm input').first().click();
// Press ArrowUp 3 times to change value from 3 to 6
await page.locator('.field.control.l-input-sm input').first().press('ArrowUp');
await page.locator('.field.control.l-input-sm input').first().press('ArrowUp');
await page.locator('.field.control.l-input-sm input').first().press('ArrowUp');
const value = await page.locator('.field.control.l-input-sm input').first().inputValue();
await expect(value).toBe('6');
// Click .c-form-row__state-indicator.grows
await page.locator('.c-form-row__state-indicator.grows').click();
// Click text=Properties Title Notes Period Amplitude Offset Data Rate (hz) Phase (radians) Ra >> input[type="text"]
await page.locator('text=Properties Title Notes Period Amplitude Offset Data Rate (hz) Phase (radians) Ra >> input[type="text"]').click();
// Click .c-form-row__state-indicator >> nth=0
await page.locator('.c-form-row__state-indicator').first().click();
// Fill text=Properties Title Notes Period Amplitude Offset Data Rate (hz) Phase (radians) Ra >> input[type="text"]
await page.locator('text=Properties Title Notes Period Amplitude Offset Data Rate (hz) Phase (radians) Ra >> input[type="text"]').fill('New Sine Wave Generator');
// Double click div:nth-child(4) .form-row .c-form-row__controls
await page.locator('div:nth-child(4) .form-row .c-form-row__controls').dblclick();
// Click .field.control.l-input-sm input >> nth=0
await page.locator('.field.control.l-input-sm input').first().click();
// Click div:nth-child(4) .form-row .c-form-row__state-indicator
await page.locator('div:nth-child(4) .form-row .c-form-row__state-indicator').click();
// Click .field.control.l-input-sm input >> nth=0
await page.locator('.field.control.l-input-sm input').first().click();
// Click .field.control.l-input-sm input >> nth=0
await page.locator('.field.control.l-input-sm input').first().click();
// Click div:nth-child(5) .form-row .c-form-row__controls .form-control .field input
await page.locator('div:nth-child(5) .form-row .c-form-row__controls .form-control .field input').click();
// Click div:nth-child(5) .form-row .c-form-row__controls .form-control .field input
await page.locator('div:nth-child(5) .form-row .c-form-row__controls .form-control .field input').click();
// Click div:nth-child(5) .form-row .c-form-row__controls .form-control .field input
await page.locator('div:nth-child(5) .form-row .c-form-row__controls .form-control .field input').click();
// Click div:nth-child(6) .form-row .c-form-row__controls .form-control .field input
await page.locator('div:nth-child(6) .form-row .c-form-row__controls .form-control .field input').click();
// Double click div:nth-child(7) .form-row .c-form-row__controls .form-control .field input
await page.locator('div:nth-child(7) .form-row .c-form-row__controls .form-control .field input').dblclick();
// Click div:nth-child(7) .form-row .c-form-row__state-indicator
await page.locator('div:nth-child(7) .form-row .c-form-row__state-indicator').click();
// Click div:nth-child(7) .form-row .c-form-row__controls .form-control .field input
await page.locator('div:nth-child(7) .form-row .c-form-row__controls .form-control .field input').click();
// Fill div:nth-child(7) .form-row .c-form-row__controls .form-control .field input
await page.locator('div:nth-child(7) .form-row .c-form-row__controls .form-control .field input').fill('3');
//Click text=OK
await Promise.all([
page.waitForNavigation(),
page.click('text=OK')
]);
// Verify that the Sine Wave Generator is displayed and correct
// Verify object properties
await expect(page.locator('.l-browse-bar__object-name')).toContainText('New Sine Wave Generator');
// Verify canvas rendered
await page.locator('canvas').nth(1).click({
position: {
x: 341,
y: 28
}
});
// Verify that where we click on canvas shows the number we clicked on
// Note that any number will do, we just care that a number exists
await expect(page.locator('.value-to-display-nearestValue')).toContainText(/[+-]?([0-9]*[.])?[0-9]+/);
});
});

View File

@ -1,50 +1,42 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2022, United States Government * Open MCT, Copyright (c) 2014-2022, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
* Open MCT is licensed under the Apache License, Version 2.0 (the * 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. * "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0. * http://www.apache.org/licenses/LICENSE-2.0.
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations * License for the specific language governing permissions and limitations
* under the License. * under the License.
* *
* Open MCT includes source code licensed under additional open source * Open MCT includes source code licensed under additional open source
* licenses. See the Open Source Licenses file (LICENSES.md) included with * licenses. See the Open Source Licenses file (LICENSES.md) included with
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
import {
createOpenMct, /*
resetApplicationState This test suite is dedicated to tests which verify the basic operations surrounding moving objects.
} from 'utils/testing'; */
describe("the plugin", () => { const { test, expect } = require('@playwright/test');
const NON_EDITABLE_FOLDER_KEY = 'noneditable.folder';
let openmct; test.describe('Move item tests', () => {
test.fixme('Create a basic object and verify that it can be moved to another Folder', async ({ page }) => {
beforeEach((done) => { //Create and save Folder
openmct = createOpenMct(); //Create and save Domain Object
openmct.install(openmct.plugins.NonEditableFolder()); //Verify that the newly created domain object can be moved to Folder from Step 1.
//Verify that newly moved object appears in the correct point in Tree
openmct.on('start', done); //Verify that newly moved object appears correctly in Inspector panel
openmct.startHeadless(); });
}); test.fixme('Create a basic object and verify that it cannot be moved to object without Composition Provider', async ({ page }) => {
//Create and save Telemetry Object
afterEach(() => { //Create and save Domain Object
return resetApplicationState(openmct); //Verify that the newly created domain object cannot be moved to Telemetry Object from step 1.
}); });
});
it('adds the new non-editable folder type', () => {
const type = openmct.types.get(NON_EDITABLE_FOLDER_KEY);
expect(type).toBeDefined();
expect(type.definition.creatable).toBeFalse();
});
});

View File

@ -0,0 +1,27 @@
(function () {
document.addEventListener('DOMContentLoaded', () => {
const PERSISTENCE_KEY = 'persistence-tests';
const openmct = window.openmct;
openmct.objects.addRoot({
namespace: PERSISTENCE_KEY,
key: PERSISTENCE_KEY
});
openmct.objects.addProvider(PERSISTENCE_KEY, {
get(identifier) {
if (identifier.key !== PERSISTENCE_KEY) {
return undefined;
} else {
return Promise.resolve({
identifier,
type: 'folder',
name: 'Persistence Testing',
location: 'ROOT',
composition: []
});
}
}
});
});
}());

View File

@ -0,0 +1,77 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2022, 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.
*****************************************************************************/
/*
This test suite is dedicated to tests which verify the basic operations surrounding conditionSets.
*/
const { test, expect } = require('@playwright/test');
const path = require('path');
// https://github.com/nasa/openmct/issues/4323#issuecomment-1067282651
test.describe('Persistence operations', () => {
// add non persistable root item
test.beforeEach(async ({ page }) => {
// eslint-disable-next-line no-undef
await page.addInitScript({ path: path.join(__dirname, 'addNoneditableObject.js') });
});
test('Persistability should be respected in the create form location field', async ({ page }) => {
// Go to baseURL
await page.goto('/', { waitUntil: 'networkidle' });
// Click the Create button
await page.click('button:has-text("Create")');
// Click text=Condition Set
await page.click('text=Condition Set');
// Click form[name="mctForm"] >> text=Persistence Testing
await page.locator('form[name="mctForm"] >> text=Persistence Testing').click();
// Check that "OK" button is disabled
const okButton = page.locator('button:has-text("OK")');
await expect(okButton).toBeDisabled();
});
test('Non-persistable objects should not show persistence related actions', async ({ page }) => {
// Go to baseURL
await page.goto('/', { waitUntil: 'networkidle' });
// Click text=Persistence Testing >> nth=0
await page.locator('text=Persistence Testing').first().click({
button: 'right'
});
const menuOptions = page.locator('.c-menu ul');
await expect.soft(menuOptions).toContainText(['Open In New Tab', 'View', 'Create Link']);
await expect(menuOptions).not.toContainText(['Move', 'Duplicate', 'Remove', 'Add New Folder', 'Edit Properties...', 'Export as JSON', 'Import from JSON']);
});
test.fixme('Cannot move a previously created domain object to non-peristable boject in Move Modal', async ({ page }) => {
//Create a domain object
//Save Domain object
//Move Object and verify that cannot select non-persistable object
//Move Object to My Items
//Verify successful move
});
});

View File

@ -0,0 +1,48 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2022, 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.
*****************************************************************************/
/*
This test suite is dedicated to tests which verify the basic operations surrounding exportAsJSON.
*/
const { test, expect } = require('@playwright/test');
test.describe('ExportAsJSON', () => {
test.fixme('Create a basic object and verify that it can be exported as JSON from Tree', async ({ page }) => {
//Create domain object
//Save Domain Object
//Verify that the newly created domain object can be exported as JSON from the Tree
});
test.fixme('Create a basic object and verify that it can be exported as JSON from 3 dot menu', async ({ page }) => {
//Create domain object
//Save Domain Object
//Verify that the newly created domain object can be exported as JSON from the 3 dot menu
});
test.fixme('Verify that a nested Object can be exported as JSON', async ({ page }) => {
// Create 2 objects with hierarchy
// Export as JSON
// Verify Hiearchy
});
test.fixme('Verify that the ExportAsJSON dropdown does not appear for the item X', async ({ page }) => {
// Other than non-persistible objects
});
});

View File

@ -0,0 +1,46 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2022, 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.
*****************************************************************************/
/*
This test suite is dedicated to tests which verify the basic operations surrounding importAsJSON.
*/
const { test, expect } = require('@playwright/test');
test.describe('ExportAsJSON', () => {
test.fixme('Verify that domain object can be importAsJSON from Tree', async ({ page }) => {
//Verify that an testdata JSON file can be imported from Tree
//Verify correctness of imported domain object
});
test.fixme('Verify that domain object can be importAsJSON from 3 dot menu on folder', async ({ page }) => {
//Verify that an testdata JSON file can be imported from 3 dot menu on folder domain object
//Verify correctness of imported domain object
});
test.fixme('Verify that a nested Objects can be importAsJSON', async ({ page }) => {
// Testdata with hierarchy
// ImportAsJSON on Tree
// Verify Hierarchy
});
test.fixme('Verify that the ImportAsJSON dropdown does not appear for the item X', async ({ page }) => {
// Other than non-persistible objects
});
});

View File

@ -0,0 +1,66 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2022, 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.
*****************************************************************************/
/*
This test suite is dedicated to tests which verify the basic operations surrounding Clock.
*/
const { test, expect } = require('@playwright/test');
test.describe('Clock Generator', () => {
test('Timezone dropdown will collapse when clicked outside or on dropdown icon again', async ({ page }) => {
test.info().annotations.push({
type: 'issue',
description: 'https://github.com/nasa/openmct/issues/4878'
});
//Go to baseURL
await page.goto('/', { waitUntil: 'networkidle' });
//Click the Create button
await page.click('button:has-text("Create")');
// Click Clock
await page.click('text=Clock');
// Click .icon-arrow-down
await page.locator('.icon-arrow-down').click();
//verify if the autocomplete dropdown is visible
await expect(page.locator(".optionPreSelected")).toBeVisible();
// Click .icon-arrow-down
await page.locator('.icon-arrow-down').click();
// Verify clicking on the autocomplete arrow collapses the dropdown
await expect(page.locator(".optionPreSelected")).not.toBeVisible();
// Click timezone input to open dropdown
await page.locator('.autocompleteInput').click();
//verify if the autocomplete dropdown is visible
await expect(page.locator(".optionPreSelected")).toBeVisible();
// Verify clicking outside the autocomplete dropdown collapses it
await page.locator('text=Timezone').click();
// Verify clicking on the autocomplete arrow collapses the dropdown
await expect(page.locator(".optionPreSelected")).not.toBeVisible();
});
});

View File

@ -26,8 +26,8 @@ This test suite is dedicated to tests which verify the basic operations surround
const { test, expect } = require('@playwright/test'); const { test, expect } = require('@playwright/test');
test.describe('condition set', () => { test.describe('Condition Set Operations', () => {
test('create new button `condition set` creates new condition object', async ({ page }) => { test('Create new button `condition set` creates new condition object', async ({ page }) => {
//Go to baseURL //Go to baseURL
await page.goto('/', { waitUntil: 'networkidle' }); await page.goto('/', { waitUntil: 'networkidle' });
@ -45,4 +45,21 @@ test.describe('condition set', () => {
await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Condition Set'); await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Condition Set');
}); });
test.fixme('condition set object properties exist', async ({ page }) => {
//Go to object created in step one
//Verify the Condition Set properties persist on Save
//Verify the Condition Set properties persist on page.reload()
});
test.fixme('condition set object can be modified', async ({ page }) => {
//Go to object created in step one
//Update the Condition Set properties
//Verify the Condition Set properties persist on Save
//Verify the Condition Set properties persist on page.reload()
});
test.fixme('condition set object can be deleted', async ({ page }) => {
//Go to object created in step one
//Verify that Condition Set object can be deleted
//Verify the Condition Set object does not exist in Tree
//Verify the Condition Set object does not exist with direct navigation to object's URL
});
}); });

View File

@ -0,0 +1,217 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2022, 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.
*****************************************************************************/
/*
This test suite is dedicated to tests which verify the basic operations surrounding imagery,
but only assume that example imagery is present.
*/
const { test, expect } = require('@playwright/test');
test.describe('Example Imagery', () => {
test.beforeEach(async ({ page }) => {
page.on('console', msg => console.log(msg.text()))
//Go to baseURL
await page.goto('/', { waitUntil: 'networkidle' });
//Click the Create button
await page.click('button:has-text("Create")');
// Click text=Example Imagery
await page.click('text=Example Imagery');
// Click text=OK
await Promise.all([
page.waitForNavigation(/*{ url: 'http://localhost:8080/#/browse/mine/dab945d4-5a84-480e-8180-222b4aa730fa?tc.mode=fixed&tc.startBound=1639696164435&tc.endBound=1639697964435&tc.timeSystem=utc&view=conditionSet.view' }*/),
page.click('text=OK')
]);
await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Example Imagery');
});
const backgroundImageSelector = '.c-imagery__main-image__background-image';
test('Can use Mouse Wheel to zoom in and out of latest image', async ({ page }) => {
const bgImageLocator = await page.locator(backgroundImageSelector);
const deltaYStep = 100; //equivalent to 1x zoom
await bgImageLocator.hover();
const originalImageDimensions = await page.locator(backgroundImageSelector).boundingBox();
// zoom in
await bgImageLocator.hover();
await page.mouse.wheel(0, deltaYStep * 2);
// wait for zoom animation to finish
await bgImageLocator.hover();
const imageMouseZoomedIn = await page.locator(backgroundImageSelector).boundingBox();
// zoom out
await bgImageLocator.hover();
await page.mouse.wheel(0, -deltaYStep);
// wait for zoom animation to finish
await bgImageLocator.hover();
const imageMouseZoomedOut = await page.locator(backgroundImageSelector).boundingBox();
expect(imageMouseZoomedIn.height).toBeGreaterThan(originalImageDimensions.height);
expect(imageMouseZoomedIn.width).toBeGreaterThan(originalImageDimensions.width);
expect(imageMouseZoomedOut.height).toBeLessThan(imageMouseZoomedIn.height);
expect(imageMouseZoomedOut.width).toBeLessThan(imageMouseZoomedIn.width);
});
test('Can use alt+drag to move around image once zoomed in', async ({ page }) => {
const deltaYStep = 100; //equivalent to 1x zoom
const bgImageLocator = await page.locator(backgroundImageSelector);
await bgImageLocator.hover();
// zoom in
await page.mouse.wheel(0, deltaYStep * 2);
await bgImageLocator.hover();
const zoomedBoundingBox = await bgImageLocator.boundingBox();
const imageCenterX = zoomedBoundingBox.x + zoomedBoundingBox.width / 2;
const imageCenterY = zoomedBoundingBox.y + zoomedBoundingBox.height / 2;
// move to the right
// center the mouse pointer
await page.mouse.move(imageCenterX, imageCenterY);
// pan right
await page.keyboard.down('Alt');
await page.mouse.down();
await page.mouse.move(imageCenterX - 200, imageCenterY, 10);
await page.mouse.up();
await page.keyboard.up('Alt');
const afterRightPanBoundingBox = await bgImageLocator.boundingBox();
expect(zoomedBoundingBox.x).toBeGreaterThan(afterRightPanBoundingBox.x);
// pan left
await page.keyboard.down('Alt');
await page.mouse.down();
await page.mouse.move(imageCenterX, imageCenterY, 10);
await page.mouse.up();
await page.keyboard.up('Alt');
const afterLeftPanBoundingBox = await bgImageLocator.boundingBox();
expect(afterRightPanBoundingBox.x).toBeLessThan(afterLeftPanBoundingBox.x);
// pan up
await page.mouse.move(imageCenterX, imageCenterY);
await page.keyboard.down('Alt');
await page.mouse.down();
await page.mouse.move(imageCenterX, imageCenterY + 200, 10);
await page.mouse.up();
await page.keyboard.up('Alt');
const afterUpPanBoundingBox = await bgImageLocator.boundingBox();
expect(afterUpPanBoundingBox.y).toBeGreaterThan(afterLeftPanBoundingBox.y);
// pan down
await page.keyboard.down('Alt');
await page.mouse.down();
await page.mouse.move(imageCenterX, imageCenterY - 200, 10);
await page.mouse.up();
await page.keyboard.up('Alt');
const afterDownPanBoundingBox = await bgImageLocator.boundingBox();
expect(afterDownPanBoundingBox.y).toBeLessThan(afterUpPanBoundingBox.y);
});
test('Can use + - buttons to zoom on the image', async ({ page }) => {
const bgImageLocator = await page.locator(backgroundImageSelector);
await bgImageLocator.hover();
const zoomInBtn = await page.locator('.t-btn-zoom-in');
const zoomOutBtn = await page.locator('.t-btn-zoom-out');
const initialBoundingBox = await bgImageLocator.boundingBox();
await zoomInBtn.click();
await zoomInBtn.click();
// wait for zoom animation to finish
await bgImageLocator.hover();
const zoomedInBoundingBox = await bgImageLocator.boundingBox();
expect(zoomedInBoundingBox.height).toBeGreaterThan(initialBoundingBox.height);
expect(zoomedInBoundingBox.width).toBeGreaterThan(initialBoundingBox.width);
await zoomOutBtn.click();
// wait for zoom animation to finish
await bgImageLocator.hover();
const zoomedOutBoundingBox = await bgImageLocator.boundingBox();
expect(zoomedOutBoundingBox.height).toBeLessThan(zoomedInBoundingBox.height);
expect(zoomedOutBoundingBox.width).toBeLessThan(zoomedInBoundingBox.width);
});
test('Can use the reset button to reset the image', async ({ page }) => {
const bgImageLocator = await page.locator(backgroundImageSelector);
await bgImageLocator.hover();
const zoomInBtn = await page.locator('.t-btn-zoom-in');
const zoomResetBtn = await page.locator('.t-btn-zoom-reset');
const initialBoundingBox = await bgImageLocator.boundingBox();
await zoomInBtn.click();
await zoomInBtn.click();
// wait for zoom animation to finish
await bgImageLocator.hover();
const zoomedInBoundingBox = await bgImageLocator.boundingBox();
expect.soft(zoomedInBoundingBox.height).toBeGreaterThan(initialBoundingBox.height);
expect.soft(zoomedInBoundingBox.width).toBeGreaterThan(initialBoundingBox.width);
await zoomResetBtn.click();
await bgImageLocator.hover();
const resetBoundingBox = await bgImageLocator.boundingBox();
expect.soft(resetBoundingBox.height).toBeLessThan(zoomedInBoundingBox.height);
expect.soft(resetBoundingBox.width).toBeLessThan(zoomedInBoundingBox.width);
expect.soft(resetBoundingBox.height).toEqual(initialBoundingBox.height);
expect(resetBoundingBox.width).toEqual(initialBoundingBox.width);
});
//test('Can use Mouse Wheel to zoom in and out of previous image');
//test('Can zoom into the latest image and the real-time/fixed-time imagery will pause');
//test.skip('Can zoom into a previous image from thumbstrip in real-time or fixed-time');
//test.skip('Clicking on the left arrow should pause the imagery and go to previous image');
//test.skip('If the imagery view is in pause mode, it should not be updated when new images come in');
//test.skip('If the imagery view is not in pause mode, it should be updated when new images come in');
});
test.describe('Example Imagery in Display layout', () => {
test.skip('Can use Mouse Wheel to zoom in and out of previous image');
test.skip('Can use alt+drag to move around image once zoomed in');
test.skip('Can zoom into the latest image and the real-time/fixed-time imagery will pause');
test.skip('Clicking on the left arrow should pause the imagery and go to previous image');
test.skip('If the imagery view is in pause mode, it should not be updated when new images come in');
test.skip('If the imagery view is not in pause mode, it should be updated when new images come in');
});
test.describe('Example Imagery in Flexible layout', () => {
test.skip('Can use Mouse Wheel to zoom in and out of previous image');
test.skip('Can use alt+drag to move around image once zoomed in');
test.skip('Can zoom into the latest image and the real-time/fixed-time imagery will pause');
test.skip('Clicking on the left arrow should pause the imagery and go to previous image');
test.skip('If the imagery view is in pause mode, it should not be updated when new images come in');
test.skip('If the imagery view is not in pause mode, it should be updated when new images come in');
});
test.describe('Example Imagery in Tabs view', () => {
test.skip('Can use Mouse Wheel to zoom in and out of previous image');
test.skip('Can use alt+drag to move around image once zoomed in');
test.skip('Can zoom into the latest image and the real-time/fixed-time imagery will pause');
test.skip('Can zoom into a previous image from thumbstrip in real-time or fixed-time');
test.skip('Clicking on the left arrow should pause the imagery and go to previous image');
test.skip('If the imagery view is in pause mode, it should not be updated when new images come in');
test.skip('If the imagery view is not in pause mode, it should be updated when new images come in');
});

View File

@ -0,0 +1,190 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2022, 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.
*****************************************************************************/
/*
Test for plot autoscale.
*/
const { test: _test, expect } = require('@playwright/test');
// create a new `test` API that will not append platform details to snapshot
// file names, only for the tests in this file, so that the same snapshots will
// be used for all platforms.
const test = _test.extend({
_autoSnapshotSuffix: [
async ({}, use, testInfo) => {
testInfo.snapshotSuffix = '';
await use();
},
{ auto: true }
]
});
test.use({
viewport: {
width: 1280,
height: 720
}
});
test.describe('ExportAsJSON', () => {
test('autoscale off causes no error from undefined user range', async ({ page }) => {
await page.goto('/', { waitUntil: 'networkidle' });
await setTimeRange(page);
await createSinewaveOverlayPlot(page);
await testYTicks(page, ['-1.00', '-0.50', '0.00', '0.50', '1.00']);
await turnOffAutoscale(page);
const canvas = page.locator('canvas').nth(1);
// Make sure that after turning off autoscale, the user selected range values start at the same values the plot had prior.
await Promise.all([
testYTicks(page, ['-1.00', '-0.50', '0.00', '0.50', '1.00']),
new Promise(r => setTimeout(r, 100))
.then(() => canvas.screenshot())
.then(shot => expect(shot).toMatchSnapshot('autoscale-canvas-prepan.png', { maxDiffPixels: 40 }))
]);
let errorCount = 0;
function onError() {
errorCount++;
}
page.on('pageerror', onError);
await page.keyboard.down('Alt');
await canvas.dragTo(canvas, {
sourcePosition: {
x: 200,
y: 200
},
targetPosition: {
x: 400,
y: 400
}
});
await page.keyboard.up('Alt');
page.off('pageerror', onError);
// There would have been an error at this point. So if there isn't, then
// we fixed it.
expect(errorCount).toBe(0);
// Ensure the drag worked.
await Promise.all([
testYTicks(page, ['0.00', '0.50', '1.00', '1.50', '2.00']),
new Promise(r => setTimeout(r, 100))
.then(() => canvas.screenshot())
.then(shot => expect(shot).toMatchSnapshot('autoscale-canvas-panned.png', { maxDiffPixels: 40 }))
]);
});
});
/**
* @param {import('@playwright/test').Page} page
* @param {string} start
* @param {string} end
*/
async function setTimeRange(page, start = '2022-03-29 22:00:00.000Z', end = '2022-03-29 22:00:30.000Z') {
// Set a specific time range for consistency, otherwise it will change
// on every test to a range based on the current time.
const timeInputs = page.locator('input.c-input--datetime');
await timeInputs.first().click();
await timeInputs.first().fill(start);
await timeInputs.nth(1).click();
await timeInputs.nth(1).fill(end);
}
/**
* @param {import('@playwright/test').Page} page
*/
async function createSinewaveOverlayPlot(page) {
// click create button
await page.locator('button:has-text("Create")').click();
// add overlay plot with defaults
await page.locator('li:has-text("Overlay Plot")').click();
await Promise.all([
page.waitForNavigation(/*{ url: 'http://localhost:8080/#/browse/mine/a9268c6f-45cc-4bcd-a6a0-50ac4036e396?tc.mode=fixed&tc.startBound=1649305424163&tc.endBound=1649307224163&tc.timeSystem=utc&view=plot-overlay' }*/),
page.locator('text=OK').click()
]);
// save (exit edit mode)
await page.locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button').nth(1).click();
await page.locator('text=Save and Finish Editing').click();
// click create button
await page.locator('button:has-text("Create")').click();
// add sine wave generator with defaults
await page.locator('li:has-text("Sine Wave Generator")').click();
await Promise.all([
page.waitForNavigation(/*{ url: 'http://localhost:8080/#/browse/mine/a9268c6f-45cc-4bcd-a6a0-50ac4036e396/5cfa5c69-17bc-4a99-9545-4da8125380c5?tc.mode=fixed&tc.startBound=1649305424163&tc.endBound=1649307224163&tc.timeSystem=utc&view=plot-single' }*/),
page.locator('text=OK').click()
]);
// focus the overlay plot
await page.locator('text=Open MCT My Items >> span').nth(3).click();
await Promise.all([
page.waitForNavigation(/*{ url: 'http://localhost:8080/#/browse/mine/a9268c6f-45cc-4bcd-a6a0-50ac4036e396?tc.mode=fixed&tc.startBound=1649305424163&tc.endBound=1649307224163&tc.timeSystem=utc&view=plot-overlay' }*/),
page.locator('text=Unnamed Overlay Plot').first().click()
]);
}
/**
* @param {import('@playwright/test').Page} page
*/
async function turnOffAutoscale(page) {
// enter edit mode
await page.locator('text=Unnamed Overlay Plot Snapshot >> button').nth(3).click();
// uncheck autoscale
await page.locator('text=Y Axis Scaling Auto scale Padding >> input[type="checkbox"]').uncheck();
// save
await page.locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button').nth(1).click();
await page.locator('text=Save and Finish Editing').click();
}
/**
* @param {import('@playwright/test').Page} page
*/
async function testYTicks(page, values) {
const yTicks = page.locator('.gl-plot-y-tick-label');
let promises = [yTicks.count().then(c => expect(c).toBe(values.length))];
for (let i = 0, l = values.length; i < l; i += 1) {
promises.push(expect(yTicks.nth(i)).toHaveText(values[i])); // eslint-disable-line
}
await Promise.all(promises);
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

View File

@ -0,0 +1,279 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2022, 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.
*****************************************************************************/
/*
Tests to verify log plot functionality.
*/
const { test, expect } = require('@playwright/test');
test.describe('Log plot tests', () => {
test.only('Can create a log plot.', async ({ page }) => {
await makeOverlayPlot(page);
await testRegularTicks(page);
await enableEditMode(page);
await enableLogMode(page);
await testLogTicks(page);
await disableLogMode(page);
await testRegularTicks(page);
await enableLogMode(page);
await testLogTicks(page);
await saveOverlayPlot(page);
await testLogTicks(page);
await testLogPlotPixels(page);
// refresh page
await page.reload();
// test log ticks hold up after refresh
await testLogTicks(page);
await testLogPlotPixels(page);
});
test.only('Verify that log mode option is reflected in import/export JSON', async ({ page }) => {
await makeOverlayPlot(page);
await enableEditMode(page);
await enableLogMode(page);
await saveOverlayPlot(page);
// TODO ...export, delete the overlay, then import it...
await testLogTicks(page);
// TODO, the plot is slightly at different position that in the other test, so this fails.
// ...We can fix it by copying all steps from the first test...
// await testLogPlotPixels(page);
});
});
/**
* Makes an overlay plot with a sine wave generator and clicks on the overlay plot in the sidebar so it is the active thing displayed.
* @param {import('@playwright/test').Page} page
*/
async function makeOverlayPlot(page) {
// fresh page with time range from 2022-03-29 22:00:00.000Z to 2022-03-29 22:00:30.000Z
await page.goto('/', { waitUntil: 'networkidle' });
// Set a specific time range for consistency, otherwise it will change
// on every test to a range based on the current time.
const timeInputs = page.locator('input.c-input--datetime');
await timeInputs.first().click();
await timeInputs.first().fill('2022-03-29 22:00:00.000Z');
await timeInputs.nth(1).click();
await timeInputs.nth(1).fill('2022-03-29 22:00:30.000Z');
// create overlay plot
await page.locator('button.c-create-button').click();
await page.locator('li:has-text("Overlay Plot")').click();
await Promise.all([
page.waitForNavigation(/*{ url: 'http://localhost:8080/#/browse/mine/8caf7072-535b-4af6-8394-edd86e3ea35f?tc.mode=fixed&tc.startBound=1648590633191&tc.endBound=1648592433191&tc.timeSystem=utc&view=plot-overlay' }*/),
page.locator('text=OK').click()
]);
// save the overlay plot
await page.locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button').nth(1).click();
await page.locator('text=Save and Finish Editing').click();
// create a sinewave generator
await page.locator('button.c-create-button').click();
await page.locator('li:has-text("Sine Wave Generator")').click();
// set amplitude to 6, offset 4, period 2
await page.locator('div:nth-child(5) .form-row .c-form-row__controls .form-control .field input').click();
await page.locator('div:nth-child(5) .form-row .c-form-row__controls .form-control .field input').fill('6');
await page.locator('div:nth-child(6) .form-row .c-form-row__controls .form-control .field input').click();
await page.locator('div:nth-child(6) .form-row .c-form-row__controls .form-control .field input').fill('4');
await page.locator('div:nth-child(7) .form-row .c-form-row__controls .form-control .field input').click();
await page.locator('div:nth-child(7) .form-row .c-form-row__controls .form-control .field input').fill('2');
// Click OK to make generator
await Promise.all([
page.waitForNavigation(/*{ url: 'http://localhost:8080/#/browse/mine/8caf7072-535b-4af6-8394-edd86e3ea35f/6e58b26a-8a73-4df6-b3a6-918decc0bbfa?tc.mode=fixed&tc.startBound=1648590633191&tc.endBound=1648592433191&tc.timeSystem=utc&view=plot-single' }*/),
page.locator('text=OK').click()
]);
// click on overlay plot
await page.locator('text=Open MCT My Items >> span').nth(3).click();
await Promise.all([
page.waitForNavigation(/*{ url: 'http://localhost:8080/#/browse/mine/8caf7072-535b-4af6-8394-edd86e3ea35f?tc.mode=fixed&tc.startBound=1648590633191&tc.endBound=1648592433191&tc.timeSystem=utc&view=plot-overlay' }*/),
page.locator('text=Unnamed Overlay Plot').first().click()
]);
}
/**
* @param {import('@playwright/test').Page} page
*/
async function testRegularTicks(page) {
const yTicks = page.locator('.gl-plot-y-tick-label');
expect(await yTicks.count()).toBe(7);
await expect(yTicks.nth(0)).toHaveText('-2');
await expect(yTicks.nth(1)).toHaveText('0');
await expect(yTicks.nth(2)).toHaveText('2');
await expect(yTicks.nth(3)).toHaveText('4');
await expect(yTicks.nth(4)).toHaveText('6');
await expect(yTicks.nth(5)).toHaveText('8');
await expect(yTicks.nth(6)).toHaveText('10');
}
/**
* @param {import('@playwright/test').Page} page
*/
async function testLogTicks(page) {
const yTicks = page.locator('.gl-plot-y-tick-label');
expect(await yTicks.count()).toBe(28);
await expect(yTicks.nth(0)).toHaveText('-2.98');
await expect(yTicks.nth(1)).toHaveText('-2.50');
await expect(yTicks.nth(2)).toHaveText('-2.00');
await expect(yTicks.nth(3)).toHaveText('-1.51');
await expect(yTicks.nth(4)).toHaveText('-1.20');
await expect(yTicks.nth(5)).toHaveText('-1.00');
await expect(yTicks.nth(6)).toHaveText('-0.80');
await expect(yTicks.nth(7)).toHaveText('-0.58');
await expect(yTicks.nth(8)).toHaveText('-0.40');
await expect(yTicks.nth(9)).toHaveText('-0.20');
await expect(yTicks.nth(10)).toHaveText('-0.00');
await expect(yTicks.nth(11)).toHaveText('0.20');
await expect(yTicks.nth(12)).toHaveText('0.40');
await expect(yTicks.nth(13)).toHaveText('0.58');
await expect(yTicks.nth(14)).toHaveText('0.80');
await expect(yTicks.nth(15)).toHaveText('1.00');
await expect(yTicks.nth(16)).toHaveText('1.20');
await expect(yTicks.nth(17)).toHaveText('1.51');
await expect(yTicks.nth(18)).toHaveText('2.00');
await expect(yTicks.nth(19)).toHaveText('2.50');
await expect(yTicks.nth(20)).toHaveText('2.98');
await expect(yTicks.nth(21)).toHaveText('3.50');
await expect(yTicks.nth(22)).toHaveText('4.00');
await expect(yTicks.nth(23)).toHaveText('4.50');
await expect(yTicks.nth(24)).toHaveText('5.31');
await expect(yTicks.nth(25)).toHaveText('7.00');
await expect(yTicks.nth(26)).toHaveText('8.00');
await expect(yTicks.nth(27)).toHaveText('9.00');
}
/**
* @param {import('@playwright/test').Page} page
*/
async function enableEditMode(page) {
// turn on edit mode
await page.locator('text=Unnamed Overlay Plot Snapshot >> button').nth(3).click();
}
/**
* @param {import('@playwright/test').Page} page
*/
async function enableLogMode(page) {
// turn on log mode
await page.locator('text=Y Axis Label Log mode Auto scale Padding >> input[type="checkbox"]').first().check();
}
/**
* @param {import('@playwright/test').Page} page
*/
async function disableLogMode(page) {
// turn off log mode
await page.locator('text=Y Axis Label Log mode Auto scale Padding >> input[type="checkbox"]').first().uncheck();
}
/**
* @param {import('@playwright/test').Page} page
*/
async function saveOverlayPlot(page) {
// save overlay plot
await page.locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button').nth(1).click();
await page.locator('text=Save and Finish Editing').click();
}
/**
* @param {import('@playwright/test').Page} page
*/
async function testLogPlotPixels(page) {
const pixelsMatch = await page.evaluate(async () => {
// TODO get canvas pixels at a few locations to make sure they're the correct color, to test that the plot comes out as expected.
await new Promise((r) => setTimeout(r, 50));
// These are some pixels that should be blue points in the log plot.
// If the plot changes shape to an unexpected shape, this will
// likely fail, which is what we want.
//
// I found these pixels by pausing playwright in debug mode at this
// point, and using similar code as below to output the pixel data, then
// I logged those pixels here.
const expectedBluePixels = [
// TODO these pixel sets only work with the first test, but not the second test.
// [60, 35],
// [121, 125],
// [156, 377],
// [264, 73],
// [372, 186],
// [576, 73],
// [659, 439],
// [675, 423]
[60, 35],
[120, 125],
[156, 375],
[264, 73],
[372, 185],
[575, 72],
[659, 437],
[675, 421]
];
// The first canvas in the DOM is the one that has the plot point
// icons (canvas 2d), which is the one we are testing. The second
// one in the DOM is the WebGL canvas with the line. (Why aren't
// they both WebGL?)
const canvas = document.querySelector('canvas');
const ctx = canvas.getContext('2d');
for (const pixel of expectedBluePixels) {
// XXX Possible optimization: call getImageData only once with
// area including all pixels to be tested.
const data = ctx.getImageData(pixel[0], pixel[1], 1, 1).data;
// #43b0ffff <-- openmct cyanish-blue with 100% opacity
// if (data[0] !== 0x43 || data[1] !== 0xb0 || data[2] !== 0xff || data[3] !== 0xff) {
if (data[0] === 0 && data[1] === 0 && data[2] === 0 && data[3] === 0) {
// If any pixel is empty, it means we didn't hit a plot point.
return false;
}
}
return true;
});
expect(pixelsMatch).toBe(true);
}

View File

@ -0,0 +1,69 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2022, 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.
*****************************************************************************/
const { test, expect } = require('@playwright/test');
test.describe('Time counductor operations', () => {
test('validate start time does not exceeds end time', async ({ page }) => {
//Go to baseURL
await page.goto('/', { waitUntil: 'networkidle' });
const year = new Date().getFullYear();
let startDate = 'xxxx-01-01 01:00:00.000Z';
startDate = year + startDate.substring(4);
let endDate = 'xxxx-01-01 02:00:00.000Z';
endDate = year + endDate.substring(4);
const startTimeLocator = page.locator('input[type="text"]').first();
const endTimeLocator = page.locator('input[type="text"]').nth(1);
// Click start time
await startTimeLocator.click();
// Click end time
await endTimeLocator.click();
await endTimeLocator.fill(endDate.toString());
await startTimeLocator.fill(startDate.toString());
// invalid start date
startDate = (year + 1) + startDate.substring(4);
await startTimeLocator.fill(startDate.toString());
await endTimeLocator.click();
const startDateValidityStatus = await startTimeLocator.evaluate((element) => element.checkValidity());
expect(startDateValidityStatus).not.toBeTruthy();
// fix to valid start date
startDate = (year - 1) + startDate.substring(4);
await startTimeLocator.fill(startDate.toString());
// invalid end date
endDate = (year - 2) + endDate.substring(4);
await endTimeLocator.fill(endDate.toString());
await startTimeLocator.click();
const endDateValidityStatus = await endTimeLocator.evaluate((element) => element.checkValidity());
expect(endDateValidityStatus).not.toBeTruthy();
});
});

View File

@ -22,14 +22,14 @@
/* /*
Collection of Visual Tests set to run in a default context. The tests within this suite Collection of Visual Tests set to run in a default context. The tests within this suite
are only meant to run against openmct's app.js started by `npm run start` within the are only meant to run against openmct's app.js started by `npm run start` within the
`./e2e/playwright-visual.config.js` file. `./e2e/playwright-visual.config.js` file.
These should only use functional expect statements to verify assumptions about the state These should only use functional expect statements to verify assumptions about the state
in a test and not for functional verification of correctness. Visual tests are not supposed in a test and not for functional verification of correctness. Visual tests are not supposed
to "fail" on assertions. Instead, they should be used to detect changes between builds or branches. to "fail" on assertions. Instead, they should be used to detect changes between builds or branches.
Note: Larger testsuite sizes are OK due to the setup time associated with these tests. Note: Larger testsuite sizes are OK due to the setup time associated with these tests.
*/ */
const { test, expect } = require('@playwright/test'); const { test, expect } = require('@playwright/test');
@ -111,3 +111,63 @@ test('Visual - Default Condition Widget', async ({ page }) => {
await page.waitForTimeout(VISUAL_GRACE_PERIOD); await page.waitForTimeout(VISUAL_GRACE_PERIOD);
await percySnapshot(page, 'Default Condition Widget'); await percySnapshot(page, 'Default Condition Widget');
}); });
test('Visual - Time Conductor start time is less than end time', async ({ page }) => {
//Go to baseURL
await page.goto('/', { waitUntil: 'networkidle' });
const year = new Date().getFullYear();
let startDate = 'xxxx-01-01 01:00:00.000Z';
startDate = year + startDate.substring(4);
let endDate = 'xxxx-01-01 02:00:00.000Z';
endDate = year + endDate.substring(4);
await page.locator('input[type="text"]').nth(1).fill(endDate.toString());
await page.locator('input[type="text"]').first().fill(startDate.toString());
// verify no error msg
await page.waitForTimeout(VISUAL_GRACE_PERIOD);
await percySnapshot(page, 'Default Time conductor');
startDate = (year + 1) + startDate.substring(4);
await page.locator('input[type="text"]').first().fill(startDate.toString());
await page.locator('input[type="text"]').nth(1).click();
// verify error msg for start time (unable to capture snapshot of popup)
await page.waitForTimeout(VISUAL_GRACE_PERIOD);
await percySnapshot(page, 'Start time error');
startDate = (year - 1) + startDate.substring(4);
await page.locator('input[type="text"]').first().fill(startDate.toString());
endDate = (year - 2) + endDate.substring(4);
await page.locator('input[type="text"]').nth(1).fill(endDate.toString());
await page.locator('input[type="text"]').first().click();
// verify error msg for end time (unable to capture snapshot of popup)
await page.waitForTimeout(VISUAL_GRACE_PERIOD);
await percySnapshot(page, 'End time error');
});
test('Visual - Sine Wave Generator Form', async ({ page }) => {
//Go to baseURL
await page.goto('/', { waitUntil: 'networkidle' });
//Click the Create button
await page.click('button:has-text("Create")');
// Click text=Sine Wave Generator
await page.click('text=Sine Wave Generator');
await page.waitForTimeout(VISUAL_GRACE_PERIOD);
await percySnapshot(page, 'Default Sine Wave Generator Form');
await page.locator('.field.control.l-input-sm input').first().click();
await page.locator('.field.control.l-input-sm input').first().fill('');
// Validate red x mark
await page.waitForTimeout(VISUAL_GRACE_PERIOD);
await percySnapshot(page, 'removed amplitude property value');
});

View File

@ -33,7 +33,7 @@ class EventTelemetryProvider {
generateData(firstObservedTime, count, startTime, duration, name) { generateData(firstObservedTime, count, startTime, duration, name) {
const millisecondsSinceStart = startTime - firstObservedTime; const millisecondsSinceStart = startTime - firstObservedTime;
const utc = Math.floor(startTime / duration) * duration; const utc = startTime + (count * duration);
const ind = count % messages.length; const ind = count % messages.length;
const message = messages[ind] + " - [" + millisecondsSinceStart + "]"; const message = messages[ind] + " - [" + millisecondsSinceStart + "]";
@ -75,7 +75,7 @@ class EventTelemetryProvider {
const duration = domainObject.telemetry.duration * 1000; const duration = domainObject.telemetry.duration * 1000;
const size = options.size ? options.size : this.defaultSize; const size = options.size ? options.size : this.defaultSize;
const data = []; const data = [];
const firstObservedTime = Date.now(); const firstObservedTime = options.start;
let count = 0; let count = 0;
if (options.strategy === 'latest' || options.size === 1) { if (options.strategy === 'latest' || options.size === 1) {
@ -83,7 +83,7 @@ class EventTelemetryProvider {
} }
while (start <= end && data.length < size) { while (start <= end && data.length < size) {
const startTime = Date.now() + count; const startTime = options.start + count;
data.push(this.generateData(firstObservedTime, count, startTime, duration, domainObject.name)); data.push(this.generateData(firstObservedTime, count, startTime, duration, domainObject.name));
start += duration; start += duration;
count += 1; count += 1;

View File

@ -35,6 +35,7 @@ describe('the plugin', () => {
telemetry: { telemetry: {
duration: 0 duration: 0
}, },
options: {},
type: 'eventGenerator' type: 'eventGenerator'
}; };
@ -61,7 +62,13 @@ describe('the plugin', () => {
}); });
}); });
it("supports requests", async () => { it("supports requests without start/end defined", async () => {
const telemetry = await openmct.telemetry.request(mockDomainObject);
expect(telemetry[0].message).toContain('CC: Eagle, Houston');
});
it("supports requests with arbitrary start time in the past", async () => {
mockDomainObject.options.start = 100000000000; // Mar 03 1973
const telemetry = await openmct.telemetry.request(mockDomainObject); const telemetry = await openmct.telemetry.request(mockDomainObject);
expect(telemetry[0].message).toContain('CC: Eagle, Houston'); expect(telemetry[0].message).toContain('CC: Eagle, Houston');
}); });

View File

@ -26,7 +26,7 @@ import {
} from '../../src/utils/testing'; } from '../../src/utils/testing';
import ExampleUserProvider from './ExampleUserProvider'; import ExampleUserProvider from './ExampleUserProvider';
describe("The Example User Plugin", () => { xdescribe("The Example User Plugin", () => {
let openmct; let openmct;
beforeEach(() => { beforeEach(() => {

View File

@ -35,8 +35,8 @@ define([
phase: 0 phase: 0
}; };
function GeneratorProvider() { function GeneratorProvider(openmct) {
this.workerInterface = new WorkerInterface(); this.workerInterface = new WorkerInterface(openmct);
} }
GeneratorProvider.prototype.canProvideTelemetry = function (domainObject) { GeneratorProvider.prototype.canProvideTelemetry = function (domainObject) {

View File

@ -21,20 +21,13 @@
*****************************************************************************/ *****************************************************************************/
define([ define([
'raw-loader!./generatorWorker.js',
'uuid' 'uuid'
], function ( ], function (
workerText,
uuid uuid
) { ) {
function WorkerInterface(openmct) {
var workerBlob = new Blob( // eslint-disable-next-line no-undef
[workerText], const workerUrl = `${openmct.getAssetPath()}${__OPENMCT_ROOT_RELATIVE__}generatorWorker.js`;
{type: 'application/javascript'}
);
var workerUrl = URL.createObjectURL(workerBlob);
function WorkerInterface() {
this.worker = new Worker(workerUrl); this.worker = new Worker(workerUrl);
this.worker.onmessage = this.onMessage.bind(this); this.worker.onmessage = this.onMessage.bind(this);
this.callbacks = {}; this.callbacks = {};

View File

@ -146,7 +146,7 @@ define([
} }
}); });
openmct.telemetry.addProvider(new GeneratorProvider()); openmct.telemetry.addProvider(new GeneratorProvider(openmct));
openmct.telemetry.addProvider(new GeneratorMetadataProvider()); openmct.telemetry.addProvider(new GeneratorMetadataProvider());
openmct.telemetry.addProvider(new SinewaveLimitProvider()); openmct.telemetry.addProvider(new SinewaveLimitProvider());
}; };

View File

@ -77,7 +77,7 @@
openmct.install(openmct.plugins.LocalStorage()); openmct.install(openmct.plugins.LocalStorage());
openmct.install(openmct.plugins.example.Generator()); openmct.install(openmct.plugins.example.Generator());
openmct.install(openmct.plugins.example.EventGeneratorPlugin()); openmct.install(openmct.plugins.example.EventGeneratorPlugin());
openmct.install(openmct.plugins.example.ExampleImagery()); openmct.install(openmct.plugins.example.ExampleImagery());
@ -190,11 +190,12 @@
openmct.install(openmct.plugins.Filters(['table', 'telemetry.plot.overlay'])); openmct.install(openmct.plugins.Filters(['table', 'telemetry.plot.overlay']));
openmct.install(openmct.plugins.ObjectMigration()); openmct.install(openmct.plugins.ObjectMigration());
openmct.install(openmct.plugins.ClearData( openmct.install(openmct.plugins.ClearData(
['table', 'telemetry.plot.overlay', 'telemetry.plot.stacked'], ['table', 'telemetry.plot.overlay', 'telemetry.plot.stacked', 'example.imagery'],
{indicator: true} {indicator: true}
)); ));
openmct.install(openmct.plugins.Clock({ enableClockIndicator: true })); openmct.install(openmct.plugins.Clock({ enableClockIndicator: true }));
openmct.install(openmct.plugins.Timer()); openmct.install(openmct.plugins.Timer());
openmct.install(openmct.plugins.Timelist());
openmct.start(); openmct.start();
</script> </script>
</html> </html>

View File

@ -1,3 +1,2 @@
const testsContext = require.context('.', true, /\/(src|platform|\.\/example)\/.*Spec.js$/); const testsContext = require.context('.', true, /^\.\/(src|example)\/.*Spec.js$/);
testsContext.keys().forEach(testsContext); testsContext.keys().forEach(testsContext);

View File

@ -22,29 +22,9 @@
/*global module,process*/ /*global module,process*/
const browsers = [process.env.NODE_ENV === 'debug' ? 'ChromeDebugging' : 'ChromeHeadless'];
const coverageEnabled = process.env.COVERAGE === 'true';
const reporters = ['spec', 'junit'];
if (coverageEnabled) {
reporters.push('coverage-istanbul');
}
module.exports = (config) => { module.exports = (config) => {
const webpackConfig = require('./webpack.dev.js'); const webpackConfig = require('./webpack.coverage.js');
delete webpackConfig.output; delete webpackConfig.output;
if (coverageEnabled) {
webpackConfig.module.rules.push({
test: /\.js$/,
exclude: /node_modules|e2e|example|lib|dist|\.*.*Spec\.js/,
use: {
loader: 'istanbul-instrumenter-loader',
options: {
esModules: true
}
}
});
}
config.set({ config.set({
basePath: '', basePath: '',
@ -58,11 +38,15 @@ module.exports = (config) => {
{ {
pattern: 'dist/inMemorySearchWorker.js*', pattern: 'dist/inMemorySearchWorker.js*',
included: false included: false
},
{
pattern: 'dist/generatorWorker.js*',
included: false
} }
], ],
port: 9876, port: 9876,
reporters: reporters, reporters: ['spec', 'junit', 'coverage-istanbul'],
browsers: browsers, browsers: [process.env.NODE_ENV === 'debug' ? 'ChromeDebugging' : 'ChromeHeadless'],
client: { client: {
jasmine: { jasmine: {
random: false, random: false,
@ -83,12 +67,6 @@ module.exports = (config) => {
colors: true, colors: true,
logLevel: config.LOG_INFO, logLevel: config.LOG_INFO,
autoWatch: true, autoWatch: true,
// HTML test reporting.
// htmlReporter: {
// outputDir: "dist/reports/tests",
// preserveDescribeNesting: true,
// foldAll: false
// },
junitReporter: { junitReporter: {
outputDir: "dist/reports/tests", outputDir: "dist/reports/tests",
outputFile: "test-results.xml", outputFile: "test-results.xml",
@ -96,9 +74,7 @@ module.exports = (config) => {
}, },
coverageIstanbulReporter: { coverageIstanbulReporter: {
fixWebpackSourcePaths: true, fixWebpackSourcePaths: true,
dir: process.env.CIRCLE_ARTIFACTS dir: "dist/reports/coverage",
? process.env.CIRCLE_ARTIFACTS + '/coverage'
: "dist/reports/coverage",
reports: ['lcovonly', 'text-summary'], reports: ['lcovonly', 'text-summary'],
thresholds: { thresholds: {
global: { global: {
@ -120,8 +96,7 @@ module.exports = (config) => {
}, },
webpack: webpackConfig, webpack: webpackConfig,
webpackMiddleware: { webpackMiddleware: {
stats: 'errors-only', stats: 'errors-warnings'
logLevel: 'warn'
}, },
concurrency: 1, concurrency: 1,
singleRun: true, singleRun: true,

View File

@ -1,40 +1,44 @@
{ {
"name": "openmct", "name": "openmct",
"version": "1.8.5-SNAPSHOT", "version": "2.0.3",
"description": "The Open MCT core platform", "description": "The Open MCT core platform",
"devDependencies": { "devDependencies": {
"@braintree/sanitize-url": "5.0.2", "@babel/eslint-parser": "7.16.3",
"@percy/cli": "1.0.0-beta.73", "@braintree/sanitize-url": "6.0.0",
"@percy/playwright": "1.0.1", "@percy/cli": "1.0.4",
"@playwright/test": "1.18.1", "@percy/playwright": "1.0.2",
"allure-playwright": "2.0.0-beta.14", "@playwright/test": "1.19.2",
"babel-eslint": "10.1.0", "@types/eventemitter3": "^1.0.0",
"@types/jasmine": "^4.0.1",
"@types/karma": "^6.3.2",
"@types/lodash": "^4.14.178",
"@types/mocha": "^9.1.0",
"allure-playwright": "2.0.0-beta.15",
"babel-loader": "8.2.3",
"babel-plugin-istanbul": "6.1.1",
"comma-separated-values": "3.6.4", "comma-separated-values": "3.6.4",
"copy-webpack-plugin": "10.2.0", "copy-webpack-plugin": "10.2.0",
"core-js": "3.20.3", "cross-env": "7.0.3",
"cross-env": "6.0.3",
"css-loader": "4.0.0", "css-loader": "4.0.0",
"d3-axis": "1.0.x", "d3-axis": "1.0.x",
"d3-scale": "1.0.x", "d3-scale": "1.0.x",
"d3-selection": "1.3.x", "d3-selection": "1.3.x",
"eslint": "7.0.0", "eslint": "8.13.0",
"eslint-plugin-compat": "4.0.2",
"eslint-plugin-playwright": "0.8.0", "eslint-plugin-playwright": "0.8.0",
"eslint-plugin-vue": "7.5.0", "eslint-plugin-vue": "8.5.0",
"eslint-plugin-you-dont-need-lodash-underscore": "6.12.0", "eslint-plugin-you-dont-need-lodash-underscore": "6.12.0",
"eventemitter3": "1.2.0", "eventemitter3": "1.2.0",
"exports-loader": "0.7.0", "exports-loader": "0.7.0",
"express": "4.13.1", "express": "4.13.1",
"file-loader": "6.1.0", "file-saver": "2.0.5",
"file-saver": "1.3.8", "git-rev-sync": "3.0.2",
"git-rev-sync": "1.4.0",
"html-loader": "0.5.5",
"html2canvas": "1.4.1", "html2canvas": "1.4.1",
"imports-loader": "0.8.0", "imports-loader": "0.8.0",
"istanbul-instrumenter-loader": "^3.0.1", "jasmine-core": "4.0.1",
"jasmine-core": "4.0.0",
"jsdoc": "3.5.5", "jsdoc": "3.5.5",
"karma": "6.3.15", "karma": "6.3.18",
"karma-chrome-launcher": "3.1.0", "karma-chrome-launcher": "3.1.1",
"karma-cli": "2.0.0", "karma-cli": "2.0.0",
"karma-coverage": "2.1.1", "karma-coverage": "2.1.1",
"karma-coverage-istanbul-reporter": "3.0.3", "karma-coverage-istanbul-reporter": "3.0.3",
@ -42,54 +46,55 @@
"karma-jasmine": "4.0.1", "karma-jasmine": "4.0.1",
"karma-junit-reporter": "2.0.1", "karma-junit-reporter": "2.0.1",
"karma-sourcemap-loader": "0.3.8", "karma-sourcemap-loader": "0.3.8",
"karma-spec-reporter": "0.0.33", "karma-spec-reporter": "0.0.34",
"karma-webpack": "^5.0.0", "karma-webpack": "5.0.0",
"location-bar": "^3.0.1", "lighthouse": "9.5.0",
"lodash": "^4.17.12", "location-bar": "3.0.1",
"mini-css-extract-plugin": "2.4.5", "lodash": "4.17.21",
"moment": "2.25.3", "mini-css-extract-plugin": "2.6.0",
"moment-duration-format": "^2.2.2", "moment": "2.29.1",
"moment-timezone": "0.5.28", "moment-duration-format": "2.3.2",
"node-bourbon": "^4.2.3", "moment-timezone": "0.5.34",
"painterro": "^1.2.56", "node-bourbon": "4.2.3",
"playwright": "^1.18.1", "painterro": "1.2.56",
"plotly.js-basic-dist": "^2.5.0", "plotly.js-basic-dist": "2.5.0",
"plotly.js-gl2d-dist": "^2.5.0", "plotly.js-gl2d-dist": "2.5.0",
"printj": "^1.2.1", "printj": "1.3.1",
"raw-loader": "^0.5.1", "request": "2.88.2",
"request": "^2.69.0", "resolve-url-loader": "5.0.0",
"resolve-url-loader": "4.0.0", "sass": "1.49.9",
"sass": "1.49.0", "sass-loader": "12.6.0",
"sass-loader": "12.4.0",
"sinon": "13.0.1", "sinon": "13.0.1",
"style-loader": "^1.0.1", "style-loader": "^1.0.1",
"uuid": "^3.3.3", "uuid": "3.3.3",
"vue": "2.5.6", "vue": "2.6.14",
"vue-eslint-parser": "8.2.0", "vue-eslint-parser": "8.3.0",
"vue-loader": "15.9.8", "vue-loader": "15.9.8",
"vue-template-compiler": "2.5.6", "vue-template-compiler": "2.6.14",
"webpack": "5.67.0", "webpack": "5.68.0",
"webpack-cli": "4.9.2", "webpack-cli": "4.9.2",
"webpack-dev-middleware": "^3.1.3", "webpack-dev-middleware": "5.3.1",
"webpack-hot-middleware": "^2.22.3", "webpack-hot-middleware": "2.25.1",
"webpack-merge": "5.8.0", "webpack-merge": "5.8.0",
"zepto": "^1.2.0" "zepto": "1.2.0"
}, },
"scripts": { "scripts": {
"clean": "rm -rf ./dist ./node_modules; rm package-lock.json", "clean": "rm -rf ./dist ./node_modules ./package-lock.json",
"clean-test-lint": "npm run clean; npm install; npm run test; npm run lint", "clean-test-lint": "npm run clean; npm install; npm run test; npm run lint",
"start": "node app.js", "start": "node app.js",
"lint": "eslint example src --ext .js,.vue openmct.js", "lint": "eslint example src --ext .js,.vue openmct.js",
"lint:fix": "eslint example src --ext .js,.vue openmct.js --fix", "lint:fix": "eslint example src --ext .js,.vue openmct.js --fix",
"build:prod": "cross-env webpack --config webpack.prod.js", "build:prod": "cross-env webpack --config webpack.prod.js",
"build:dev": "webpack --config webpack.dev.js", "build:dev": "webpack --config webpack.dev.js",
"build:coverage": "webpack --config webpack.coverage.js",
"build:watch": "webpack --config webpack.dev.js --watch", "build:watch": "webpack --config webpack.dev.js --watch",
"info": "npx envinfo --system --browsers --npmPackages --binaries --languages --markdown",
"test": "cross-env NODE_OPTIONS=\"--max_old_space_size=4096\" karma start --single-run", "test": "cross-env NODE_OPTIONS=\"--max_old_space_size=4096\" karma start --single-run",
"test:firefox": "cross-env NODE_OPTIONS=\"--max_old_space_size=4096\" karma start --single-run --browsers=FirefoxHeadless",
"test:debug": "cross-env NODE_ENV=debug karma start --no-single-run", "test:debug": "cross-env NODE_ENV=debug karma start --no-single-run",
"test:coverage": "cross-env NODE_OPTIONS=\"--max_old_space_size=4096\" COVERAGE=true karma start --single-run", "test:e2e:ci": "npx playwright test --config=e2e/playwright-ci.config.js --project=chrome smoke default condition timeConductor",
"test:coverage:firefox": "cross-env NODE_OPTIONS=\"--max_old_space_size=4096\" karma start --single-run --browsers=FirefoxHeadless", "test:e2e:local": "npx playwright test --config=e2e/playwright-local.config.js --project=chrome",
"test:e2e:ci": "npx playwright test --config=e2e/playwright-ci.config.js --project=chrome smoke default condition.e2e", "test:e2e:debug": "npm run test:e2e:local -- --debug",
"test:e2e:local": "npx playwright test --config=e2e/playwright-local.config.js",
"test:e2e:visual": "percy exec --config ./e2e/.percy.yml -- npx playwright test --config=e2e/playwright-visual.config.js default", "test:e2e:visual": "percy exec --config ./e2e/.percy.yml -- npx playwright test --config=e2e/playwright-visual.config.js default",
"test:e2e:full": "npx playwright test --config=e2e/playwright-ci.config.js", "test:e2e:full": "npx playwright test --config=e2e/playwright-ci.config.js",
"test:watch": "cross-env NODE_OPTIONS=\"--max_old_space_size=4096\" karma start --no-single-run", "test:watch": "cross-env NODE_OPTIONS=\"--max_old_space_size=4096\" karma start --no-single-run",
@ -105,8 +110,18 @@
"url": "https://github.com/nasa/openmct.git" "url": "https://github.com/nasa/openmct.git"
}, },
"engines": { "engines": {
"node": ">=12.20.1 <15.0.0" "node": ">=14.19.1"
}, },
"overrides": {
"core-js": "3.21.1"
},
"browserslist": [
"Firefox ESR",
"not IE 11",
"last 2 Chrome versions",
"unreleased Chrome versions",
"ios_saf > 15"
],
"author": "", "author": "",
"license": "Apache-2.0", "license": "Apache-2.0",
"private": true "private": true

View File

@ -232,6 +232,7 @@ define([
this.actions = new api.ActionsAPI(this); this.actions = new api.ActionsAPI(this);
this.status = new api.StatusAPI(this); this.status = new api.StatusAPI(this);
this.styleManager = new api.StyleManagerAPI(this);
this.priority = api.PriorityAPI; this.priority = api.PriorityAPI;
@ -241,7 +242,6 @@ define([
this.branding = BrandingAPI.default; this.branding = BrandingAPI.default;
// Plugins that are installed by default // Plugins that are installed by default
this.install(this.plugins.Plot()); this.install(this.plugins.Plot());
this.install(this.plugins.Chart()); this.install(this.plugins.Chart());
this.install(this.plugins.TelemetryTable.default()); this.install(this.plugins.TelemetryTable.default());
@ -269,7 +269,6 @@ define([
this.install(this.plugins.ViewDatumAction()); this.install(this.plugins.ViewDatumAction());
this.install(this.plugins.ViewLargeAction()); this.install(this.plugins.ViewLargeAction());
this.install(this.plugins.ObjectInterceptors()); this.install(this.plugins.ObjectInterceptors());
this.install(this.plugins.NonEditableFolder());
this.install(this.plugins.DeviceClassifier()); this.install(this.plugins.DeviceClassifier());
this.install(this.plugins.UserIndicator()); this.install(this.plugins.UserIndicator());
} }

View File

@ -31,6 +31,7 @@ define([
'./objects/ObjectAPI', './objects/ObjectAPI',
'./priority/PriorityAPI', './priority/PriorityAPI',
'./status/StatusAPI', './status/StatusAPI',
'./styles/StyleManagerAPI',
'./telemetry/TelemetryAPI', './telemetry/TelemetryAPI',
'./time/TimeAPI', './time/TimeAPI',
'./types/TypeRegistry', './types/TypeRegistry',
@ -46,6 +47,7 @@ define([
ObjectAPI, ObjectAPI,
PriorityAPI, PriorityAPI,
StatusAPI, StatusAPI,
StyleManagerAPI,
TelemetryAPI, TelemetryAPI,
TimeAPI, TimeAPI,
TypeRegistry, TypeRegistry,
@ -62,6 +64,7 @@ define([
ObjectAPI: ObjectAPI, ObjectAPI: ObjectAPI,
PriorityAPI: PriorityAPI.default, PriorityAPI: PriorityAPI.default,
StatusAPI: StatusAPI.default, StatusAPI: StatusAPI.default,
StyleManagerAPI: StyleManagerAPI.default,
TelemetryAPI: TelemetryAPI, TelemetryAPI: TelemetryAPI,
TimeAPI: TimeAPI.default, TimeAPI: TimeAPI.default,
TypeRegistry: TypeRegistry, TypeRegistry: TypeRegistry,

View File

@ -1,5 +1,6 @@
import AutoCompleteField from './components/controls/AutoCompleteField.vue'; import AutoCompleteField from './components/controls/AutoCompleteField.vue';
import ClockDisplayFormatField from './components/controls/ClockDisplayFormatField.vue'; import ClockDisplayFormatField from './components/controls/ClockDisplayFormatField.vue';
import CheckBoxField from './components/controls/CheckBoxField.vue';
import Datetime from './components/controls/Datetime.vue'; import Datetime from './components/controls/Datetime.vue';
import FileInput from './components/controls/FileInput.vue'; import FileInput from './components/controls/FileInput.vue';
import Locator from './components/controls/Locator.vue'; import Locator from './components/controls/Locator.vue';
@ -7,11 +8,13 @@ import NumberField from './components/controls/NumberField.vue';
import SelectField from './components/controls/SelectField.vue'; import SelectField from './components/controls/SelectField.vue';
import TextAreaField from './components/controls/TextAreaField.vue'; import TextAreaField from './components/controls/TextAreaField.vue';
import TextField from './components/controls/TextField.vue'; import TextField from './components/controls/TextField.vue';
import ToggleSwitchField from './components/controls/ToggleSwitchField.vue';
import Vue from 'vue'; import Vue from 'vue';
export const DEFAULT_CONTROLS_MAP = { export const DEFAULT_CONTROLS_MAP = {
'autocomplete': AutoCompleteField, 'autocomplete': AutoCompleteField,
'checkbox': CheckBoxField,
'composite': ClockDisplayFormatField, 'composite': ClockDisplayFormatField,
'datetime': Datetime, 'datetime': Datetime,
'file-input': FileInput, 'file-input': FileInput,
@ -19,7 +22,8 @@ export const DEFAULT_CONTROLS_MAP = {
'numberfield': NumberField, 'numberfield': NumberField,
'select': SelectField, 'select': SelectField,
'textarea': TextAreaField, 'textarea': TextAreaField,
'textfield': TextField 'textfield': TextField,
'toggleSwitch': ToggleSwitchField
}; };
export default class FormControl { export default class FormControl {
@ -65,10 +69,11 @@ export default class FormControl {
*/ */
_getControlViewProvider(control) { _getControlViewProvider(control) {
const self = this; const self = this;
let rowComponent;
return { return {
show(element, model, onChange) { show(element, model, onChange) {
const rowComponent = new Vue({ rowComponent = new Vue({
el: element, el: element,
components: { components: {
FormControlComponent: DEFAULT_CONTROLS_MAP[control] FormControlComponent: DEFAULT_CONTROLS_MAP[control]
@ -86,8 +91,10 @@ export default class FormControl {
}); });
return rowComponent; return rowComponent;
},
destroy() {
rowComponent.$destroy();
} }
}; };
} }
} }

View File

@ -26,45 +26,52 @@
<div class="c-overlay__dialog-title">{{ model.title }}</div> <div class="c-overlay__dialog-title">{{ model.title }}</div>
<div class="c-overlay__dialog-hint hint">All fields marked <span class="req icon-asterisk"></span> are required.</div> <div class="c-overlay__dialog-hint hint">All fields marked <span class="req icon-asterisk"></span> are required.</div>
</div> </div>
<form name="mctForm" <form
class="c-form__contents" name="mctForm"
autocomplete="off" class="c-form__contents"
@submit.prevent autocomplete="off"
@submit.prevent
> >
<div v-for="section in formSections" <div
:key="section.id" v-for="section in formSections"
class="c-form__section" :key="section.id"
:class="section.cssClass" class="c-form__section"
:class="section.cssClass"
> >
<h2 v-if="section.name" <h2
v-if="section.name"
class="c-form__section-header" class="c-form__section-header"
> >
{{ section.name }} {{ section.name }}
</h2> </h2>
<div v-for="(row, index) in section.rows" <div
:key="row.id" v-for="(row, index) in section.rows"
class="u-contents" :key="row.id"
class="u-contents"
> >
<FormRow :css-class="section.cssClass" <FormRow
:first="index < 1" :css-class="section.cssClass"
:row="row" :first="index < 1"
@onChange="onChange" :row="row"
@onChange="onChange"
/> />
</div> </div>
</div> </div>
</form> </form>
<div class="mct-form__controls c-overlay__button-bar c-form__bottom-bar"> <div class="mct-form__controls c-overlay__button-bar c-form__bottom-bar">
<button tabindex="0" <button
:disabled="isInvalid" tabindex="0"
class="c-button c-button--major" :disabled="isInvalid"
@click="onSave" class="c-button c-button--major"
@click="onSave"
> >
{{ submitLabel }} {{ submitLabel }}
</button> </button>
<button tabindex="0" <button
class="c-button" tabindex="0"
@click="onDismiss" class="c-button"
@click="onDismiss"
> >
{{ cancelLabel }} {{ cancelLabel }}
</button> </button>

View File

@ -21,21 +21,25 @@
*****************************************************************************/ *****************************************************************************/
<template> <template>
<div class="form-row c-form__row" <div
:class="[{ 'first': first }]" class="form-row c-form__row"
@onChange="onChange" :class="[{ 'first': first }]"
@onChange="onChange"
> >
<div class="c-form-row__label" <div
:title="row.description" class="c-form-row__label"
:title="row.description"
> >
{{ row.name }} {{ row.name }}
</div> </div>
<div class="c-form-row__state-indicator" <div
:class="rowClass" class="c-form-row__state-indicator"
:class="rowClass"
> >
</div> </div>
<div v-if="row.control" <div
class="c-form-row__controls" v-if="row.control"
class="c-form-row__controls"
> >
<div ref="rowElement"></div> <div ref="rowElement"></div>
</div> </div>
@ -75,10 +79,12 @@ export default {
rowClass() { rowClass() {
let cssClass = this.cssClass; let cssClass = this.cssClass;
if (this.row.required) { if (!this.row.required) {
cssClass = `${cssClass} req`; return;
} }
cssClass = `${cssClass} req`;
if (this.visited && this.valid !== undefined) { if (this.visited && this.valid !== undefined) {
if (this.valid === true) { if (this.valid === true) {
cssClass = `${cssClass} valid`; cssClass = `${cssClass} valid`;

View File

@ -22,20 +22,26 @@
<template> <template>
<div class="form-control autocomplete"> <div class="form-control autocomplete">
<input v-model="field" <span class="autocompleteInputAndArrow">
class="autocompleteInput" <input
type="text" v-model="field"
@click="inputClicked()" class="autocompleteInput"
@keydown="keyDown($event)" type="text"
> @click="inputClicked()"
<span class="icon-arrow-down" @keydown="keyDown($event)"
@click="arrowClicked()" >
></span> <span
<div class="autocompleteOptions" class="icon-arrow-down"
@blur="hideOptions = true" @click="arrowClicked()"
></span>
</span>
<div
class="autocompleteOptions"
@blur="hideOptions = true"
> >
<ul v-if="!hideOptions"> <ul v-if="!hideOptions">
<li v-for="opt in filteredOptions" <li
v-for="opt in filteredOptions"
:key="opt.optionId" :key="opt.optionId"
:class="{'optionPreSelected': optionIndex === opt.optionId}" :class="{'optionPreSelected': optionIndex === opt.optionId}"
@click="fillInputWithString(opt.name)" @click="fillInputWithString(opt.name)"
@ -104,10 +110,21 @@ export default {
this.$emit('onChange', data); this.$emit('onChange', data);
} }
},
hideOptions(newValue) {
if (!newValue) {
// adding a event listener when the hideOpntions is false (dropdown is visible)
// handleoutsideclick can collapse the dropdown when clicked outside autocomplete
document.body.addEventListener('click', this.handleOutsideClick);
} else {
//removing event listener when hideOptions become true (dropdown is collapsed)
document.body.removeEventListener('click', this.handleOutsideClick);
}
} }
}, },
mounted() { mounted() {
this.options = this.model.options; this.options = this.model.options;
this.autocompleteInputAndArrow = this.$el.getElementsByClassName('autocompleteInputAndArrow')[0];
this.autocompleteInputElement = this.$el.getElementsByClassName('autocompleteInput')[0]; this.autocompleteInputElement = this.$el.getElementsByClassName('autocompleteInput')[0];
if (this.options[0].name) { if (this.options[0].name) {
// If "options" include name, value pair // If "options" include name, value pair
@ -119,6 +136,9 @@ export default {
this.optionNames = this.options; this.optionNames = this.options;
} }
}, },
destroyed() {
document.body.removeEventListener('click', this.handleOutsideClick);
},
methods: { methods: {
decrementOptionIndex() { decrementOptionIndex() {
if (this.optionIndex === 0) { if (this.optionIndex === 0) {
@ -172,7 +192,21 @@ export default {
// to show them all the options // to show them all the options
this.showFilteredOptions = false; this.showFilteredOptions = false;
this.autocompleteInputElement.select(); this.autocompleteInputElement.select();
this.showOptions();
if (this.hideOptions) {
this.showOptions();
} else {
this.hideOptions = true;
}
},
handleOutsideClick(event) {
// if click event is detected outside autocomplete (both input & arrow) while the
// dropdown is visible, this will collapse the dropdown.
const clickedInsideAutocomplete = this.autocompleteInputAndArrow.contains(event.target);
if (!clickedInsideAutocomplete && !this.hideOptions) {
this.hideOptions = true;
}
}, },
optionMouseover(optionId) { optionMouseover(optionId) {
this.optionIndex = optionId; this.optionIndex = optionId;

View File

@ -0,0 +1,55 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2022, 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.
*****************************************************************************/
<template>
<span class="form-control shell">
<span
class="field control"
:class="model.cssClass"
>
<input
type="checkbox"
:checked="isChecked"
@input="toggleCheckBox"
>
</span>
</span>
</template>
<script>
import toggleMixin from '../../toggle-check-box-mixin';
export default {
mixins: [toggleMixin],
props: {
model: {
type: Object,
required: true
}
},
data() {
return {
isChecked: this.model.value
};
}
};
</script>

View File

@ -22,10 +22,11 @@
<template> <template>
<div class="c-form-control--clock-display-format-fields"> <div class="c-form-control--clock-display-format-fields">
<SelectField v-for="item in items" <SelectField
:key="item.key" v-for="item in items"
:model="item" :key="item.key"
@onChange="onChange" :model="item"
@onChange="onChange"
/> />
</div> </div>
</template> </template>

View File

@ -22,12 +22,13 @@
<template> <template>
<span> <span>
<CompositeItem v-for="(item, index) in model.items" <CompositeItem
:key="item.name" v-for="(item, index) in model.items"
:first="index < 1" :key="item.name"
:value="JSON.stringify(model.value[index])" :first="index < 1"
:item="item" :value="JSON.stringify(model.value[index])"
@onChange="onChange" :item="item"
@onChange="onChange"
/> />
</span> </span>
</template> </template>

View File

@ -22,10 +22,11 @@
<template> <template>
<div :class="compositeCssClass"> <div :class="compositeCssClass">
<FormRow :css-class="item.cssClass" <FormRow
:first="first" :css-class="item.cssClass"
:row="row" :first="first"
@onChange="onChange" :row="row"
@onChange="onChange"
/> />
<span class="composite-control-label"> <span class="composite-control-label">
{{ item.name }} {{ item.name }}

View File

@ -27,50 +27,55 @@
<div class="hint time sm">Min</div> <div class="hint time sm">Min</div>
<div class="hint time sm">Sec</div> <div class="hint time sm">Sec</div>
<div class="hint timezone">Timezone</div> <div class="hint timezone">Timezone</div>
<form ref="dateTimeForm" <form
prevent ref="dateTimeForm"
class="u-contents" prevent
class="u-contents"
> >
<div class="field control date"> <div class="field control date">
<input v-model="date" <input
:pattern="/\d{4}-\d{2}-\d{2}/" v-model="date"
:placeholder="format" :pattern="/\d{4}-\d{2}-\d{2}/"
type="date" :placeholder="format"
name="date" type="date"
@change="onChange" name="date"
@change="onChange"
> >
</div> </div>
<div class="field control hour sm"> <div class="field control hour sm">
<input v-model="hour" <input
:pattern="/\d+/" v-model="hour"
type="number" :pattern="/\d+/"
name="hour" type="number"
maxlength="10" name="hour"
min="0" maxlength="10"
max="23" min="0"
@change="onChange" max="23"
@change="onChange"
> >
</div> </div>
<div class="field control min sm"> <div class="field control min sm">
<input v-model="min" <input
:pattern="/\d+/" v-model="min"
type="number" :pattern="/\d+/"
name="min" type="number"
maxlength="2" name="min"
min="0" maxlength="2"
max="59" min="0"
@change="onChange" max="59"
@change="onChange"
> >
</div> </div>
<div class="field control sec sm"> <div class="field control sec sm">
<input v-model="sec" <input
:pattern="/\d+/" v-model="sec"
type="number" :pattern="/\d+/"
name="sec" type="number"
maxlength="2" name="sec"
min="0" maxlength="2"
max="59" min="0"
@change="onChange" max="59"
@change="onChange"
> >
</div> </div>
<div class="field control timezone"> <div class="field control timezone">

View File

@ -22,18 +22,21 @@
<template> <template>
<span class="form-control shell"> <span class="form-control shell">
<span class="field control" <span
:class="model.cssClass" class="field control"
:class="model.cssClass"
> >
<input id="fileElem" <input
ref="fileInput" id="fileElem"
type="file" ref="fileInput"
accept=".json" type="file"
style="display:none" accept=".json"
style="display:none"
> >
<button id="fileSelect" <button
class="c-button" id="fileSelect"
@click="selectFile" class="c-button"
@click="selectFile"
> >
{{ name }} {{ name }}
</button> </button>

View File

@ -22,21 +22,25 @@
<template> <template>
<span class="form-control shell"> <span class="form-control shell">
<span class="field control" <span
:class="model.cssClass" class="field control"
:class="model.cssClass"
> >
<input v-model="field" <input
type="number" v-model="field"
:min="model.min" type="number"
:max="model.max" :min="model.min"
:step="model.step" :max="model.max"
@blur="blur()" :step="model.step"
@input="updateText()"
> >
</span> </span>
</span> </span>
</template> </template>
<script> <script>
import { throttle } from 'lodash';
export default { export default {
props: { props: {
model: { model: {
@ -49,8 +53,11 @@ export default {
field: this.model.value field: this.model.value
}; };
}, },
mounted() {
this.updateText = throttle(this.updateText.bind(this), 200);
},
methods: { methods: {
blur() { updateText() {
const data = { const data = {
model: this.model, model: this.model,
value: this.field value: this.field

View File

@ -22,14 +22,16 @@
<template> <template>
<div class="form-control select-field"> <div class="form-control select-field">
<select v-model="selected" <select
required="model.required" v-model="selected"
name="mctControl" required="model.required"
@change="onChange($event)" name="mctControl"
@change="onChange($event)"
> >
<option v-for="option in model.options" <option
:key="option.name" v-for="option in model.options"
:value="option.value" :key="option.name"
:value="option.value"
> >
{{ option.name }} {{ option.name }}
</option> </option>

View File

@ -22,13 +22,15 @@
<template> <template>
<span class="form-control shell"> <span class="form-control shell">
<span class="field control" <span
:class="model.cssClass" class="field control"
:class="model.cssClass"
> >
<textarea v-model="field" <textarea
type="text" v-model="field"
:size="model.size" type="text"
@blur="blur()" :size="model.size"
@input="updateText()"
> >
</textarea> </textarea>
</span> </span>
@ -36,6 +38,8 @@
</template> </template>
<script> <script>
import { throttle } from 'lodash';
export default { export default {
props: { props: {
model: { model: {
@ -48,8 +52,11 @@ export default {
field: this.model.value field: this.model.value
}; };
}, },
mounted() {
this.updateText = throttle(this.updateText.bind(this), 500);
},
methods: { methods: {
blur() { updateText() {
const data = { const data = {
model: this.model, model: this.model,
value: this.field value: this.field

View File

@ -22,19 +22,23 @@
<template> <template>
<span class="form-control shell"> <span class="form-control shell">
<span class="field control" <span
:class="model.cssClass" class="field control"
:class="model.cssClass"
> >
<input v-model="field" <input
type="text" v-model="field"
:size="model.size" type="text"
@blur="blur()" :size="model.size"
@input="updateText()"
> >
</span> </span>
</span> </span>
</template> </template>
<script> <script>
import { throttle } from 'lodash';
export default { export default {
props: { props: {
model: { model: {
@ -47,8 +51,11 @@ export default {
field: this.model.value field: this.model.value
}; };
}, },
mounted() {
this.updateText = throttle(this.updateText.bind(this), 500);
},
methods: { methods: {
blur() { updateText() {
const data = { const data = {
model: this.model, model: this.model,
value: this.field value: this.field

View File

@ -0,0 +1,62 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2022, 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.
*****************************************************************************/
<template>
<span class="form-control shell">
<span
class="field control"
:class="model.cssClass"
>
<ToggleSwitch
id="switchId"
:checked="isChecked"
@change="toggleCheckBox"
/>
</span>
</span>
</template>
<script>
import toggleMixin from '../../toggle-check-box-mixin';
import ToggleSwitch from '@/ui/components/ToggleSwitch.vue';
import uuid from 'uuid';
export default {
components: {
ToggleSwitch
},
mixins: [toggleMixin],
props: {
model: {
type: Object,
required: true
}
},
data() {
return {
switchId: `toggleSwitch-${uuid}`,
isChecked: this.model.value
};
}
};
</script>

View File

@ -0,0 +1,19 @@
export default {
data() {
return {
isChecked: false
};
},
methods: {
toggleCheckBox(event) {
this.isChecked = !this.isChecked;
const data = {
model: this.model,
value: this.isChecked
};
this.$emit('onChange', data);
}
}
};

View File

@ -1,6 +1,7 @@
<template> <template>
<div class="c-menu" <div
:class="options.menuClass" class="c-menu"
:class="options.menuClass"
> >
<ul v-if="options.actions.length && options.actions[0].length"> <ul v-if="options.actions.length && options.actions[0].length">
<template <template

View File

@ -1,8 +1,10 @@
<template> <template>
<div class="c-menu" <div
:class="[options.menuClass, 'c-super-menu']" class="c-menu"
:class="[options.menuClass, 'c-super-menu']"
> >
<ul v-if="options.actions.length && options.actions[0].length" <ul
v-if="options.actions.length && options.actions[0].length"
class="c-super-menu__menu" class="c-super-menu__menu"
> >
<template <template
@ -34,7 +36,8 @@
</template> </template>
</ul> </ul>
<ul v-else <ul
v-else
class="c-super-menu__menu" class="c-super-menu__menu"
> >
<li <li

View File

@ -36,13 +36,14 @@ class InMemorySearchProvider {
*/ */
this.MAX_CONCURRENT_REQUESTS = 100; this.MAX_CONCURRENT_REQUESTS = 100;
/** /**
* If max results is not specified in query, use this as default. * If max results is not specified in query, use this as default.
*/ */
this.DEFAULT_MAX_RESULTS = 100; this.DEFAULT_MAX_RESULTS = 100;
this.openmct = openmct; this.openmct = openmct;
this.indexedIds = {}; this.indexedIds = {};
this.indexedCompositions = {};
this.idsToIndex = []; this.idsToIndex = [];
this.pendingIndex = {}; this.pendingIndex = {};
this.pendingRequests = 0; this.pendingRequests = 0;
@ -58,7 +59,6 @@ class InMemorySearchProvider {
this.onWorkerMessageError = this.onWorkerMessageError.bind(this); this.onWorkerMessageError = this.onWorkerMessageError.bind(this);
this.onerror = this.onWorkerError.bind(this); this.onerror = this.onWorkerError.bind(this);
this.startIndexing = this.startIndexing.bind(this); this.startIndexing = this.startIndexing.bind(this);
this.onMutationOfIndexedObject = this.onMutationOfIndexedObject.bind(this);
this.openmct.on('start', this.startIndexing); this.openmct.on('start', this.startIndexing);
this.openmct.on('destroy', () => { this.openmct.on('destroy', () => {
@ -68,6 +68,9 @@ class InMemorySearchProvider {
this.worker.port.onmessageerror = null; this.worker.port.onmessageerror = null;
this.worker.port.close(); this.worker.port.close();
} }
this.destroyObservers(this.indexedIds);
this.destroyObservers(this.indexedCompositions);
}); });
} }
@ -137,7 +140,7 @@ class InMemorySearchProvider {
}; };
modelResults.hits = await Promise.all(event.data.results.map(async (hit) => { modelResults.hits = await Promise.all(event.data.results.map(async (hit) => {
const identifier = this.openmct.objects.parseKeyString(hit.keyString); const identifier = this.openmct.objects.parseKeyString(hit.keyString);
const domainObject = await this.openmct.objects.get(identifier.key); const domainObject = await this.openmct.objects.get(identifier);
return domainObject; return domainObject;
})); }));
@ -213,29 +216,52 @@ class InMemorySearchProvider {
} }
} }
onMutationOfIndexedObject(domainObject) { onNameMutation(domainObject, name) {
const provider = this; const provider = this;
provider.index(domainObject.identifier, domainObject);
domainObject.name = name;
provider.index(domainObject);
}
onCompositionMutation(domainObject, composition) {
const provider = this;
const indexedComposition = domainObject.composition;
const identifiersToIndex = composition
.filter(identifier => !indexedComposition
.some(indexedIdentifier => this.openmct.objects
.areIdsEqual([identifier, indexedIdentifier])));
identifiersToIndex.forEach(identifier => {
this.openmct.objects.get(identifier).then(objectToIndex => provider.index(objectToIndex));
});
} }
/** /**
* Pass an id and model to the worker to be indexed. If the model has * Pass a domainObject to the worker to be indexed.
* composition, schedule those ids for later indexing. * If the object has composition, schedule those ids for later indexing.
* Watch for object changes and re-index object and children if so
* *
* @private * @private
* @param id a model id * @param domainObject a domainObject
* @param model a model
*/ */
async index(id, domainObject) { async index(domainObject) {
const provider = this; const provider = this;
const keyString = this.openmct.objects.makeKeyString(id); const keyString = this.openmct.objects.makeKeyString(domainObject.identifier);
if (!this.indexedIds[keyString]) { if (!this.indexedIds[keyString]) {
this.openmct.objects.observe(domainObject, `*`, this.onMutationOfIndexedObject); this.indexedIds[keyString] = this.openmct.objects.observe(
domainObject,
'name',
this.onNameMutation.bind(this, domainObject)
);
this.indexedCompositions[keyString] = this.openmct.objects.observe(
domainObject,
'composition',
this.onCompositionMutation.bind(this, domainObject)
);
} }
this.indexedIds[keyString] = true; if ((keyString !== 'ROOT')) {
if ((id.key !== 'ROOT')) {
if (this.worker) { if (this.worker) {
this.worker.port.postMessage({ this.worker.port.postMessage({
request: 'index', request: 'index',
@ -247,15 +273,12 @@ class InMemorySearchProvider {
} }
} }
const composition = this.openmct.composition.registry.find(foundComposition => { const composition = this.openmct.composition.get(domainObject);
return foundComposition.appliesTo(domainObject);
});
if (composition) { if (composition !== undefined) {
const childIdentifiers = await composition.load(domainObject); const children = await composition.load();
childIdentifiers.forEach(function (childIdentifier) {
provider.scheduleForIndexing(childIdentifier); children.forEach(child => provider.scheduleForIndexing(child.identifier));
});
} }
} }
@ -271,12 +294,12 @@ class InMemorySearchProvider {
const provider = this; const provider = this;
this.pendingRequests += 1; this.pendingRequests += 1;
const identifier = await this.openmct.objects.parseKeyString(keyString); const domainObject = await this.openmct.objects.get(keyString);
const domainObject = await this.openmct.objects.get(identifier.key);
delete provider.pendingIndex[keyString]; delete provider.pendingIndex[keyString];
try { try {
if (domainObject) { if (domainObject) {
await provider.index(identifier, domainObject); await provider.index(domainObject);
} }
} catch (error) { } catch (error) {
console.warn('Failed to index domain object ' + keyString, error); console.warn('Failed to index domain object ' + keyString, error);
@ -305,9 +328,9 @@ class InMemorySearchProvider {
} }
/** /**
* A local version of the same SharedWorker function * A local version of the same SharedWorker function
* if we don't have SharedWorkers available (e.g., iOS) * if we don't have SharedWorkers available (e.g., iOS)
*/ */
localIndexItem(keyString, model) { localIndexItem(keyString, model) {
this.localIndexedItems[keyString] = { this.localIndexedItems[keyString] = {
type: model.type, type: model.type,
@ -347,6 +370,16 @@ class InMemorySearchProvider {
}; };
this.onWorkerMessage(eventToReturn); this.onWorkerMessage(eventToReturn);
} }
destroyObservers(observers) {
Object.entries(observers).forEach(([keyString, unobserve]) => {
if (typeof unobserve === 'function') {
unobserve();
}
delete observers[keyString];
});
}
} }
export default InMemorySearchProvider; export default InMemorySearchProvider;

View File

@ -105,13 +105,18 @@ describe("The Object API Search Function", () => {
beforeEach((done) => { beforeEach((done) => {
openmct = createOpenMct(); openmct = createOpenMct();
const defaultObjectProvider = openmct.objects.getProvider({
key: '',
namespace: ''
});
openmct.objects.addProvider('foo', defaultObjectProvider);
spyOn(openmct.objects.inMemorySearchProvider, "query").and.callThrough(); spyOn(openmct.objects.inMemorySearchProvider, "query").and.callThrough();
spyOn(openmct.objects.inMemorySearchProvider, "localSearch").and.callThrough(); spyOn(openmct.objects.inMemorySearchProvider, "localSearch").and.callThrough();
openmct.on('start', async () => { openmct.on('start', async () => {
mockIdentifier1 = { mockIdentifier1 = {
key: 'some-object', key: 'some-object',
namespace: 'some-namespace' namespace: 'foo'
}; };
mockDomainObject1 = { mockDomainObject1 = {
type: 'clock', type: 'clock',
@ -120,7 +125,7 @@ describe("The Object API Search Function", () => {
}; };
mockIdentifier2 = { mockIdentifier2 = {
key: 'some-other-object', key: 'some-other-object',
namespace: 'some-namespace' namespace: 'foo'
}; };
mockDomainObject2 = { mockDomainObject2 = {
type: 'clock', type: 'clock',
@ -129,16 +134,16 @@ describe("The Object API Search Function", () => {
}; };
mockIdentifier3 = { mockIdentifier3 = {
key: 'yet-another-object', key: 'yet-another-object',
namespace: 'some-namespace' namespace: 'foo'
}; };
mockDomainObject3 = { mockDomainObject3 = {
type: 'clock', type: 'clock',
name: 'redBear', name: 'redBear',
identifier: mockIdentifier3 identifier: mockIdentifier3
}; };
await openmct.objects.inMemorySearchProvider.index(mockIdentifier1, mockDomainObject1); await openmct.objects.inMemorySearchProvider.index(mockDomainObject1);
await openmct.objects.inMemorySearchProvider.index(mockIdentifier2, mockDomainObject2); await openmct.objects.inMemorySearchProvider.index(mockDomainObject2);
await openmct.objects.inMemorySearchProvider.index(mockIdentifier3, mockDomainObject3); await openmct.objects.inMemorySearchProvider.index(mockDomainObject3);
done(); done();
}); });
openmct.startHeadless(); openmct.startHeadless();
@ -175,9 +180,9 @@ describe("The Object API Search Function", () => {
beforeEach(async () => { beforeEach(async () => {
openmct.objects.inMemorySearchProvider.worker = null; openmct.objects.inMemorySearchProvider.worker = null;
// reindex locally // reindex locally
await openmct.objects.inMemorySearchProvider.index(mockIdentifier1, mockDomainObject1); await openmct.objects.inMemorySearchProvider.index(mockDomainObject1);
await openmct.objects.inMemorySearchProvider.index(mockIdentifier2, mockDomainObject2); await openmct.objects.inMemorySearchProvider.index(mockDomainObject2);
await openmct.objects.inMemorySearchProvider.index(mockIdentifier3, mockDomainObject3); await openmct.objects.inMemorySearchProvider.index(mockDomainObject3);
}); });
it("calls local search", () => { it("calls local search", () => {
openmct.objects.search('foo'); openmct.objects.search('foo');

View File

@ -22,12 +22,14 @@
export default class Transaction { export default class Transaction {
constructor(objectAPI) { constructor(objectAPI) {
this.dirtyObjects = new Set(); this.dirtyObjects = {};
this.objectAPI = objectAPI; this.objectAPI = objectAPI;
} }
add(object) { add(object) {
this.dirtyObjects.add(object); const key = this.objectAPI.makeKeyString(object.identifier);
this.dirtyObjects[key] = object;
} }
cancel() { cancel() {
@ -37,7 +39,8 @@ export default class Transaction {
commit() { commit() {
const promiseArray = []; const promiseArray = [];
const save = this.objectAPI.save.bind(this.objectAPI); const save = this.objectAPI.save.bind(this.objectAPI);
this.dirtyObjects.forEach(object => {
Object.values(this.dirtyObjects).forEach(object => {
promiseArray.push(this.createDirtyObjectPromise(object, save)); promiseArray.push(this.createDirtyObjectPromise(object, save));
}); });
@ -48,7 +51,9 @@ export default class Transaction {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
action(object) action(object)
.then((success) => { .then((success) => {
this.dirtyObjects.delete(object); const key = this.objectAPI.makeKeyString(object.identifier);
delete this.dirtyObjects[key];
resolve(success); resolve(success);
}) })
.catch(reject); .catch(reject);
@ -57,7 +62,8 @@ export default class Transaction {
getDirtyObject(identifier) { getDirtyObject(identifier) {
let dirtyObject; let dirtyObject;
this.dirtyObjects.forEach(object => {
Object.values(this.dirtyObjects).forEach(object => {
const areIdsEqual = this.objectAPI.areIdsEqual(object.identifier, identifier); const areIdsEqual = this.objectAPI.areIdsEqual(object.identifier, identifier);
if (areIdsEqual) { if (areIdsEqual) {
dirtyObject = object; dirtyObject = object;
@ -67,14 +73,11 @@ export default class Transaction {
return dirtyObject; return dirtyObject;
} }
start() {
this.dirtyObjects = new Set();
}
_clear() { _clear() {
const promiseArray = []; const promiseArray = [];
const refresh = this.objectAPI.refresh.bind(this.objectAPI); const refresh = this.objectAPI.refresh.bind(this.objectAPI);
this.dirtyObjects.forEach(object => {
Object.values(this.dirtyObjects).forEach(object => {
promiseArray.push(this.createDirtyObjectPromise(object, refresh)); promiseArray.push(this.createDirtyObjectPromise(object, refresh));
}); });

View File

@ -34,24 +34,24 @@ describe("Transaction Class", () => {
}); });
it('has no dirty objects', () => { it('has no dirty objects', () => {
expect(transaction.dirtyObjects.size).toEqual(0); expect(Object.keys(transaction.dirtyObjects).length).toEqual(0);
}); });
it('add(), adds object to dirtyObjects', () => { it('add(), adds object to dirtyObjects', () => {
const mockDomainObjects = createMockDomainObjects(); const mockDomainObjects = createMockDomainObjects();
transaction.add(mockDomainObjects[0]); transaction.add(mockDomainObjects[0]);
expect(transaction.dirtyObjects.size).toEqual(1); expect(Object.keys(transaction.dirtyObjects).length).toEqual(1);
}); });
it('cancel(), clears all dirtyObjects', (done) => { it('cancel(), clears all dirtyObjects', (done) => {
const mockDomainObjects = createMockDomainObjects(3); const mockDomainObjects = createMockDomainObjects(3);
mockDomainObjects.forEach(transaction.add.bind(transaction)); mockDomainObjects.forEach(transaction.add.bind(transaction));
expect(transaction.dirtyObjects.size).toEqual(3); expect(Object.keys(transaction.dirtyObjects).length).toEqual(3);
transaction.cancel() transaction.cancel()
.then(success => { .then(success => {
expect(transaction.dirtyObjects.size).toEqual(0); expect(Object.keys(transaction.dirtyObjects).length).toEqual(0);
}).finally(done); }).finally(done);
}); });
@ -59,12 +59,12 @@ describe("Transaction Class", () => {
const mockDomainObjects = createMockDomainObjects(3); const mockDomainObjects = createMockDomainObjects(3);
mockDomainObjects.forEach(transaction.add.bind(transaction)); mockDomainObjects.forEach(transaction.add.bind(transaction));
expect(transaction.dirtyObjects.size).toEqual(3); expect(Object.keys(transaction.dirtyObjects).length).toEqual(3);
spyOn(objectAPI, 'save').and.callThrough(); spyOn(objectAPI, 'save').and.callThrough();
transaction.commit() transaction.commit()
.then(success => { .then(success => {
expect(transaction.dirtyObjects.size).toEqual(0); expect(Object.keys(transaction.dirtyObjects).length).toEqual(0);
expect(objectAPI.save.calls.count()).toEqual(3); expect(objectAPI.save.calls.count()).toEqual(3);
}).finally(done); }).finally(done);
}); });
@ -73,7 +73,7 @@ describe("Transaction Class", () => {
const mockDomainObjects = createMockDomainObjects(); const mockDomainObjects = createMockDomainObjects();
transaction.add(mockDomainObjects[0]); transaction.add(mockDomainObjects[0]);
expect(transaction.dirtyObjects.size).toEqual(1); expect(Object.keys(transaction.dirtyObjects).length).toEqual(1);
const dirtyObject = transaction.getDirtyObject(mockDomainObjects[0].identifier); const dirtyObject = transaction.getDirtyObject(mockDomainObjects[0].identifier);
expect(dirtyObject).toEqual(mockDomainObjects[0]); expect(dirtyObject).toEqual(mockDomainObjects[0]);
@ -82,7 +82,7 @@ describe("Transaction Class", () => {
it('getDirtyObject(), returns empty dirtyObject for no active transaction', () => { it('getDirtyObject(), returns empty dirtyObject for no active transaction', () => {
const mockDomainObjects = createMockDomainObjects(); const mockDomainObjects = createMockDomainObjects();
expect(transaction.dirtyObjects.size).toEqual(0); expect(Object.keys(transaction.dirtyObjects).length).toEqual(0);
const dirtyObject = transaction.getDirtyObject(mockDomainObjects[0].identifier); const dirtyObject = transaction.getDirtyObject(mockDomainObjects[0].identifier);
expect(dirtyObject).toEqual(undefined); expect(dirtyObject).toEqual(undefined);

View File

@ -0,0 +1,67 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2022, 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 EventEmitter from 'EventEmitter';
export default class StyleManagerAPI extends EventEmitter {
constructor(openmct) {
super();
this._openmct = openmct;
this._styleCache = {};
this.get = this.get.bind(this);
this.set = this.set.bind(this);
this.observe = this.observe.bind(this);
}
get(identifier) {
let keyString = this._openmct.objects.makeKeyString(identifier);
return this._styleCache[keyString];
}
set(identifier, value) {
let keyString = this._openmct.objects.makeKeyString(identifier);
this._styleCache[keyString] = value;
this.emit(keyString, value);
}
delete(identifier) {
let keyString = this._openmct.objects.makeKeyString(identifier);
this._styleCache[keyString] = undefined;
this.emit(keyString, undefined);
delete this._styleCache[keyString];
}
observe(identifier, callback) {
let key = this._openmct.objects.makeKeyString(identifier);
this.on(key, callback);
return () => {
this.off(key, callback);
};
}
}

View File

@ -172,6 +172,7 @@ export class TelemetryCollection extends EventEmitter {
* @private * @private
*/ */
_processNewTelemetry(telemetryData) { _processNewTelemetry(telemetryData) {
performance.mark('tlm:process:start');
if (telemetryData === undefined) { if (telemetryData === undefined) {
return; return;
} }
@ -184,8 +185,8 @@ export class TelemetryCollection extends EventEmitter {
for (let datum of data) { for (let datum of data) {
parsedValue = this.parseTime(datum); parsedValue = this.parseTime(datum);
beforeStartOfBounds = parsedValue < this.lastBounds.start; beforeStartOfBounds = parsedValue <= this.lastBounds.start;
afterEndOfBounds = parsedValue > this.lastBounds.end; afterEndOfBounds = parsedValue >= this.lastBounds.end;
if (!afterEndOfBounds && !beforeStartOfBounds) { if (!afterEndOfBounds && !beforeStartOfBounds) {
let isDuplicate = false; let isDuplicate = false;
@ -352,6 +353,7 @@ export class TelemetryCollection extends EventEmitter {
* @todo handle subscriptions more granually * @todo handle subscriptions more granually
*/ */
_reset() { _reset() {
performance.mark('tlm:reset');
this.boundedTelemetry = []; this.boundedTelemetry = [];
this.futureBuffer = []; this.futureBuffer = [];

View File

@ -365,3 +365,7 @@ class TimeContext extends EventEmitter {
} }
export default TimeContext; export default TimeContext;
/**
@typedef {{start: number, end: number}} Bounds
*/

View File

@ -21,7 +21,7 @@
*****************************************************************************/ *****************************************************************************/
import CSV from 'comma-separated-values'; import CSV from 'comma-separated-values';
import {saveAs} from 'file-saver/FileSaver'; import {saveAs} from 'saveAs';
class CSVExporter { class CSVExporter {
export(rows, options) { export(rows, options) {

View File

@ -31,7 +31,7 @@ function replaceDotsWithUnderscores(filename) {
return filename.replace(regex, '_'); return filename.replace(regex, '_');
} }
import {saveAs} from 'file-saver/FileSaver'; import {saveAs} from 'saveAs';
import html2canvas from 'html2canvas'; import html2canvas from 'html2canvas';
import uuid from 'uuid'; import uuid from 'uuid';

View File

@ -20,7 +20,7 @@
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
import {saveAs} from 'file-saver/FileSaver'; import {saveAs} from 'saveAs';
class JSONExporter { class JSONExporter {
export(obj, options) { export(obj, options) {

View File

@ -15,7 +15,8 @@ export default function (folderName, couchPlugin, searchFilter) {
return Promise.resolve({ return Promise.resolve({
identifier, identifier,
type: 'folder', type: 'folder',
name: folderName || "CouchDB Documents" name: folderName || "CouchDB Documents",
location: 'ROOT'
}); });
} }
} }

View File

@ -85,7 +85,8 @@ describe('the plugin', function () {
expect(object).toEqual({ expect(object).toEqual({
identifier, identifier,
type: 'folder', type: 'folder',
name: "CouchDB Documents" name: 'CouchDB Documents',
location: 'ROOT'
}); });
}); });
}); });

View File

@ -1,4 +1,3 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2022, United States Government * Open MCT, Copyright (c) 2014-2022, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
@ -114,14 +113,12 @@ export default {
this.metadata = this.openmct.telemetry.getMetadata(this.domainObject); this.metadata = this.openmct.telemetry.getMetadata(this.domainObject);
this.formats = this.openmct.telemetry.getFormatMap(this.metadata); this.formats = this.openmct.telemetry.getFormatMap(this.metadata);
this.keyString = this.openmct.objects.makeKeyString(this.domainObject.identifier); this.keyString = this.openmct.objects.makeKeyString(this.domainObject.identifier);
this.bounds = this.openmct.time.bounds();
this.limitEvaluator = this.openmct this.limitEvaluator = this.openmct
.telemetry .telemetry
.limitEvaluator(this.domainObject); .limitEvaluator(this.domainObject);
this.openmct.time.on('timeSystem', this.updateTimeSystem); this.openmct.time.on('timeSystem', this.updateTimeSystem);
this.openmct.time.on('bounds', this.updateBounds);
this.timestampKey = this.openmct.time.timeSystem().key; this.timestampKey = this.openmct.time.timeSystem().key;
@ -135,72 +132,39 @@ export default {
this.valueKey = this.valueMetadata ? this.valueMetadata.key : undefined; this.valueKey = this.valueMetadata ? this.valueMetadata.key : undefined;
this.unsubscribe = this.openmct this.telemetryCollection = this.openmct.telemetry.requestCollection(this.domainObject, {
.telemetry size: 1,
.subscribe(this.domainObject, this.setLatestValues); strategy: 'latest'
});
this.requestHistory(); this.telemetryCollection.on('add', this.setLatestValues);
this.telemetryCollection.on('clear', this.resetValues);
this.telemetryCollection.load();
if (this.hasUnits) { if (this.hasUnits) {
this.setUnit(); this.setUnit();
} }
}, },
destroyed() { destroyed() {
this.unsubscribe();
this.openmct.time.off('timeSystem', this.updateTimeSystem); this.openmct.time.off('timeSystem', this.updateTimeSystem);
this.openmct.time.off('bounds', this.updateBounds); this.telemetryCollection.off('add', this.setLatestValues);
this.telemetryCollection.off('clear', this.resetValues);
}, },
methods: { methods: {
updateView() { updateView() {
if (!this.updatingView) { if (!this.updatingView) {
this.updatingView = true; this.updatingView = true;
requestAnimationFrame(() => { requestAnimationFrame(() => {
let newTimestamp = this.getParsedTimestamp(this.latestDatum); this.timestamp = this.getParsedTimestamp(this.latestDatum);
this.datum = this.latestDatum;
if (this.shouldUpdate(newTimestamp)) {
this.timestamp = newTimestamp;
this.datum = this.latestDatum;
}
this.updatingView = false; this.updatingView = false;
}); });
} }
}, },
setLatestValues(datum) { setLatestValues(data) {
this.latestDatum = datum; this.latestDatum = data[data.length - 1];
this.updateView(); this.updateView();
}, },
shouldUpdate(newTimestamp) {
return this.inBounds(newTimestamp)
&& (this.timestamp === undefined || newTimestamp > this.timestamp);
},
requestHistory() {
this.openmct
.telemetry
.request(this.domainObject, {
start: this.bounds.start,
end: this.bounds.end,
size: 1,
strategy: 'latest'
})
.then((array) => this.setLatestValues(array[array.length - 1]))
.catch((error) => {
console.warn('Error fetching data', error);
});
},
updateBounds(bounds, isTick) {
this.bounds = bounds;
if (!isTick) {
this.resetValues();
this.requestHistory();
}
},
inBounds(timestamp) {
return timestamp >= this.bounds.start && timestamp <= this.bounds.end;
},
updateTimeSystem(timeSystem) { updateTimeSystem(timeSystem) {
this.resetValues();
this.timestampKey = timeSystem.key; this.timestampKey = timeSystem.key;
}, },
updateViewContext() { updateViewContext() {
@ -241,4 +205,3 @@ export default {
} }
}; };
</script> </script>

View File

@ -46,6 +46,7 @@ describe("The LAD Table", () => {
let openmct; let openmct;
let ladPlugin; let ladPlugin;
let historicalProvider;
let parent; let parent;
let child; let child;
let telemetryCount = 3; let telemetryCount = 3;
@ -81,6 +82,13 @@ describe("The LAD Table", () => {
spyOn(openmct.objects, 'get').and.returnValue(Promise.resolve({})); spyOn(openmct.objects, 'get').and.returnValue(Promise.resolve({}));
historicalProvider = {
request: () => {
return Promise.resolve([]);
}
};
spyOn(openmct.telemetry, 'findRequestProvider').and.returnValue(historicalProvider);
openmct.time.bounds({ openmct.time.bounds({
start: bounds.start, start: bounds.start,
end: bounds.end end: bounds.end
@ -147,7 +155,7 @@ describe("The LAD Table", () => {
// add another telemetry object as composition in lad table to test multi rows // add another telemetry object as composition in lad table to test multi rows
mockObj.ladTable.composition.push(anotherTelemetryObj.identifier); mockObj.ladTable.composition.push(anotherTelemetryObj.identifier);
beforeEach(async () => { beforeEach(async (done) => {
let telemetryRequestResolve; let telemetryRequestResolve;
let telemetryObjectResolve; let telemetryObjectResolve;
let anotherTelemetryObjectResolve; let anotherTelemetryObjectResolve;
@ -166,11 +174,12 @@ describe("The LAD Table", () => {
callBack(); callBack();
}); });
openmct.telemetry.request.and.callFake(() => { historicalProvider.request = () => {
telemetryRequestResolve(mockTelemetry); telemetryRequestResolve(mockTelemetry);
return telemetryRequestPromise; return telemetryRequestPromise;
}); };
openmct.objects.get.and.callFake((obj) => { openmct.objects.get.and.callFake((obj) => {
if (obj.key === 'telemetry-object') { if (obj.key === 'telemetry-object') {
telemetryObjectResolve(mockObj.telemetry); telemetryObjectResolve(mockObj.telemetry);
@ -195,6 +204,8 @@ describe("The LAD Table", () => {
await Promise.all([telemetryRequestPromise, telemetryObjectPromise, anotherTelemetryObjectPromise]); await Promise.all([telemetryRequestPromise, telemetryObjectPromise, anotherTelemetryObjectPromise]);
await Vue.nextTick(); await Vue.nextTick();
done();
}); });
it("should show one row per object in the composition", () => { it("should show one row per object in the composition", () => {

View File

@ -1,28 +1,34 @@
<template> <template>
<div ref="plotWrapper" <div
class="has-local-controls" ref="plotWrapper"
:class="{ 's-unsynced' : isZoomed }" class="has-local-controls"
:class="{ 's-unsynced' : isZoomed }"
> >
<div v-if="isZoomed" <div
class="l-state-indicators" v-if="isZoomed"
class="l-state-indicators"
> >
<span class="l-state-indicators__alert-no-lad t-object-alert t-alert-unsynced icon-alert-triangle" <span
title="This plot is not currently displaying the latest data. Reset pan/zoom to view latest data." class="l-state-indicators__alert-no-lad t-object-alert t-alert-unsynced icon-alert-triangle"
title="This plot is not currently displaying the latest data. Reset pan/zoom to view latest data."
></span> ></span>
</div> </div>
<div ref="plot" <div
class="c-bar-chart" ref="plot"
@plotly_relayout="zoom" class="c-bar-chart"
@plotly_relayout="zoom"
></div> ></div>
<div v-if="false" <div
ref="localControl" v-if="false"
class="gl-plot__local-controls h-local-controls h-local-controls--overlay-content c-local-controls--show-on-hover" ref="localControl"
class="gl-plot__local-controls h-local-controls h-local-controls--overlay-content c-local-controls--show-on-hover"
> >
<button v-if="data.length" <button
class="c-button icon-reset" v-if="data.length"
:disabled="!isZoomed" class="c-button icon-reset"
title="Reset pan/zoom" :disabled="!isZoomed"
@click="reset()" title="Reset pan/zoom"
@click="reset()"
> >
</button> </button>
</div> </div>

View File

@ -21,12 +21,13 @@
--> -->
<template> <template>
<BarGraph ref="barGraph" <BarGraph
class="c-plot c-bar-chart-view" ref="barGraph"
:data="trace" class="c-plot c-bar-chart-view"
:plot-axis-title="plotAxisTitle" :data="trace"
@subscribe="subscribeToAll" :plot-axis-title="plotAxisTitle"
@unsubscribe="removeAllSubscriptions" @subscribe="subscribeToAll"
@unsubscribe="removeAllSubscriptions"
/> />
</template> </template>

View File

@ -22,11 +22,13 @@
<template> <template>
<ul class="c-tree c-bar-graph-options"> <ul class="c-tree c-bar-graph-options">
<h2 title="Display properties for this object">Bar Graph Series</h2> <h2 title="Display properties for this object">Bar Graph Series</h2>
<li v-for="series in domainObject.composition" <li
v-for="series in domainObject.composition"
:key="series.key" :key="series.key"
> >
<series-options :item="series" <series-options
:color-palette="colorPalette" :item="series"
:color-palette="colorPalette"
/> />
</li> </li>
</ul> </ul>

View File

@ -21,12 +21,14 @@
--> -->
<template> <template>
<ul> <ul>
<li class="c-tree__item menus-to-left" <li
class="c-tree__item menus-to-left"
:class="aliasCss" :class="aliasCss"
> >
<span class="c-disclosure-triangle is-enabled flex-elem" <span
:class="expandedCssClass" class="c-disclosure-triangle is-enabled flex-elem"
@click="expanded = !expanded" :class="expandedCssClass"
@click="expanded = !expanded"
> >
</span> </span>
@ -36,14 +38,15 @@
<div class="c-object-label__name">{{ name }}</div> <div class="c-object-label__name">{{ name }}</div>
</div> </div>
</li> </li>
<ColorSwatch v-if="expanded" <ColorSwatch
:current-color="currentColor" v-if="expanded"
title="Manually set the color for this bar graph series." :current-color="currentColor"
edit-title="Manually set the color for this bar graph series" title="Manually set the color for this bar graph series."
view-title="The color for this bar graph series." edit-title="Manually set the color for this bar graph series"
short-label="Color" view-title="The color for this bar graph series."
class="grid-properties" short-label="Color"
@colorSet="setColor" class="grid-properties"
@colorSet="setColor"
/> />
</ul> </ul>
</template> </template>

View File

@ -185,10 +185,14 @@ describe('The Clear Data Plugin:', () => {
beforeEach((done) => { beforeEach((done) => {
openmct = createOpenMct(); openmct = createOpenMct();
clearDataPlugin = new ClearDataPlugin( clearDataPlugin = new ClearDataPlugin([
['table', 'telemetry.plot.overlay', 'telemetry.plot.stacked'], 'table',
{indicator: true} 'telemetry.plot.overlay',
); 'telemetry.plot.stacked',
'example.imagery'
], {
indicator: true
});
openmct.install(clearDataPlugin); openmct.install(clearDataPlugin);
appHolder = document.createElement('div'); appHolder = document.createElement('div');
document.body.appendChild(appHolder); document.body.appendChild(appHolder);

View File

@ -25,6 +25,7 @@ import EventEmitter from 'EventEmitter';
export default class StyleRuleManager extends EventEmitter { export default class StyleRuleManager extends EventEmitter {
constructor(styleConfiguration, openmct, callback, suppressSubscriptionOnEdit) { constructor(styleConfiguration, openmct, callback, suppressSubscriptionOnEdit) {
super(); super();
this.openmct = openmct; this.openmct = openmct;
this.callback = callback; this.callback = callback;
this.refreshData = this.refreshData.bind(this); this.refreshData = this.refreshData.bind(this);
@ -152,6 +153,7 @@ export default class StyleRuleManager extends EventEmitter {
updateDomainObjectStyle() { updateDomainObjectStyle() {
if (this.callback) { if (this.callback) {
this.emit('updateStyles', this.currentStyle);
this.callback(Object.assign({}, this.currentStyle)); this.callback(Object.assign({}, this.currentStyle));
} }
} }

View File

@ -21,31 +21,35 @@
*****************************************************************************/ *****************************************************************************/
<template> <template>
<div class="c-condition-h" <div
:class="{ 'is-drag-target': draggingOver }" class="c-condition-h"
@dragover.prevent :class="{ 'is-drag-target': draggingOver }"
@drop.prevent="dropCondition($event, conditionIndex)" @dragover.prevent
@dragenter="dragEnter($event, conditionIndex)" @drop.prevent="dropCondition($event, conditionIndex)"
@dragleave="dragLeave($event, conditionIndex)" @dragenter="dragEnter($event, conditionIndex)"
@dragleave="dragLeave($event, conditionIndex)"
> >
<div class="c-condition-h__drop-target"></div> <div class="c-condition-h__drop-target"></div>
<div v-if="isEditing" <div
:class="{'is-current': condition.id === currentConditionId}" v-if="isEditing"
class="c-condition c-condition--edit" :class="{'is-current': condition.id === currentConditionId}"
class="c-condition c-condition--edit"
> >
<!-- Edit view --> <!-- Edit view -->
<div class="c-condition__header"> <div class="c-condition__header">
<span class="c-condition__drag-grippy c-grippy c-grippy--vertical-drag" <span
title="Drag to reorder conditions" class="c-condition__drag-grippy c-grippy c-grippy--vertical-drag"
:class="[{ 'is-enabled': !condition.isDefault }, { 'hide-nice': condition.isDefault }]" title="Drag to reorder conditions"
:draggable="!condition.isDefault" :class="[{ 'is-enabled': !condition.isDefault }, { 'hide-nice': condition.isDefault }]"
@dragstart="dragStart" :draggable="!condition.isDefault"
@dragend="dragEnd" @dragstart="dragStart"
@dragend="dragEnd"
></span> ></span>
<span class="c-condition__disclosure c-disclosure-triangle c-tree__item__view-control is-enabled" <span
:class="{ 'c-disclosure-triangle--expanded': expanded }" class="c-condition__disclosure c-disclosure-triangle c-tree__item__view-control is-enabled"
@click="expanded = !expanded" :class="{ 'c-disclosure-triangle--expanded': expanded }"
@click="expanded = !expanded"
></span> ></span>
<span class="c-condition__name">{{ condition.configuration.name }}</span> <span class="c-condition__name">{{ condition.configuration.name }}</span>
@ -54,107 +58,123 @@
Define criteria Define criteria
</template> </template>
<span v-else> <span v-else>
<condition-description :show-label="false" <condition-description
:condition="condition" :show-label="false"
:condition="condition"
/> />
</span> </span>
</span> </span>
<div class="c-condition__buttons"> <div class="c-condition__buttons">
<button v-if="!condition.isDefault" <button
class="c-click-icon c-condition__duplicate-button icon-duplicate" v-if="!condition.isDefault"
title="Duplicate this condition" class="c-click-icon c-condition__duplicate-button icon-duplicate"
@click="cloneCondition" title="Duplicate this condition"
@click="cloneCondition"
></button> ></button>
<button v-if="!condition.isDefault" <button
class="c-click-icon c-condition__delete-button icon-trash" v-if="!condition.isDefault"
title="Delete this condition" class="c-click-icon c-condition__delete-button icon-trash"
@click="removeCondition" title="Delete this condition"
@click="removeCondition"
></button> ></button>
</div> </div>
</div> </div>
<div v-if="expanded" <div
class="c-condition__definition c-cdef" v-if="expanded"
class="c-condition__definition c-cdef"
> >
<span class="c-cdef__separator c-row-separator"></span> <span class="c-cdef__separator c-row-separator"></span>
<span class="c-cdef__label">Condition Name</span> <span class="c-cdef__label">Condition Name</span>
<span class="c-cdef__controls"> <span class="c-cdef__controls">
<input v-model="condition.configuration.name" <input
class="t-condition-input__name" v-model="condition.configuration.name"
type="text" class="t-condition-input__name"
@change="persist" type="text"
@change="persist"
> >
</span> </span>
<span class="c-cdef__label">Output</span> <span class="c-cdef__label">Output</span>
<span class="c-cdef__controls"> <span class="c-cdef__controls">
<span class="c-cdef__control"> <span class="c-cdef__control">
<select v-model="selectedOutputSelection" <select
@change="setOutputValue" v-model="selectedOutputSelection"
@change="setOutputValue"
> >
<option v-for="option in outputOptions" <option
:key="option" v-for="option in outputOptions"
:value="option" :key="option"
:value="option"
> >
{{ initCap(option) }} {{ initCap(option) }}
</option> </option>
</select> </select>
</span> </span>
<span class="c-cdef__control"> <span class="c-cdef__control">
<input v-if="selectedOutputSelection === outputOptions[2]" <input
v-model="condition.configuration.output" v-if="selectedOutputSelection === outputOptions[2]"
class="t-condition-name-input" v-model="condition.configuration.output"
type="text" class="t-condition-name-input"
@change="persist" type="text"
@change="persist"
> >
</span> </span>
</span> </span>
<div v-if="!condition.isDefault" <div
class="c-cdef__match-and-criteria" v-if="!condition.isDefault"
class="c-cdef__match-and-criteria"
> >
<span class="c-cdef__separator c-row-separator"></span> <span class="c-cdef__separator c-row-separator"></span>
<span class="c-cdef__label">Match</span> <span class="c-cdef__label">Match</span>
<span class="c-cdef__controls"> <span class="c-cdef__controls">
<select v-model="condition.configuration.trigger" <select
@change="persist" v-model="condition.configuration.trigger"
@change="persist"
> >
<option v-for="option in triggers" <option
:key="option.value" v-for="option in triggers"
:value="option.value" :key="option.value"
:value="option.value"
> {{ option.label }}</option> > {{ option.label }}</option>
</select> </select>
</span> </span>
<template v-if="telemetry.length || condition.configuration.criteria.length"> <template v-if="telemetry.length || condition.configuration.criteria.length">
<div v-for="(criterion, index) in condition.configuration.criteria" <div
:key="criterion.id" v-for="(criterion, index) in condition.configuration.criteria"
class="c-cdef__criteria" :key="criterion.id"
class="c-cdef__criteria"
> >
<Criterion :telemetry="telemetry" <Criterion
:criterion="criterion" :telemetry="telemetry"
:index="index" :criterion="criterion"
:trigger="condition.configuration.trigger" :index="index"
:is-default="condition.configuration.criteria.length === 1" :trigger="condition.configuration.trigger"
@persist="persist" :is-default="condition.configuration.criteria.length === 1"
@persist="persist"
/> />
<div class="c-cdef__criteria__buttons"> <div class="c-cdef__criteria__buttons">
<button class="c-click-icon c-cdef__criteria-duplicate-button icon-duplicate" <button
title="Duplicate this criteria" class="c-click-icon c-cdef__criteria-duplicate-button icon-duplicate"
@click="cloneCriterion(index)" title="Duplicate this criteria"
@click="cloneCriterion(index)"
></button> ></button>
<button v-if="!(condition.configuration.criteria.length === 1)" <button
class="c-click-icon c-cdef__criteria-duplicate-button icon-trash" v-if="!(condition.configuration.criteria.length === 1)"
title="Delete this criteria" class="c-click-icon c-cdef__criteria-duplicate-button icon-trash"
@click="removeCriterion(index)" title="Delete this criteria"
@click="removeCriterion(index)"
></button> ></button>
</div> </div>
</div> </div>
</template> </template>
<div class="c-cdef__separator c-row-separator"></div> <div class="c-cdef__separator c-row-separator"></div>
<div class="c-cdef__controls" <div
:disabled="!telemetry.length" class="c-cdef__controls"
:disabled="!telemetry.length"
> >
<button <button
class="c-cdef__add-criteria-button c-button c-button--labeled icon-plus" class="c-cdef__add-criteria-button c-button c-button--labeled icon-plus"
@ -166,9 +186,10 @@
</div> </div>
</div> </div>
</div> </div>
<div v-else <div
class="c-condition c-condition--browse" v-else
:class="{'is-current': condition.id === currentConditionId}" class="c-condition c-condition--browse"
:class="{'is-current': condition.id === currentConditionId}"
> >
<!-- Browse view --> <!-- Browse view -->
<div class="c-condition__header"> <div class="c-condition__header">
@ -180,8 +201,9 @@
</span> </span>
</div> </div>
<div class="c-condition__summary"> <div class="c-condition__summary">
<condition-description :show-label="false" <condition-description
:condition="condition" :show-label="false"
:condition="condition"
/> />
</div> </div>
</div> </div>

View File

@ -21,8 +21,9 @@
*****************************************************************************/ *****************************************************************************/
<template> <template>
<section id="conditionCollection" <section
:class="{ 'is-expanded': expanded }" id="conditionCollection"
:class="{ 'is-expanded': expanded }"
> >
<div class="c-cs__header c-section__header"> <div class="c-cs__header c-section__header">
<span <span
@ -32,12 +33,14 @@
></span> ></span>
<div class="c-cs__header-label c-section__label">Conditions</div> <div class="c-cs__header-label c-section__label">Conditions</div>
</div> </div>
<div v-if="expanded" <div
class="c-cs__content" v-if="expanded"
class="c-cs__content"
> >
<div v-show="isEditing" <div
class="hint" v-show="isEditing"
:class="{ 's-status-icon-warning-lo': !telemetryObjs.length }" class="hint"
:class="{ 's-status-icon-warning-lo': !telemetryObjs.length }"
> >
<template v-if="!telemetryObjs.length">Drag telemetry into this Condition Set to configure Conditions and add criteria.</template> <template v-if="!telemetryObjs.length">Drag telemetry into this Condition Set to configure Conditions and add criteria.</template>
<template v-else>The first condition to match is the one that is applied. Drag conditions to reorder.</template> <template v-else>The first condition to match is the one that is applied. Drag conditions to reorder.</template>
@ -52,24 +55,26 @@
<span class="c-cs-button__label">Add Condition</span> <span class="c-cs-button__label">Add Condition</span>
</button> </button>
<div class="c-cs__conditions-h" <div
:class="{ 'is-active-dragging': isDragging }" class="c-cs__conditions-h"
:class="{ 'is-active-dragging': isDragging }"
> >
<Condition v-for="(condition, index) in conditionCollection" <Condition
:key="condition.id" v-for="(condition, index) in conditionCollection"
:condition="condition" :key="condition.id"
:current-condition-id="currentConditionId" :condition="condition"
:condition-index="index" :current-condition-id="currentConditionId"
:telemetry="telemetryObjs" :condition-index="index"
:is-editing="isEditing" :telemetry="telemetryObjs"
:move-index="moveIndex" :is-editing="isEditing"
:is-dragging="isDragging" :move-index="moveIndex"
@updateCondition="updateCondition" :is-dragging="isDragging"
@removeCondition="removeCondition" @updateCondition="updateCondition"
@cloneCondition="cloneCondition" @removeCondition="removeCondition"
@setMoveIndex="setMoveIndex" @cloneCondition="cloneCondition"
@dragComplete="dragComplete" @setMoveIndex="setMoveIndex"
@dropCondition="dropCondition" @dragComplete="dragComplete"
@dropCondition="dropCondition"
/> />
</div> </div>
</div> </div>

View File

@ -22,18 +22,21 @@
<template> <template>
<div class="c-style__condition-desc"> <div class="c-style__condition-desc">
<span v-if="showLabel && condition" <span
class="c-style__condition-desc__name c-condition__name" v-if="showLabel && condition"
class="c-style__condition-desc__name c-condition__name"
> >
{{ condition.configuration.name }} {{ condition.configuration.name }}
</span> </span>
<span v-if="!condition.isDefault" <span
class="c-style__condition-desc__text" v-if="!condition.isDefault"
class="c-style__condition-desc__text"
> >
{{ description }} {{ description }}
</span> </span>
<span v-else <span
class="c-style__condition-desc__text" v-else
class="c-style__condition-desc__text"
> >
Match if no other condition is matched Match if no other condition is matched
</span> </span>

View File

@ -21,12 +21,14 @@
*****************************************************************************/ *****************************************************************************/
<template> <template>
<div v-if="conditionErrors.length" <div
class="c-condition__errors" v-if="conditionErrors.length"
class="c-condition__errors"
> >
<div v-for="(error, index) in conditionErrors" <div
:key="index" v-for="(error, index) in conditionErrors"
class="u-alert u-alert--block u-alert--with-icon" :key="index"
class="u-alert u-alert--block u-alert--with-icon"
>{{ error.message.errorText }} {{ error.additionalInfo }} >{{ error.message.errorText }} {{ error.additionalInfo }}
</div> </div>
</div> </div>

View File

@ -36,18 +36,20 @@
</div> </div>
</section> </section>
<div class="c-cs__test-data-and-conditions-w"> <div class="c-cs__test-data-and-conditions-w">
<TestData class="c-cs__test-data" <TestData
:is-editing="isEditing" class="c-cs__test-data"
:test-data="testData" :is-editing="isEditing"
:telemetry="telemetryObjs" :test-data="testData"
@updateTestData="updateTestData" :telemetry="telemetryObjs"
@updateTestData="updateTestData"
/> />
<ConditionCollection class="c-cs__conditions" <ConditionCollection
:is-editing="isEditing" class="c-cs__conditions"
:test-data="testData" :is-editing="isEditing"
@conditionSetResultUpdated="updateCurrentOutput" :test-data="testData"
@updateDefaultOutput="updateDefaultOutput" @conditionSetResultUpdated="updateCurrentOutput"
@telemetryUpdated="updateTelemetry" @updateDefaultOutput="updateDefaultOutput"
@telemetryUpdated="updateTelemetry"
/> />
</div> </div>
</div> </div>

View File

@ -26,76 +26,89 @@
<span class="c-cdef__label">{{ setRowLabel }}</span> <span class="c-cdef__label">{{ setRowLabel }}</span>
<span class="c-cdef__controls"> <span class="c-cdef__controls">
<span class="c-cdef__control"> <span class="c-cdef__control">
<select ref="telemetrySelect" <select
v-model="criterion.telemetry" ref="telemetrySelect"
@change="updateMetadataOptions" v-model="criterion.telemetry"
@change="updateMetadataOptions"
> >
<option value="">- Select Telemetry -</option> <option value="">- Select Telemetry -</option>
<option value="all">all telemetry</option> <option value="all">all telemetry</option>
<option value="any">any telemetry</option> <option value="any">any telemetry</option>
<option v-for="telemetryOption in telemetry" <option
:key="telemetryOption.identifier.key" v-for="telemetryOption in telemetry"
:value="telemetryOption.identifier" :key="telemetryOption.identifier.key"
:value="telemetryOption.identifier"
> >
{{ telemetryOption.name }} {{ telemetryOption.name }}
</option> </option>
</select> </select>
</span> </span>
<span v-if="criterion.telemetry" <span
class="c-cdef__control" v-if="criterion.telemetry"
class="c-cdef__control"
> >
<select ref="metadataSelect" <select
v-model="criterion.metadata" ref="metadataSelect"
@change="updateOperations" v-model="criterion.metadata"
@change="updateOperations"
> >
<option value="">- Select Field -</option> <option value="">- Select Field -</option>
<option v-for="option in telemetryMetadataOptions" <option
:key="option.key" v-for="option in telemetryMetadataOptions"
:value="option.key" :key="option.key"
:value="option.key"
> >
{{ option.name }} {{ option.name }}
</option> </option>
<option value="dataReceived">any data received</option> <option value="dataReceived">any data received</option>
</select> </select>
</span> </span>
<span v-if="criterion.telemetry && criterion.metadata" <span
class="c-cdef__control" v-if="criterion.telemetry && criterion.metadata"
class="c-cdef__control"
> >
<select v-model="criterion.operation" <select
@change="updateInputVisibilityAndValues" v-model="criterion.operation"
@change="updateInputVisibilityAndValues"
> >
<option value="">- Select Comparison -</option> <option value="">- Select Comparison -</option>
<option v-for="option in filteredOps" <option
:key="option.name" v-for="option in filteredOps"
:value="option.name" :key="option.name"
:value="option.name"
> >
{{ option.text }} {{ option.text }}
</option> </option>
</select> </select>
<template v-if="!enumerations.length"> <template v-if="!enumerations.length">
<span v-for="(item, inputIndex) in inputCount" <span
:key="inputIndex" v-for="(item, inputIndex) in inputCount"
class="c-cdef__control__inputs" :key="inputIndex"
class="c-cdef__control__inputs"
> >
<input v-model="criterion.input[inputIndex]" <input
class="c-cdef__control__input" v-model="criterion.input[inputIndex]"
:type="setInputType" class="c-cdef__control__input"
@change="persist" :type="setInputType"
@change="persist"
> >
<span v-if="inputIndex < inputCount-1">and</span> <span v-if="inputIndex < inputCount-1">and</span>
</span> </span>
<span v-if="criterion.metadata === 'dataReceived'">seconds</span> <span v-if="criterion.metadata === 'dataReceived'">seconds</span>
</template> </template>
<span v-else> <span v-else>
<span v-if="inputCount && criterion.operation" <span
class="c-cdef__control" v-if="inputCount && criterion.operation"
class="c-cdef__control"
> >
<select v-model="criterion.input[0]" <select
@change="persist" v-model="criterion.input[0]"
@change="persist"
> >
<option v-for="option in enumerations" <option
:key="option.string" v-for="option in enumerations"
:value="option.value.toString()" :key="option.string"
:value="option.value.toString()"
> >
{{ option.string }} {{ option.string }}
</option> </option>

View File

@ -21,9 +21,10 @@
*****************************************************************************/ *****************************************************************************/
<template> <template>
<section v-show="isEditing" <section
id="test-data" v-show="isEditing"
:class="{ 'is-expanded': expanded }" id="test-data"
:class="{ 'is-expanded': expanded }"
> >
<div class="c-cs__header c-section__header"> <div class="c-cs__header c-section__header">
<span <span
@ -33,11 +34,13 @@
></span> ></span>
<div class="c-cs__header-label c-section__label">Test Data</div> <div class="c-cs__header-label c-section__label">Test Data</div>
</div> </div>
<div v-if="expanded" <div
class="c-cs__content" v-if="expanded"
class="c-cs__content"
> >
<div class="c-cs__test-data__controls c-cdef__controls" <div
:disabled="!telemetry.length" class="c-cs__test-data__controls c-cdef__controls"
:disabled="!telemetry.length"
> >
<label class="c-toggle-switch"> <label class="c-toggle-switch">
<input <input
@ -50,59 +53,69 @@
</label> </label>
</div> </div>
<div class="c-cs-tests"> <div class="c-cs-tests">
<span v-for="(testInput, tIndex) in testInputs" <span
:key="tIndex" v-for="(testInput, tIndex) in testInputs"
class="c-test-datum c-cs-test" :key="tIndex"
class="c-test-datum c-cs-test"
> >
<span class="c-cs-test__label">Set</span> <span class="c-cs-test__label">Set</span>
<span class="c-cs-test__controls"> <span class="c-cs-test__controls">
<span class="c-cdef__control"> <span class="c-cdef__control">
<select v-model="testInput.telemetry" <select
@change="updateMetadata(testInput)" v-model="testInput.telemetry"
@change="updateMetadata(testInput)"
> >
<option value="">- Select Telemetry -</option> <option value="">- Select Telemetry -</option>
<option v-for="(telemetryOption, index) in telemetry" <option
:key="index" v-for="(telemetryOption, index) in telemetry"
:value="telemetryOption.identifier" :key="index"
:value="telemetryOption.identifier"
> >
{{ telemetryOption.name }} {{ telemetryOption.name }}
</option> </option>
</select> </select>
</span> </span>
<span v-if="testInput.telemetry" <span
class="c-cdef__control" v-if="testInput.telemetry"
class="c-cdef__control"
> >
<select v-model="testInput.metadata" <select
@change="updateTestData" v-model="testInput.metadata"
@change="updateTestData"
> >
<option value="">- Select Field -</option> <option value="">- Select Field -</option>
<option v-for="(option, index) in telemetryMetadataOptions[getId(testInput.telemetry)]" <option
:key="index" v-for="(option, index) in telemetryMetadataOptions[getId(testInput.telemetry)]"
:value="option.key" :key="index"
:value="option.key"
> >
{{ option.name }} {{ option.name }}
</option> </option>
</select> </select>
</span> </span>
<span v-if="testInput.metadata" <span
class="c-cdef__control__inputs" v-if="testInput.metadata"
class="c-cdef__control__inputs"
> >
<input v-model="testInput.value" <input
placeholder="Enter test input" v-model="testInput.value"
type="text" placeholder="Enter test input"
class="c-cdef__control__input" type="text"
@change="updateTestData" class="c-cdef__control__input"
@change="updateTestData"
> >
</span> </span>
</span> </span>
<div class="c-cs-test__buttons"> <div class="c-cs-test__buttons">
<button class="c-click-icon c-test-data__duplicate-button icon-duplicate" <button
title="Duplicate this test datum" class="c-click-icon c-test-data__duplicate-button icon-duplicate"
@click="addTestInput(testInput)" title="Duplicate this test datum"
@click="addTestInput(testInput)"
></button> ></button>
<button class="c-click-icon c-test-data__delete-button icon-trash" <button
title="Delete this test datum" class="c-click-icon c-test-data__delete-button icon-trash"
@click="removeTestInput(tIndex)" title="Delete this test datum"
@click="removeTestInput(tIndex)"
></button> ></button>
</div> </div>
</span> </span>

View File

@ -23,52 +23,60 @@
<template> <template>
<div class="c-style has-local-controls c-toolbar"> <div class="c-style has-local-controls c-toolbar">
<div class="c-style__controls"> <div class="c-style__controls">
<div :class="[ <div
{ 'is-style-invisible': styleItem.style && styleItem.style.isStyleInvisible }, :class="[
{ 'c-style-thumb--mixed': mixedStyles.indexOf('backgroundColor') > -1 } { 'is-style-invisible': styleItem.style && styleItem.style.isStyleInvisible },
]" { 'c-style-thumb--mixed': mixedStyles.indexOf('backgroundColor') > -1 }
:style="[styleItem.style.imageUrl ? { backgroundImage:'url(' + styleItem.style.imageUrl + ')'} : itemStyle ]" ]"
class="c-style-thumb" :style="[styleItem.style.imageUrl ? { backgroundImage:'url(' + styleItem.style.imageUrl + ')'} : itemStyle ]"
class="c-style-thumb"
> >
<span class="c-style-thumb__text" <span
:class="{ 'hide-nice': !hasProperty(styleItem.style.color) }" class="c-style-thumb__text"
:class="{ 'hide-nice': !hasProperty(styleItem.style.color) }"
> >
ABC ABC
</span> </span>
</div> </div>
<toolbar-color-picker v-if="hasProperty(styleItem.style.border)" <toolbar-color-picker
class="c-style__toolbar-button--border-color u-menu-to--center" v-if="hasProperty(styleItem.style.border)"
:options="borderColorOption" class="c-style__toolbar-button--border-color u-menu-to--center"
@change="updateStyleValue" :options="borderColorOption"
@change="updateStyleValue"
/> />
<toolbar-color-picker v-if="hasProperty(styleItem.style.backgroundColor)" <toolbar-color-picker
class="c-style__toolbar-button--background-color u-menu-to--center" v-if="hasProperty(styleItem.style.backgroundColor)"
:options="backgroundColorOption" class="c-style__toolbar-button--background-color u-menu-to--center"
@change="updateStyleValue" :options="backgroundColorOption"
@change="updateStyleValue"
/> />
<toolbar-color-picker v-if="hasProperty(styleItem.style.color)" <toolbar-color-picker
class="c-style__toolbar-button--color u-menu-to--center" v-if="hasProperty(styleItem.style.color)"
:options="colorOption" class="c-style__toolbar-button--color u-menu-to--center"
@change="updateStyleValue" :options="colorOption"
@change="updateStyleValue"
/> />
<toolbar-button v-if="hasProperty(styleItem.style.imageUrl)" <toolbar-button
class="c-style__toolbar-button--image-url" v-if="hasProperty(styleItem.style.imageUrl)"
:options="imageUrlOption" class="c-style__toolbar-button--image-url"
@change="updateStyleValue" :options="imageUrlOption"
@change="updateStyleValue"
/> />
<toolbar-toggle-button v-if="hasProperty(styleItem.style.isStyleInvisible)" <toolbar-toggle-button
class="c-style__toolbar-button--toggle-visible" v-if="hasProperty(styleItem.style.isStyleInvisible)"
:options="isStyleInvisibleOption" class="c-style__toolbar-button--toggle-visible"
@change="updateStyleValue" :options="isStyleInvisibleOption"
@change="updateStyleValue"
/> />
</div> </div>
<!-- Save Styles --> <!-- Save Styles -->
<toolbar-button v-if="canSaveStyle" <toolbar-button
class="c-style__toolbar-button--save c-local-controls--show-on-hover c-icon-button c-icon-button--major" v-if="canSaveStyle"
:options="saveOptions" class="c-style__toolbar-button--save c-local-controls--show-on-hover c-icon-button c-icon-button--major"
@click="saveItemStyle()" :options="saveOptions"
@click="saveItemStyle()"
/> />
</div> </div>
</template> </template>

View File

@ -22,8 +22,9 @@
<template> <template>
<div class="c-inspector__styles c-inspect-styles"> <div class="c-inspector__styles c-inspect-styles">
<div v-if="isStaticAndConditionalStyles" <div
class="c-inspect-styles__mixed-static-and-conditional u-alert u-alert--block u-alert--with-icon" v-if="isStaticAndConditionalStyles"
class="c-inspect-styles__mixed-static-and-conditional u-alert u-alert--block u-alert--with-icon"
> >
Your selection includes one or more items that use Conditional Styling. Applying a static style below will replace any Conditional Styling with the new choice. Your selection includes one or more items that use Conditional Styling. Applying a static style below will replace any Conditional Styling with the new choice.
</div> </div>
@ -37,16 +38,18 @@
@set-font-property="setFontProperty" @set-font-property="setFontProperty"
/> />
<div class="c-inspect-styles__content"> <div class="c-inspect-styles__content">
<div v-if="staticStyle" <div
class="c-inspect-styles__style" v-if="staticStyle"
class="c-inspect-styles__style"
> >
<StyleEditor class="c-inspect-styles__editor" <StyleEditor
:style-item="staticStyle" class="c-inspect-styles__editor"
:is-editing="allowEditing" :style-item="staticStyle"
:mixed-styles="mixedStyles" :is-editing="allowEditing"
:non-specific-font-properties="nonSpecificFontProperties" :mixed-styles="mixedStyles"
@persist="updateStaticStyle" :non-specific-font-properties="nonSpecificFontProperties"
@save-style="saveStyle" @persist="updateStaticStyle"
@save-style="saveStyle"
/> />
</div> </div>
<button <button
@ -64,9 +67,10 @@
Conditional Object Styles Conditional Object Styles
</div> </div>
<div class="c-inspect-styles__content c-inspect-styles__condition-set c-inspect-styles__elem"> <div class="c-inspect-styles__content c-inspect-styles__condition-set c-inspect-styles__elem">
<a v-if="conditionSetDomainObject" <a
class="c-object-label" v-if="conditionSetDomainObject"
@click="navigateOrPreview" class="c-object-label"
@click="navigateOrPreview"
> >
<span class="c-object-label__type-icon icon-conditional"></span> <span class="c-object-label__type-icon icon-conditional"></span>
<span class="c-object-label__name">{{ conditionSetDomainObject.name }}</span> <span class="c-object-label__name">{{ conditionSetDomainObject.name }}</span>
@ -80,15 +84,17 @@
<span class="c-button__label">Change...</span> <span class="c-button__label">Change...</span>
</button> </button>
<button class="c-click-icon icon-x" <button
title="Remove conditional styles" class="c-click-icon icon-x"
@click="removeConditionSet" title="Remove conditional styles"
@click="removeConditionSet"
></button> ></button>
</template> </template>
</div> </div>
<div v-if="isConditionWidget && allowEditing" <div
class="c-inspect-styles__elem c-inspect-styles__output-label-toggle" v-if="isConditionWidget && allowEditing"
class="c-inspect-styles__elem c-inspect-styles__output-label-toggle"
> >
<label class="c-toggle-switch"> <label class="c-toggle-switch">
<input <input
@ -100,8 +106,9 @@
<span class="c-toggle-switch__label">Use Condition Set output as label</span> <span class="c-toggle-switch__label">Use Condition Set output as label</span>
</label> </label>
</div> </div>
<div v-if="isConditionWidget && !allowEditing" <div
class="c-inspect-styles__elem" v-if="isConditionWidget && !allowEditing"
class="c-inspect-styles__elem"
> >
<span class="c-toggle-switch__label">Condition Set output as label: <span class="c-toggle-switch__label">Condition Set output as label:
<span v-if="useConditionSetOutputAsLabel"> Yes</span><span v-else> No</span> <span v-if="useConditionSetOutputAsLabel"> Yes</span><span v-else> No</span>
@ -114,27 +121,32 @@
@set-font-property="setFontProperty" @set-font-property="setFontProperty"
/> />
<div v-if="conditionsLoaded" <div
class="c-inspect-styles__conditions" v-if="conditionsLoaded"
class="c-inspect-styles__conditions"
> >
<div v-for="(conditionStyle, index) in conditionalStyles" <div
:key="index" v-for="(conditionStyle, index) in conditionalStyles"
class="c-inspect-styles__condition" :key="index"
:class="{'is-current': conditionStyle.conditionId === selectedConditionId}" class="c-inspect-styles__condition"
@click="applySelectedConditionStyle(conditionStyle.conditionId)" :class="{'is-current': conditionStyle.conditionId === selectedConditionId}"
@click="applySelectedConditionStyle(conditionStyle.conditionId)"
> >
<condition-error :show-label="true" <condition-error
:condition="getCondition(conditionStyle.conditionId)" :show-label="true"
:condition="getCondition(conditionStyle.conditionId)"
/> />
<condition-description :show-label="true" <condition-description
:condition="getCondition(conditionStyle.conditionId)" :show-label="true"
:condition="getCondition(conditionStyle.conditionId)"
/> />
<StyleEditor class="c-inspect-styles__editor" <StyleEditor
:style-item="conditionStyle" class="c-inspect-styles__editor"
:non-specific-font-properties="nonSpecificFontProperties" :style-item="conditionStyle"
:is-editing="allowEditing" :non-specific-font-properties="nonSpecificFontProperties"
@persist="updateConditionalStyle" :is-editing="allowEditing"
@save-style="saveStyle" @persist="updateConditionalStyle"
@save-style="saveStyle"
/> />
</div> </div>
</div> </div>
@ -325,16 +337,7 @@ export default {
return item && (item.type === type); return item && (item.type === type);
}, },
canPersistObject(item) { canPersistObject(item) {
// for now the only way to tell if an object can be persisted is if it is creatable. return this.openmct.objects.isPersistable(item.identifier);
let creatable = false;
if (item) {
const type = this.openmct.types.get(item.type);
if (type && type.definition) {
creatable = (type.definition.creatable !== undefined && (type.definition.creatable === 'true' || type.definition.creatable === true));
}
}
return creatable;
}, },
hasConditionalStyle(domainObject, layoutItem) { hasConditionalStyle(domainObject, layoutItem) {
const id = layoutItem ? layoutItem.id : undefined; const id = layoutItem ? layoutItem.id : undefined;

View File

@ -21,12 +21,13 @@
*****************************************************************************/ *****************************************************************************/
<template> <template>
<component :is="urlDefined ? 'a' : 'span'" <component
class="c-condition-widget u-style-receiver js-style-receiver" :is="urlDefined ? 'a' : 'span'"
:href="url" class="c-condition-widget u-style-receiver js-style-receiver"
:href="url"
> >
<div class="c-condition-widget__label"> <div class="c-condition-widget__label">
{{ internalDomainObject.conditionalLabel || internalDomainObject.label }} {{ label }}
</div> </div>
</component> </component>
</template> </template>
@ -38,10 +39,16 @@ export default {
inject: ['openmct', 'domainObject'], inject: ['openmct', 'domainObject'],
data: function () { data: function () {
return { return {
internalDomainObject: this.domainObject internalDomainObject: this.domainObject,
conditionalLabel: ''
}; };
}, },
computed: { computed: {
label() {
return this.conditionalLabel.length
? this.conditionalLabel
: this.internalDomainObject.label;
},
urlDefined() { urlDefined() {
return this.internalDomainObject.url && this.internalDomainObject.url.length > 0; return this.internalDomainObject.url && this.internalDomainObject.url.length > 0;
}, },
@ -51,13 +58,31 @@ export default {
}, },
mounted() { mounted() {
this.unlisten = this.openmct.objects.observe(this.internalDomainObject, '*', this.updateInternalDomainObject); this.unlisten = this.openmct.objects.observe(this.internalDomainObject, '*', this.updateInternalDomainObject);
this.unobserve = this.openmct.styleManager.observe(this.internalDomainObject.identifier, this.observeStyleManagerChanges.bind(this));
}, },
beforeDestroy() { beforeDestroy() {
if (this.unlisten) { if (this.unlisten) {
this.unlisten(); this.unlisten();
} }
if (this.unobserve) {
this.openmct.styleManager.delete(this.internalDomainObject.identifier);
this.unobserve();
}
}, },
methods: { methods: {
observeStyleManagerChanges(styleManager) {
if (styleManager) {
this.styleManager = styleManager;
this.styleManager.on('updateStyles', this.updateConditionLabel);
} else {
this.styleManager.off('updateStyles', this.updateConditionLabel);
}
},
updateConditionLabel(styleObj = {}) {
this.conditionalLabel = styleObj.output || '';
},
updateInternalDomainObject(domainObject) { updateInternalDomainObject(domainObject) {
this.internalDomainObject = domainObject; this.internalDomainObject = domainObject;
} }

View File

@ -166,7 +166,7 @@ export default {
}, },
computed: { computed: {
gridSize() { gridSize() {
return this.domainObject.configuration.layoutGrid; return this.domainObject.configuration.layoutGrid.map(Number);
}, },
layoutItems() { layoutItems() {
return this.domainObject.configuration.items; return this.domainObject.configuration.items;

View File

@ -37,8 +37,9 @@
:data-font="item.font" :data-font="item.font"
@contextmenu.prevent="showContextMenu" @contextmenu.prevent="showContextMenu"
> >
<div class="is-status__indicator" <div
:title="`This item is ${status}`" class="is-status__indicator"
:title="`This item is ${status}`"
></div> ></div>
<div <div
v-if="showLabel" v-if="showLabel"
@ -221,20 +222,18 @@ export default {
.then(this.setObject); .then(this.setObject);
} }
this.openmct.time.on("bounds", this.refreshData);
this.status = this.openmct.status.get(this.item.identifier); this.status = this.openmct.status.get(this.item.identifier);
this.removeStatusListener = this.openmct.status.observe(this.item.identifier, this.setStatus); this.removeStatusListener = this.openmct.status.observe(this.item.identifier, this.setStatus);
}, },
beforeDestroy() { beforeDestroy() {
this.removeSubscription();
this.removeStatusListener(); this.removeStatusListener();
if (this.removeSelectable) { if (this.removeSelectable) {
this.removeSelectable(); this.removeSelectable();
} }
this.openmct.time.off("bounds", this.refreshData); this.telemetryCollection.off('add', this.setLatestValues);
this.telemetryCollection.off('clear', this.refreshData);
if (this.mutablePromise) { if (this.mutablePromise) {
this.mutablePromise.then(() => { this.mutablePromise.then(() => {
@ -252,34 +251,9 @@ export default {
return `At ${timeFormatter.format(this.datum)} ${this.domainObject.name} had a value of ${this.telemetryValue}${unit}`; return `At ${timeFormatter.format(this.datum)} ${this.domainObject.name} had a value of ${this.telemetryValue}${unit}`;
}, },
requestHistoricalData() { setLatestValues(data) {
let bounds = this.openmct.time.bounds(); this.latestDatum = data[data.length - 1];
let options = { this.updateView();
start: bounds.start,
end: bounds.end,
size: 1,
strategy: 'latest'
};
this.openmct.telemetry.request(this.domainObject, options)
.then(data => {
if (data.length > 0) {
this.latestDatum = data[data.length - 1];
this.updateView();
}
});
},
subscribeToObject() {
this.subscription = this.openmct.telemetry.subscribe(this.domainObject, function (datum) {
const key = this.openmct.time.timeSystem().key;
const datumTimeStamp = datum[key];
if (this.openmct.time.clock() !== undefined
|| (datumTimeStamp
&& (this.openmct.time.bounds().end >= datumTimeStamp))
) {
this.latestDatum = datum;
this.updateView();
}
}.bind(this));
}, },
updateView() { updateView() {
if (!this.updatingView) { if (!this.updatingView) {
@ -290,17 +264,10 @@ export default {
}); });
} }
}, },
removeSubscription() {
if (this.subscription) {
this.subscription();
this.subscription = undefined;
}
},
refreshData(bounds, isTick) { refreshData(bounds, isTick) {
if (!isTick) { if (!isTick) {
this.latestDatum = undefined; this.latestDatum = undefined;
this.updateView(); this.updateView();
this.requestHistoricalData(this.domainObject);
} }
}, },
setObject(domainObject) { setObject(domainObject) {
@ -314,8 +281,13 @@ export default {
const valueMetadata = this.metadata.value(this.item.value); const valueMetadata = this.metadata.value(this.item.value);
this.customStringformatter = this.openmct.telemetry.customStringFormatter(valueMetadata, this.item.format); this.customStringformatter = this.openmct.telemetry.customStringFormatter(valueMetadata, this.item.format);
this.requestHistoricalData(); this.telemetryCollection = this.openmct.telemetry.requestCollection(this.domainObject, {
this.subscribeToObject(); size: 1,
strategy: 'latest'
});
this.telemetryCollection.on('add', this.setLatestValues);
this.telemetryCollection.on('clear', this.refreshData);
this.telemetryCollection.load();
this.currentObjectPath = this.objectPath.slice(); this.currentObjectPath = this.objectPath.slice();
this.currentObjectPath.unshift(this.domainObject); this.currentObjectPath.unshift(this.domainObject);

View File

@ -97,13 +97,16 @@ export default class DuplicateAction {
validate(currentParent) { validate(currentParent) {
return (data) => { return (data) => {
const parentCandidatePath = data.value; const parentCandidate = data.value[0];
const parentCandidate = parentCandidatePath[0];
let currentParentKeystring = this.openmct.objects.makeKeyString(currentParent.identifier); let currentParentKeystring = this.openmct.objects.makeKeyString(currentParent.identifier);
let parentCandidateKeystring = this.openmct.objects.makeKeyString(parentCandidate.identifier); let parentCandidateKeystring = this.openmct.objects.makeKeyString(parentCandidate.identifier);
let objectKeystring = this.openmct.objects.makeKeyString(this.object.identifier); let objectKeystring = this.openmct.objects.makeKeyString(this.object.identifier);
if (!this.openmct.objects.isPersistable(parentCandidate.identifier)) {
return false;
}
if (!parentCandidateKeystring || !currentParentKeystring) { if (!parentCandidateKeystring || !currentParentKeystring) {
return false; return false;
} }
@ -122,13 +125,14 @@ export default class DuplicateAction {
} }
appliesTo(objectPath) { appliesTo(objectPath) {
let parent = objectPath[1]; const parent = objectPath[1];
let parentType = parent && this.openmct.types.get(parent.type); const parentType = parent && this.openmct.types.get(parent.type);
let child = objectPath[0]; const child = objectPath[0];
let childType = child && this.openmct.types.get(child.type); const childType = child && this.openmct.types.get(child.type);
let locked = child.locked ? child.locked : parent && parent.locked; const locked = child.locked ? child.locked : parent && parent.locked;
const isPersistable = this.openmct.objects.isPersistable(child.identifier);
if (locked) { if (locked || !isPersistable) {
return false; return false;
} }

View File

@ -52,7 +52,7 @@ export default class ExportAsJSONAction {
appliesTo(objectPath) { appliesTo(objectPath) {
let domainObject = objectPath[0]; let domainObject = objectPath[0];
return this._isCreatable(domainObject); return this._isCreatableAndPersistable(domainObject);
} }
/** /**
* *
@ -80,10 +80,11 @@ export default class ExportAsJSONAction {
* @param {object} domainObject * @param {object} domainObject
* @returns {boolean} * @returns {boolean}
*/ */
_isCreatable(domainObject) { _isCreatableAndPersistable(domainObject) {
const type = this.openmct.types.get(domainObject.type); const type = this.openmct.types.get(domainObject.type);
const isPersistable = this.openmct.objects.isPersistable(domainObject.identifier);
return type && type.definition.creatable; return type && type.definition.creatable && isPersistable;
} }
/** /**
* @private * @private
@ -170,7 +171,7 @@ export default class ExportAsJSONAction {
.then((children) => { .then((children) => {
children.forEach((child, index) => { children.forEach((child, index) => {
// Only export if object is creatable // Only export if object is creatable
if (this._isCreatable(child)) { if (this._isCreatableAndPersistable(child)) {
// Prevents infinite export of self-contained objs // Prevents infinite export of self-contained objs
if (!Object.prototype.hasOwnProperty.call(this.tree, this._getId(child))) { if (!Object.prototype.hasOwnProperty.call(this.tree, this._getId(child))) {
// If object is a link to something absent from // If object is a link to something absent from

View File

@ -27,6 +27,10 @@ describe('Export as JSON plugin', () => {
it('ExportAsJSONAction applies to folder', () => { it('ExportAsJSONAction applies to folder', () => {
domainObject = { domainObject = {
identifier: {
key: 'export-testing',
namespace: ''
},
composition: [], composition: [],
location: 'mine', location: 'mine',
modified: 1640115501237, modified: 1640115501237,
@ -40,6 +44,10 @@ describe('Export as JSON plugin', () => {
it('ExportAsJSONAction applies to telemetry.plot.overlay', () => { it('ExportAsJSONAction applies to telemetry.plot.overlay', () => {
domainObject = { domainObject = {
identifier: {
key: 'export-testing',
namespace: ''
},
composition: [], composition: [],
location: 'mine', location: 'mine',
modified: 1640115501237, modified: 1640115501237,
@ -53,6 +61,10 @@ describe('Export as JSON plugin', () => {
it('ExportAsJSONAction applies to telemetry.plot.stacked', () => { it('ExportAsJSONAction applies to telemetry.plot.stacked', () => {
domainObject = { domainObject = {
identifier: {
key: 'export-testing',
namespace: ''
},
composition: [], composition: [],
location: 'mine', location: 'mine',
modified: 1640115501237, modified: 1640115501237,
@ -64,16 +76,24 @@ describe('Export as JSON plugin', () => {
expect(exportAsJSONAction.appliesTo([domainObject])).toEqual(true); expect(exportAsJSONAction.appliesTo([domainObject])).toEqual(true);
}); });
it('ExportAsJSONAction applies does not applies to non-creatable objects', () => { it('ExportAsJSONAction does not applie to non-persistable objects', () => {
domainObject = { domainObject = {
identifier: {
key: 'export-testing',
namespace: ''
},
composition: [], composition: [],
location: 'mine', location: 'mine',
modified: 1640115501237, modified: 1640115501237,
name: 'Non Editable Folder', name: 'Non Editable Folder',
persisted: 1640115501237, persisted: 1640115501237,
type: 'noneditable.folder' type: 'folder'
}; };
spyOn(openmct.objects, 'getProvider').and.callFake(() => {
return { get: () => domainObject };
});
expect(exportAsJSONAction.appliesTo([domainObject])).toEqual(false); expect(exportAsJSONAction.appliesTo([domainObject])).toEqual(false);
}); });

View File

@ -57,7 +57,7 @@
/> />
<drop-hint <drop-hint
:key="i" :key="'hint-' + i"
class="c-fl-frame__drop-hint" class="c-fl-frame__drop-hint"
:index="i" :index="i"
:allow-drop="allowDrop" :allow-drop="allowDrop"
@ -66,7 +66,7 @@
<resize-handle <resize-handle
v-if="(i !== frames.length - 1)" v-if="(i !== frames.length - 1)"
:key="i" :key="'handle-' + i"
:index="i" :index="i"
:orientation="rowsLayout ? 'horizontal' : 'vertical'" :orientation="rowsLayout ? 'horizontal' : 'vertical'"
:is-editing="isEditing" :is-editing="isEditing"

Some files were not shown because too many files have changed in this diff Show More