From 0a5cba917bfaa48e199e366f2588a443a896a8a7 Mon Sep 17 00:00:00 2001 From: Rincy Mathew Date: Tue, 29 Nov 2022 10:59:38 -0600 Subject: [PATCH 1/7] Plugins are now loading in the toolbar --- .../src/lib/wvr-wysiwyg/wvr-wysiwyg.component.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/wvr-elements/src/lib/wvr-wysiwyg/wvr-wysiwyg.component.ts b/projects/wvr-elements/src/lib/wvr-wysiwyg/wvr-wysiwyg.component.ts index 047645a0..cb1bde01 100644 --- a/projects/wvr-elements/src/lib/wvr-wysiwyg/wvr-wysiwyg.component.ts +++ b/projects/wvr-elements/src/lib/wvr-wysiwyg/wvr-wysiwyg.component.ts @@ -49,10 +49,10 @@ export class WvrWysiwygComponent extends WvrBaseComponent implements OnInit, OnD base_url: 'tinymce', skin: 'oxide', plugins: [ - 'advlist autolink lists link image charmap print', - 'preview anchor searchreplace visualblocks code', - 'fullscreen insertdatetime media table paste', - 'help wordcount print preview save' + "advlist", "autolink", "lists", "link", "image", "charmap", + "preview", "anchor", "searchreplace", "visualblocks", "code", + "fullscreen", "insertdatetime", "media", "table", + "help", "wordcount", "preview", "save" ], toolbar: 'undo redo | formatselect | bold italic forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table pagebreak | charmap codesample image | removeformat | help | cancel save', menu: (wvrEditor as any).default, From 810d23749b1b2e87571777d55f86f519c8997774 Mon Sep 17 00:00:00 2001 From: Rincy Mathew Date: Tue, 29 Nov 2022 15:13:34 -0600 Subject: [PATCH 2/7] Modified the packages to use version 12.2.16 or greater --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index ea3cf25b..3a7e9cb0 100644 --- a/package.json +++ b/package.json @@ -61,9 +61,9 @@ "test:ci": "npm run test:audit && npm run test:coverage" }, "dependencies": { - "@angular/animations": "12.2.16", - "@angular/elements": "12.2.16", - "@angular/platform-browser-dynamic": "12.2.16", + "@angular/animations": "^12.2.16", + "@angular/elements": "^12.2.16", + "@angular/platform-browser-dynamic": "^12.2.16", "@ng-bootstrap/ng-bootstrap": "10.0.0", "@ngrx/effects": "12.5.1", "@ngrx/entity": "12.5.1", @@ -76,7 +76,7 @@ "tinymce": "6.2.0" }, "devDependencies": { - "@angular-devkit/build-angular": "12.2.18", + "@angular-devkit/build-angular": "^12.2.16", "@angular-eslint/eslint-plugin": "14.1.2", "@angular-eslint/eslint-plugin-template": "14.1.2", "@angular/cli": "12.2.16", From 7cb55da2e7156f81e294b770b9936d494dcb5cdd Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Tue, 29 Nov 2022 16:11:52 -0600 Subject: [PATCH 3/7] Resolve npm dependency problems, enforcing version 12.2.16 of angular. The `@angular-devkit/build-angular` should have a matching version to the rest of angular but instead has `12.2.18`. The follow error happens: ``` npm ERR! While resolving: weaver-components@2.0.4 npm ERR! Found: @angular/compiler@12.2.17 npm ERR! node_modules/@angular/compiler npm ERR! peer @angular/compiler@"12.2.17" from @angular/compiler-cli@12.2.17 npm ERR! node_modules/@angular/compiler-cli npm ERR! peer @angular/compiler-cli@"^12.0.0" from @angular-devkit/build-angular@12.2.18 npm ERR! node_modules/@angular-devkit/build-angular npm ERR! dev @angular-devkit/build-angular@"12.2.18" from the root project npm ERR! npm ERR! Could not resolve dependency: npm ERR! @angular/platform-browser-dynamic@"12.2.16" from the root project npm ERR! npm ERR! Conflicting peer dependency: @angular/compiler@12.2.16 npm ERR! node_modules/@angular/compiler npm ERR! peer @angular/compiler@"12.2.16" from @angular/platform-browser-dynamic@12.2.16 npm ERR! node_modules/@angular/platform-browser-dynamic npm ERR! @angular/platform-browser-dynamic@"12.2.16" from the root project ``` This is first fixed by addressing the described dependency problem. Explicitly add the missing dependencies to "dependencies". This is completed when the `npm install` works. Then run `npm list --depth=1000` (consider teeing this: `npm list --depth=1000 | tee dependencies.txt`). Review the logs and find all occurrence of the packages added above. Use this to determine what branch the problem dependency is included under. Then move the dependencies to `devDependencies` or leave them at `dependencies`. By following this process I discovered that `@angular/platform-browser-dynamic`, `@ng-bootstrap/ng-bootstrap`, and `@angular-devkit/core` are responsible for some of the dependency problems. The `"@angular/elements"` depends on `@angular/forms`. This allowed me to determine where the dependencies should be added. The "overrides" is avoided as much as possible but I was able to confirm that `@angular/core` must still be specified under "overrides". There is a module that attempts to bring in a version 9 of angular which subsequently results in numerous security problems. Running `npm audit` is also recommended after making these changes and security problems should be addressed or issues should be created regarding this. --- package.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index ea3cf25b..e2b5f6c0 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,11 @@ }, "dependencies": { "@angular/animations": "12.2.16", + "@angular/common": "12.2.16", + "@angular/compiler": "12.2.16", "@angular/elements": "12.2.16", + "@angular/forms": "12.2.16", + "@angular/localize": "12.2.16", "@angular/platform-browser-dynamic": "12.2.16", "@ng-bootstrap/ng-bootstrap": "10.0.0", "@ngrx/effects": "12.5.1", @@ -76,10 +80,11 @@ "tinymce": "6.2.0" }, "devDependencies": { - "@angular-devkit/build-angular": "12.2.18", + "@angular-devkit/build-angular": "12.2.16", "@angular-eslint/eslint-plugin": "14.1.2", "@angular-eslint/eslint-plugin-template": "14.1.2", "@angular/cli": "12.2.16", + "@angular/compiler-cli": "12.2.16", "@compodoc/compodoc": "1.1.19", "@lhci/cli": "0.9.0", "@ngrx/schematics": "12.5.1", From 8b848b33f02d5bbb5406386906de90c8687d5556 Mon Sep 17 00:00:00 2001 From: Rincy Mathew Date: Thu, 1 Dec 2022 14:06:34 -0600 Subject: [PATCH 4/7] Simplified the package json dependencies. `@angular/compiler` is added to the `overrides` because `codelyzer` version 6.0.2 is bringing in `@angular/compiler` 9.0.0 . --- package.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package.json b/package.json index e2b5f6c0..dab0b671 100644 --- a/package.json +++ b/package.json @@ -62,8 +62,6 @@ }, "dependencies": { "@angular/animations": "12.2.16", - "@angular/common": "12.2.16", - "@angular/compiler": "12.2.16", "@angular/elements": "12.2.16", "@angular/forms": "12.2.16", "@angular/localize": "12.2.16", @@ -84,7 +82,6 @@ "@angular-eslint/eslint-plugin": "14.1.2", "@angular-eslint/eslint-plugin-template": "14.1.2", "@angular/cli": "12.2.16", - "@angular/compiler-cli": "12.2.16", "@compodoc/compodoc": "1.1.19", "@lhci/cli": "0.9.0", "@ngrx/schematics": "12.5.1", @@ -129,6 +126,7 @@ "zone.js": "0.11.8" }, "overrides": { + "@angular/compiler": "12.2.16", "@angular/core": "12.2.16", "@types/eslint": "6.8.1", "chokidar": "3.5.3", From bd3b45c5caf46a175a1d328a660713e3c224802a Mon Sep 17 00:00:00 2001 From: Rincy Mathew Date: Fri, 9 Dec 2022 10:42:27 -0600 Subject: [PATCH 5/7] Added the print and paste plugin back --- .../src/lib/wvr-wysiwyg/wvr-wysiwyg.component.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/wvr-elements/src/lib/wvr-wysiwyg/wvr-wysiwyg.component.ts b/projects/wvr-elements/src/lib/wvr-wysiwyg/wvr-wysiwyg.component.ts index cb1bde01..15c11a16 100644 --- a/projects/wvr-elements/src/lib/wvr-wysiwyg/wvr-wysiwyg.component.ts +++ b/projects/wvr-elements/src/lib/wvr-wysiwyg/wvr-wysiwyg.component.ts @@ -49,15 +49,15 @@ export class WvrWysiwygComponent extends WvrBaseComponent implements OnInit, OnD base_url: 'tinymce', skin: 'oxide', plugins: [ - "advlist", "autolink", "lists", "link", "image", "charmap", + "advlist", "autolink", "lists", "link", "image", "charmap", "print", "preview", "anchor", "searchreplace", "visualblocks", "code", - "fullscreen", "insertdatetime", "media", "table", - "help", "wordcount", "preview", "save" + "fullscreen", "insertdatetime", "media", "table", "paste", + "help", "wordcount", "print", "preview", "save" ], - toolbar: 'undo redo | formatselect | bold italic forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table pagebreak | charmap codesample image | removeformat | help | cancel save', + toolbar: 'undo redo | print formatselect | bold italic forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table pagebreak | charmap codesample image | removeformat | help | cancel save', menu: (wvrEditor as any).default, height: '300', - /* TODO: Issue #316. */ + save_oncancelcallback: $event => { this.onReset($event); }, From 635526f78b77f786b75add75dc45c111e08d3538 Mon Sep 17 00:00:00 2001 From: Rincy Mathew Date: Mon, 12 Dec 2022 14:17:35 -0600 Subject: [PATCH 6/7] Version to 2.0.5-rc.1 --- package.json | 2 +- projects/wvr-elements/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index dab0b671..11f5acf0 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "type": "git", "url": "git+https://github.com/TAMULib/weaver-components.git" }, - "version": "2.0.4", + "version": "2.0.5-rc.1", "private": false, "license": "MIT", "engines": { diff --git a/projects/wvr-elements/package.json b/projects/wvr-elements/package.json index 31ca09f4..25ab7e2b 100644 --- a/projects/wvr-elements/package.json +++ b/projects/wvr-elements/package.json @@ -1,6 +1,6 @@ { "name": "@wvr/elements", - "version": "2.0.4", + "version": "2.0.5-rc.1", "description": "Collection of angular components for Weaver's Custom Web Component UI", "author": "Texas A&M University Libraries", "private": false, From d738fa94769298845034bc1946fd780c7a179e50 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Tue, 13 Dec 2022 10:47:43 -0600 Subject: [PATCH 7/7] Update the change log. --- CHANGELOG.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 23c84be6..2e1f10e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,25 @@ # Changelog +## [2.0.5] - 12-02-22 +### Resolves + +- WYSIWYG save is not working. (#516) + +## [2.0.4] - 11-15-22 +### Resolves + +- Remove the "upgrade" button from the tinymce editor. (#512) +- Locked the node version to 16. (#515) + +## [2.0.3] - 10-12-22 +### Resolves + +- Fix bad error handling and reporting wvr-button. (#504) +- Footer Becoming Sticky when it should not. (#503) +- Remove ng-inline-svg as it is no longer maintained. (#502) +- Redesign dependency list, reducing dependencies where possible. (#507) +- Fixed tabs to no longer need a wrapping div to display content. (#505) + ## [2.0.2] - 09-19-22 ### Resolves