Compare commits

...
Author SHA1 Message Date
Don Walizer 9ccaa12ac9 Add ability to specify ID for skill reporting event 2023-12-15 13:35:08 -05:00
Dima May 594d61503d Merge pull request #233 from NationalSecurityAgency/dependabot/npm_and_yarn/skills-client-js/axios-1.6.0
Bump axios from 0.27.2 to 1.6.0 in /skills-client-js
2023-12-14 08:09:56 -05:00
Don Walizer e11f7ec67f Modify version 2023-12-13 12:41:41 -05:00
Don Walizer f2f6104e7c Update axios, axios-mock-adapter, add ignore pattern 2023-12-13 10:10:36 -05:00
Don Walizer 53bd0136a5 Merge pull request #230 from NationalSecurityAgency/dependabot/npm_and_yarn/skills-client-integration/skills-int-client-js/axios-1.6.0
Bump axios from 0.23.0 to 1.6.0 in /skills-client-integration/skills-int-client-js
2023-12-08 15:21:40 -05:00
Don Walizer 6fbc73c259 Merge pull request #232 from NationalSecurityAgency/dependabot/npm_and_yarn/skills-client-integration/skills-int-client-react18/axios-1.6.0
Bump axios from 0.23.0 to 1.6.0 in /skills-client-integration/skills-int-client-react18
2023-12-08 15:16:51 -05:00
Don Walizer 67c5d77730 Merge pull request #231 from NationalSecurityAgency/dependabot/npm_and_yarn/skills-client-integration/skills-int-client-react17/axios-1.6.0
Bump axios from 0.23.0 to 1.6.0 in /skills-client-integration/skills-int-client-react17
2023-12-08 15:16:21 -05:00
Don Walizer a1d17002fc Merge pull request #229 from NationalSecurityAgency/dependabot/npm_and_yarn/skills-client-integration/skills-int-client-vue/axios-1.6.0
Bump axios from 0.23.0 to 1.6.0 in /skills-client-integration/skills-int-client-vue
2023-12-08 15:16:15 -05:00
Don Walizer f236d29053 Merge pull request #228 from NationalSecurityAgency/dependabot/npm_and_yarn/skills-client-vue/axios-1.6.0
Bump axios from 0.23.0 to 1.6.0 in /skills-client-vue
2023-12-08 15:15:45 -05:00
Don Walizer 752aff86e6 Merge pull request #227 from NationalSecurityAgency/dependabot/npm_and_yarn/skills-client-integration/skills-int-client-react/axios-1.6.0
Bump axios from 0.23.0 to 1.6.0 in /skills-client-integration/skills-int-client-react
2023-12-08 15:15:31 -05:00
Don Walizer 109f1a900f Merge pull request #226 from NationalSecurityAgency/dependabot/npm_and_yarn/skills-client-react/axios-1.6.0
Bump axios from 0.23.0 to 1.6.0 in /skills-client-react
2023-12-08 15:15:24 -05:00
Don Walizer 7c6a7293f7 Merge pull request #225 from NationalSecurityAgency/dependabot/npm_and_yarn/skills-client-integration/skills-int-client-ng/axios-1.6.0
Bump axios from 0.23.0 to 1.6.0 in /skills-client-integration/skills-int-client-ng
2023-12-08 15:15:04 -05:00
Dima May 8a9c9ffe56 Merge pull request #234 from NationalSecurityAgency/update-spring
Update spring
2023-12-08 14:56:59 -05:00
dependabot[bot] 39f8779394 Bump axios from 0.27.2 to 1.6.0 in /skills-client-js
Bumps [axios](https://github.com/axios/axios) from 0.27.2 to 1.6.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.27.2...v1.6.0)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
2023-11-11 05:50:05 +00:00
dependabot[bot] 67a9d5fe90 Bump axios in /skills-client-integration/skills-int-client-react18
Bumps [axios](https://github.com/axios/axios) from 0.23.0 to 1.6.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.23.0...v1.6.0)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
2023-11-10 21:38:30 +00:00
dependabot[bot] b4efd29492 Bump axios in /skills-client-integration/skills-int-client-react17
Bumps [axios](https://github.com/axios/axios) from 0.23.0 to 1.6.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.23.0...v1.6.0)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
2023-11-10 21:32:15 +00:00
dependabot[bot] abcb97d564 Bump axios in /skills-client-integration/skills-int-client-js
Bumps [axios](https://github.com/axios/axios) from 0.23.0 to 1.6.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.23.0...v1.6.0)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
2023-11-10 21:29:00 +00:00
dependabot[bot] fc3af550de Bump axios in /skills-client-integration/skills-int-client-vue
Bumps [axios](https://github.com/axios/axios) from 0.23.0 to 1.6.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.23.0...v1.6.0)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
2023-11-10 21:29:00 +00:00
dependabot[bot] bcb42fc81d Bump axios from 0.23.0 to 1.6.0 in /skills-client-vue
Bumps [axios](https://github.com/axios/axios) from 0.23.0 to 1.6.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.23.0...v1.6.0)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
2023-11-10 21:28:51 +00:00
dependabot[bot] 4b05314e3b Bump axios in /skills-client-integration/skills-int-client-react
Bumps [axios](https://github.com/axios/axios) from 0.23.0 to 1.6.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.23.0...v1.6.0)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
2023-11-10 21:28:51 +00:00
dependabot[bot] 712dcbcde8 Bump axios from 0.23.0 to 1.6.0 in /skills-client-react
Bumps [axios](https://github.com/axios/axios) from 0.23.0 to 1.6.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.23.0...v1.6.0)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
2023-11-10 21:28:50 +00:00
dependabot[bot] e0f5c18b61 Bump axios in /skills-client-integration/skills-int-client-ng
Bumps [axios](https://github.com/axios/axios) from 0.23.0 to 1.6.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.23.0...v1.6.0)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
2023-11-10 21:28:50 +00:00
10 changed files with 40 additions and 21 deletions

No files matched your search

@@ -33,7 +33,11 @@ limitations under the License.
SkillsConfiguration.configure(result.data);
});
SkillsReporter.addSuccessHandler((result) => {
SkillsReporter.addSuccessHandler((result) => {
document.querySelector('#global-event-result-container-js').innerHTML = JSON.stringify(result, null, 2);
});
SkillsReporter.addErrorHandler((result) => {
document.querySelector('#global-event-result-container-js').innerHTML = JSON.stringify(result, null, 2);
});
@@ -41,9 +45,15 @@ limitations under the License.
SkillsReporter.reportSkill(skillId)
.then((response) => {
document.querySelector('#report-result-container').innerHTML = JSON.stringify(response, null, 2);
});
}).catch((err) => {
document.querySelector('#report-result-container').innerHTML = JSON.stringify(err, null, 2);
});
};
document.querySelector('#exampleDirectiveClickEvent').addEventListener('click', () => { reportSkill('IronMan'); });
document.querySelector('#exampleDirectiveClickEvent').addEventListener('click', () => {
var skillId = document.getElementById('skillId').value;
reportSkill(skillId);
});
const toggleAllEvents = () => {
const notifyIfSkillNotApplied = document.querySelector('#all-events-check').checked
@@ -95,7 +105,7 @@ limitations under the License.
<pre id="global-event-result-container-js" data-cy="globalEventResult"></pre>
</div>
<div>
<h5 class="text-info"><strong>Skills Directive - Click Event</strong></h5>
<h5 class="text-info"><strong>Report Any Skill</strong></h5>
<div class="card card-body bg-light">
<pre class="m-0 sample-code">
<code class="javascript">SkillsReporter.reportSkill(this.skill)
@@ -105,12 +115,18 @@ limitations under the License.
</div>
<div class="card card-body mt-3">
<div class="text-primary">Skill Id:</div>
<div class="code-example">
<input class="form-control" id="skillId" type="text" value="IronMan" />
</div>
<div>
<div id="exampleDirectiveClickEvent">
<button
data-cy="exampleDirectiveClickEventButton"
class="btn btn-outline-primary">
Report Skill
</button>
<button
data-cy="exampleDirectiveClickEventButton"
class="btn btn-outline-primary">
Report Skill
</button>
</div>
</div>
<hr>
<div class="text-primary">Result:</div>
@@ -17,7 +17,7 @@
"author": "SkillTree Team",
"dependencies": {
"@skilltree/skills-client-js": "3.5.0",
"axios": "0.23.0",
"axios": "1.6.0",
"bootstrap": "4.5.2",
"jquery": "3.5.1",
"js-beautify": "1.13.0"
@@ -31,7 +31,7 @@
"@popperjs/core": "2.11.8",
"@skilltree/skills-client-ng": "3.6.0",
"@types/js-beautify": "1.11.0",
"axios": "0.23.0",
"axios": "1.6.0",
"bootstrap": "4.5.3",
"highlight.js": "11.3.1",
"jquery": "3.5.1",
@@ -6,7 +6,7 @@
"homepage": "/react/",
"dependencies": {
"@skilltree/skills-client-react": "3.5.0",
"axios": "0.23.0",
"axios": "1.6.0",
"bootstrap": "4.5.3",
"core-js": "3.6.5",
"highlightjs": "9.16.2",
@@ -6,7 +6,7 @@
"homepage": "/react17/",
"dependencies": {
"@skilltree/skills-client-react": "3.5.0",
"axios": "0.23.0",
"axios": "1.6.0",
"bootstrap": "5.1.3",
"core-js": "3.6.5",
"highlightjs": "9.16.2",
@@ -6,7 +6,7 @@
"homepage": "/react18/",
"dependencies": {
"@skilltree/skills-client-react": "3.5.0",
"axios": "0.23.0",
"axios": "1.6.0",
"bootstrap": "5.1.3",
"core-js": "3.6.5",
"js-beautify": "1.14.0",
@@ -15,7 +15,7 @@
},
"dependencies": {
"@skilltree/skills-client-vue": "3.5.0",
"axios": "0.23.0",
"axios": "1.6.0",
"bootstrap": "4.5.3",
"bootstrap-vue": "2.17.3",
"core-js": "3.2.1",
+7 -4
View File
@@ -6,7 +6,10 @@
"main": "dist/skills-client-js.umd.min.js",
"module": "dist/skills-client-js.esm.min.js",
"jest": {
"testEnvironment": "./test/custom-test-env.js"
"testEnvironment": "./test/custom-test-env.js",
"transformIgnorePatterns": [
"/node_modules/(?!(axios)/)"
]
},
"scripts": {
"clean": "rm -rf dist",
@@ -33,7 +36,7 @@
"@rollup/plugin-commonjs": "15.1.0",
"@rollup/plugin-node-resolve": "9.0.0",
"@rollup/plugin-replace": "2.3.3",
"axios-mock-adapter": "1.18.2",
"axios-mock-adapter": "1.22.0",
"babel-jest": "26.5.2",
"eslint": "7.11.0",
"eslint-config-airbnb-base": "14.2.0",
@@ -49,7 +52,7 @@
"xhr-mock": "2.5.1"
},
"dependencies": {
"axios": "0.27.2",
"axios": "1.6.2",
"js-logger": "1.6.1",
"postmate": "1.5.2",
"sockjs-client": "1.6.1",
@@ -70,4 +73,4 @@
"bugs": {
"url": "https://github.com/NationalSecurityAgency/skills-client/issues"
}
}
}
+1 -1
View File
@@ -57,7 +57,7 @@
},
"dependencies": {
"@skilltree/skills-client-js": "3.5.0",
"axios": "0.23.0",
"axios": "1.6.0",
"axios-auth-refresh": "3.2.1"
},
"eslintConfig": {
+1 -1
View File
@@ -53,7 +53,7 @@
},
"dependencies": {
"@skilltree/skills-client-js": "3.5.0",
"axios": "0.23.0",
"axios": "1.6.0",
"axios-auth-refresh": "3.2.1",
"lodash": "4.17.21",
"postmate": "1.5.2"