Skip to content
This repository was archived by the owner on Jun 6, 2024. It is now read-only.

Commit 51070aa

Browse files
yiyioneabuccts
andauthored
[webportal] Fix sdk request timeout (#4756)
* update yarn.lock * update sdk version and handle error message * fix error message * update * Update src/webportal/src/app/home/home/conn.js Co-authored-by: Yifan Xiong <yifan.xiong@microsoft.com> Co-authored-by: Yifan Xiong <yifan.xiong@microsoft.com>
1 parent a484c06 commit 51070aa

File tree

4 files changed

+34
-14
lines changed

4 files changed

+34
-14
lines changed

src/webportal/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"dependencies": {
3434
"@hapi/joi": "~15.1.0",
3535
"@loadable/component": "^5.10.3",
36-
"@microsoft/openpai-js-sdk": "^0.1.1",
36+
"@microsoft/openpai-js-sdk": "^0.1.3",
3737
"@svgr/webpack": "^4.3.3",
3838
"@webcomponents/custom-elements": "^1.2.1",
3939
"admin-lte": "~2.4.2",

src/webportal/src/app/home/home/conn.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const wrapper = async func => {
2929
if (err.data.code === 'UnauthorizedUserError') {
3030
throw new UnauthorizedError(err.data.message);
3131
} else {
32-
throw new Error(err.data.message);
32+
throw new Error(err.data.message || err.message);
3333
}
3434
}
3535
};

src/webportal/src/app/job/job-view/fabric/JobList/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ export default function JobList() {
143143
})
144144
.then(setAllJobs)
145145
.catch(err => {
146-
throw Error(err.data.message);
146+
throw Error(err.data.message || err.message);
147147
});
148148
}, []);
149149

src/webportal/yarn.lock

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1527,16 +1527,16 @@
15271527
resolved "https://registry.yarnpkg.com/@microsoft/load-themed-styles/-/load-themed-styles-1.9.7.tgz#4f28d7097802317d2a491888ba65fac617c56dd4"
15281528
integrity sha512-8Iua4vPmffV2tT1nR/E55GSbUkYRPD9xFfa6v8zJ89EiiDrlyO2OGuXAtC6/nWxLTeVRA3GhtQuU2SApD2sQAA==
15291529

1530-
"@microsoft/openpai-js-sdk@^0.1.1":
1531-
version "0.1.1"
1532-
resolved "https://registry.yarnpkg.com/@microsoft/openpai-js-sdk/-/openpai-js-sdk-0.1.1.tgz#e1b9f61d86672d122c65db7bc4ff747fb4ab8403"
1533-
integrity sha512-0VJOrAk08D+GTsug6xIggPimvsrxDf8lt7/ce5Gy+WuFbioqQ3BPr7DAGoJ56lbRL4vfbylqYoTgaN/SFL3pdw==
1530+
"@microsoft/openpai-js-sdk@^0.1.3":
1531+
version "0.1.3"
1532+
resolved "https://registry.yarnpkg.com/@microsoft/openpai-js-sdk/-/openpai-js-sdk-0.1.3.tgz#9aefccbce928c248e28c03a7a2dc6b8f70877183"
1533+
integrity sha512-++9KUVqPFTO/IP9Fnm973oM9KcTCaqCSg/Ug9WluXVL2CmUK/fg+H4Icn/8DHGql7SFeOJxW1Le49SJN+pxcZQ==
15341534
dependencies:
15351535
"@apidevtools/swagger-parser" "^9.0.1"
15361536
"@azure/storage-blob" "^12.1.0"
15371537
argparse "^1.0.10"
15381538
axios "^0.19.2"
1539-
fs-extra "^8.1.0"
1539+
fs-extra "^9.0.1"
15401540
js-yaml "^3.13.1"
15411541
lodash "^4.17.15"
15421542
module-alias "^2.2.2"
@@ -2337,6 +2337,11 @@ asynckit@^0.4.0:
23372337
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
23382338
integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
23392339

2340+
at-least-node@^1.0.0:
2341+
version "1.0.0"
2342+
resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
2343+
integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
2344+
23402345
atob@^2.1.1:
23412346
version "2.1.2"
23422347
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -5271,14 +5276,15 @@ from2@^2.1.0:
52715276
inherits "^2.0.1"
52725277
readable-stream "^2.0.0"
52735278

5274-
fs-extra@^8.1.0:
5275-
version "8.1.0"
5276-
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
5277-
integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
5279+
fs-extra@^9.0.1:
5280+
version "9.0.1"
5281+
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
5282+
integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==
52785283
dependencies:
5284+
at-least-node "^1.0.0"
52795285
graceful-fs "^4.2.0"
5280-
jsonfile "^4.0.0"
5281-
universalify "^0.1.0"
5286+
jsonfile "^6.0.1"
5287+
universalify "^1.0.0"
52825288

52835289
fs-extra@~5.0.0:
52845290
version "5.0.0"
@@ -6507,6 +6513,15 @@ jsonfile@^4.0.0:
65076513
optionalDependencies:
65086514
graceful-fs "^4.1.6"
65096515

6516+
jsonfile@^6.0.1:
6517+
version "6.0.1"
6518+
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.0.1.tgz#98966cba214378c8c84b82e085907b40bf614179"
6519+
integrity sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==
6520+
dependencies:
6521+
universalify "^1.0.0"
6522+
optionalDependencies:
6523+
graceful-fs "^4.1.6"
6524+
65106525
jsonify@~0.0.0:
65116526
version "0.0.0"
65126527
resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
@@ -10314,6 +10329,11 @@ universalify@^0.1.0, universalify@^0.1.2:
1031410329
resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
1031510330
integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
1031610331

10332+
universalify@^1.0.0:
10333+
version "1.0.0"
10334+
resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
10335+
integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
10336+
1031710337
unpipe@1.0.0, unpipe@~1.0.0:
1031810338
version "1.0.0"
1031910339
resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"

0 commit comments

Comments
 (0)