Commit Graph

7713 Commits

Author SHA1 Message Date
dependabot[bot]
0bafdad605
chore(deps-dev): bump webpack from 5.81.0 to 5.84.0 (#6692)
Bumps [webpack](https://github.com/webpack/webpack) from 5.81.0 to 5.84.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.81.0...v5.84.0)

---
updated-dependencies:
- dependency-name: webpack
  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>
2023-05-24 17:45:50 +00:00
dependabot[bot]
4d375ec765
chore(deps-dev): bump webpack-cli from 5.0.2 to 5.1.1 (#6653)
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 5.0.2 to 5.1.1.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/webpack-cli@5.0.2...webpack-cli@5.1.1)

---
updated-dependencies:
- dependency-name: webpack-cli
  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>
2023-05-24 10:35:28 -07:00
dependabot[bot]
47b44cebba
chore(deps-dev): bump jasmine-core from 4.5.0 to 5.0.0 (#6666)
Bumps [jasmine-core](https://github.com/jasmine/jasmine) from 4.5.0 to 5.0.0.
- [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.5.0...v5.0.0)

---
updated-dependencies:
- dependency-name: jasmine-core
  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>
2023-05-24 16:22:50 +00:00
Scott Bell
fbb37ac382
Merge branch 'master' into 6557-annotations-image-tagging-prototype 2023-05-24 11:36:12 +02:00
Jesse Mazzella
fea68381a7
fix: unlisten to annotation event beforeDestroy (#6690)
* fix: unlisten to annotation event beforeDestroy

* refactor: `npm run lint:fix`

---------

Co-authored-by: Scott Bell <scott@traclabs.com>
2023-05-24 09:29:19 +00:00
dependabot[bot]
356c90ca45
chore(deps-dev): bump @babel/eslint-parser from 7.19.1 to 7.21.8 (#6648)
Bumps [@babel/eslint-parser](https://github.com/babel/babel/tree/HEAD/eslint/babel-eslint-parser) from 7.19.1 to 7.21.8.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.21.8/eslint/babel-eslint-parser)

---
updated-dependencies:
- dependency-name: "@babel/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>
2023-05-23 18:21:33 +00:00
Scott Bell
71c1fdc298
Merge branch 'master' into 6557-annotations-image-tagging-prototype 2023-05-22 17:10:20 +02:00
dependabot[bot]
7e12a45960
chore(deps-dev): bump vue-eslint-parser from 9.2.1 to 9.3.0 (#6671)
Bumps [vue-eslint-parser](https://github.com/vuejs/vue-eslint-parser) from 9.2.1 to 9.3.0.
- [Release notes](https://github.com/vuejs/vue-eslint-parser/releases)
- [Commits](https://github.com/vuejs/vue-eslint-parser/compare/v9.2.1...v9.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>
2023-05-19 14:34:42 -07:00
Scott Bell
efb55ecafc resolve conflicts 2023-05-19 16:16:34 +02:00
Scott Bell
609dcb0460 refactor: format with prettier 2023-05-19 16:10:03 +02:00
Scott Bell
3bff7f9f32 pause when annotating 2023-05-19 16:08:41 +02:00
Scott Bell
09df2f64f2 fix rectangle blurriness on retina screens 2023-05-19 16:08:41 +02:00
Scott Bell
6b2adcb7b7 add basic tagging test 2023-05-19 16:08:41 +02:00
Scott Bell
2f310a3432 fix drag test 2023-05-19 16:08:41 +02:00
Scott Bell
02855d2c9c get rid of force and use upper div 2023-05-19 16:08:41 +02:00
Scott Bell
6dd6c87ceb fix tests 2023-05-19 16:08:41 +02:00
Scott Bell
8945f27eed git rid of carat 2023-05-19 16:08:41 +02:00
Scott Bell
5ddf8a8ff4 move flatbush to dev 2023-05-19 16:08:41 +02:00
Scott Bell
3a77efb010 separate annotation guard 2023-05-19 16:08:41 +02:00
Scott Bell
bd356653db remove some debug code 2023-05-19 16:08:41 +02:00
Scott Bell
d1e8b3835d generate keystring on mount 2023-05-19 16:08:41 +02:00
Scott Bell
051a0adbb7 added notes on how search selection will work 2023-05-19 16:08:41 +02:00
Scott Bell
87d695a454 remove kdbush and generalize annotation selection 2023-05-19 16:08:41 +02:00
Scott Bell
85482902be works on load 2023-05-19 16:08:41 +02:00
Scott Bell
8015aceaa7 added indicator 2023-05-19 16:08:41 +02:00
Scott Bell
a381673f21 add icon for annotations 2023-05-19 16:08:41 +02:00
Scott Bell
7a808622ae need to add image indicator 2023-05-19 16:08:41 +02:00
Scott Bell
5fb78a9604 rough prototype done 2023-05-19 16:08:41 +02:00
Scott Bell
629e884c9b annotation selection much better 2023-05-19 16:08:41 +02:00
Scott Bell
a8949d39bf still need to clean up selection code 2023-05-19 16:08:41 +02:00
Scott Bell
91ad130f8b switch plots to use flatbush 2023-05-19 16:08:41 +02:00
Scott Bell
72d8779736 clicking on annotations finds them 2023-05-19 16:08:41 +02:00
Scott Bell
e34093eda7 remove flickering 2023-05-19 16:08:41 +02:00
Scott Bell
501fdf902b can draw annotations, now need to select existing annotations 2023-05-19 16:08:41 +02:00
Scott Bell
cb32dd94f8 loading annotations from db 2023-05-19 16:08:41 +02:00
Scott Bell
2d868cdb58 rudimentary annotation 2023-05-19 16:08:41 +02:00
Scott Bell
424a2b30ac get math right for drawing the rectangle 2023-05-19 16:08:41 +02:00
Scott Bell
693b8804ba dragging 2023-05-19 16:08:41 +02:00
Scott Bell
9018dcd319 fix pointer events 2023-05-19 16:08:40 +02:00
Scott Bell
0aaa7998f5 add canvas click events 2023-05-19 16:08:40 +02:00
Scott Bell
d426ae86b8 separate into canvas 2023-05-19 16:08:40 +02:00
Scott Bell
002d8d11e8 drawing a bunch of garbage on the image 2023-05-19 16:08:40 +02:00
Jesse Mazzella
804dbf0cab
chore: add prettier (3/3): update .git-blame-ignore-revs file (#6684)
Update `.git-blame-ignore-revs` file
2023-05-18 22:08:13 +00:00
Jesse Mazzella
caa7bc6fae
chore: add prettier (2/3): apply formatting, re-enable lint ci step (#6682)
* style: apply prettier formatting

* fix: re-enable lint ci check
2023-05-18 21:54:46 +00:00
Jesse Mazzella
172e0b23fd
chore: add prettier (1/3): add packages, configurations, fix lint issues (#6382)
* fix: remove redundant eslint rules

* chore: bump `prettier` to v2.8.7

* docs: vue files to use html comments for licenses

- Prettier's Vue parser freaks out if it sees a *.js style comment in a *.vue file.

* docs: more licenses for vue files

* fix: don't ignore *.vue files

* fix: use defaults for tabWidth and printWidth

* simplify .prettierignore

* enforce a printWidth of 100

* fix: use `eslint-plugin-prettier`, remove conflicting rules

* test: fix gauge tests (for real)

* test: fix notebook test selectors

* test: fix restrictedNotebook test selectors

* test: remove useless assignment

* lint: __dirname as global

* lint: revert eslint config + whitespace changes, commit new config

* style: remove unnecessary string concat of literals

* test: fix missed gauge test

* fix: use new eslint rules

* feat: add blank `.git-blame-ignore-revs` file

* docs: update to mention Prettier and format.

* Revert "test: fix gauge tests (for real)"

This reverts commit 6afad450389edc2f16ff0d00c9524621a7ba53bc.

* Revert "test: fix notebook test selectors"

This reverts commit 17fe1cbbff02e9298f041b5ea0fea5494fe54d94.

* Revert "test: fix restrictedNotebook test selectors"

This reverts commit 97e0ede826b7dd61c5443845443d806a56f3f305.

* Revert "test: fix missed gauge test"

This reverts commit e2398fc38ca94beff2066cc253173412ad47f8b9.

* test: fix gauge tests (no formatting)

* test: update notebook e2e selectors (no formatting)

* test: update restrictedNotebook e2e selectors (no formatting)

* fix: temporarily disable lint check
2023-05-18 21:29:20 +00:00
Rukmini Bose (Ruki)
5df7971438
[Plots] Fix wrapping of Y Axis when height is small (#6264)
* New branch to fix y-axis icons

* test: fix locator

---------

Co-authored-by: Jesse Mazzella <jesse.d.mazzella@nasa.gov>
2023-05-17 18:32:05 +00:00
dependabot[bot]
b39d5e8bcc
chore(deps-dev): bump eslint-plugin-vue from 9.11.0 to 9.13.0 (#6674)
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 9.11.0 to 9.13.0.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v9.11.0...v9.13.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-vue
  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>
2023-05-16 15:45:50 -07:00
Jesse Mazzella
c5188397e4
chore: bump version to 2.2.4-SNAPSHOT (#6673)
chore: bump version to 2.2.4-SNAPSHOT
2023-05-16 13:50:58 -07:00
Charles Hacskaylo
225fa22c72
Fix Locator in Move and Link dialogs (#6663)
Closes #6654
- Corrected form builder configurations.
2023-05-16 09:50:42 -07:00
Jamie V
2c3b6fa540
[ExportAsJson] Multiple Aliases in Export and Conditional Styles Fixes (#6602)
Fixes issues that prevent import and export from being completed successfully. Specifically:

* if multiple aliases are detected, the first is created as a new object and and added to it's parent's composition, any subsequent aliases of the same object will not be recreated, but the originally created one will be added to the current parent's composition, creating an alias.

* Also, there are cases were conditionSetIdentifiers are stored in an object keyed by an item id in the configuration.objectstyles object, this fix will handle these as well.

* Replaces an errant `return` statement with a `continue` statement to prevent early exit from a recursive function.

---------

Co-authored-by: Andrew Henry <akhenry@gmail.com>
2023-05-11 17:11:09 +00:00