Skip to content

Commit cd734c8

Browse files
authored
Merge pull request #53 from DeskproApps/SC-167944/update-apps-to-use-global-proxy-service-new
SC-167944 SC-180495 update apps to use global proxy service new
2 parents c3b94fc + da2d986 commit cd734c8

16 files changed

Lines changed: 689 additions & 690 deletions

manifest.json

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"isSingleInstall": false,
99
"hasDevMode": true,
1010
"serveUrl": "https://apps-cdn.deskpro-service.com/__name__/__version__",
11+
"secrets": "/r+RcJoWFqSX9UdSTGP2ViJRiZPqnjCPCpYxeoMHDD2Wr6eNNStVr5XtlWEqxVabmS2cyv0UWSalw5TjIV2foqVzw76o57fm1kuak+lyky3ezVuWrDEi4I808WzI70ZGFtO9JfB1HpMkvJ6/3rT2/W7KE2QnR2ZYoaJ0svQ+LRnUvcj2rfigf5S3ZMUQ/aX+0O8chQJmEdLBJ1Tkzksc05OlVXBnugUZ799SYBocM4O9zhp8GQnmWZlxNi0t4vuxs9FCR/7WxwgPcUhu3fi7ngzalc9pzzXhJ2IsawjUC82IypHzIi+JErOTACVXqBcsdDvAYmWw7qt1FLoUwLzFYWyBgYl8scH6dDSY6mndJIguZQH5+k2ZqFtpSsBgMHsvX0mjsnbqt+d0qdIs4/P9RK4AvLXvssJ5xZBu1ipPxfmC9rAN9yeKwlOMr4GlJry5iMKoPxc3CM24J8algEWikkcMuM6da1mh9NTdB0yL2cmYovE2xWLrqwS81BpfZ4rsC+OUOr8RI6hS61/pltXBqrm2ia7R7krw4WD4beEsJFxM+mhwj6VD7KWCDDfIjR72cnaZ/AEbD80pjJITLrgysm1E1BxFYyF+yScd0Oh/dLUTHlQXM8DLQ2dc4YiAdHU+O30MbNs7KbWSq5oqyDP4AjseUTOSvuPczr0EhcpnkgyK95pj/WsUK6S4dBIuFun7b8+L1Avk3jYCcx7hahm4blYZ1OpogunXCHhOVByjIJniVrVWbgLTc3xplj7rxMkdo5ybCFqAzf5LA++Lvf6zv2XJiyHK6B3Q9OwxA4/XfNcQzTCw3FvepqFMugSprLYw2OB5fdNGZyOyyhXY0wfQ56rrIBDZA6uxqNeLM7mm2ZN4ELkWF1LNCFYcHmkEUT6r+Cd+8HQP/WnBfXug2kwpzB5Y/DEr1cId1mQK9MariIN4+YzyaYI6YQ4SAgWG/BN6Cg7U3zwY/ojMuNw7NKwHRX+fm7t7ax9AS6joOOYaViyh3RE4hpVmzXnaVM3cJLujbJ36oAlR6c0M/H1TppF9KlWLXA1xcjlP8PuMMowwffBvXg4Hnkw1ERfbRNBrLXYRx1lWXOZdzs0/VwaYoJomVuvfMtVZgpjoPLaWySIBT2I=",
1112
"targets": [
1213
{
1314
"target": "ticket_sidebar",
@@ -24,18 +25,27 @@
2425
}
2526
],
2627
"settings": {
28+
"use_deskpro_saas": {
29+
"title": "Use Deskpro SAAS",
30+
"type": "boolean",
31+
"isRequired": false,
32+
"isBackendOnly": false,
33+
"order": 5
34+
},
2735
"client_id": {
2836
"title": "Client ID",
2937
"type": "string",
30-
"isRequired": true,
38+
"isRequired": false,
3139
"isBackendOnly": false,
40+
"condition": "settings.use_deskpro_saas != true",
3241
"order": 10
3342
},
3443
"client_secret": {
3544
"title": "Client secret",
3645
"type": "string",
37-
"isRequired": true,
46+
"isRequired": false,
3847
"isBackendOnly": true,
48+
"condition": "settings.use_deskpro_saas != true",
3949
"order": 20
4050
},
4151
"dont_add_comment_when_linking_issue": {
@@ -58,6 +68,7 @@
5868
"title": "Callback URL",
5969
"type": "app_embedded",
6070
"options": { "entrypoint": "#/admin/callback" },
71+
"condition": "settings.use_deskpro_saas != true",
6172
"isRequired": false,
6273
"isBackendOnly": false,
6374
"order": 50

package.json

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"bumpManifestVer": "node ./bin/bumpManifestVer.js"
1616
},
1717
"dependencies": {
18-
"@deskpro/app-sdk": "^5.1.1",
19-
"@deskpro/deskpro-ui": "^8.2.0",
18+
"@deskpro/app-sdk": "^6.0.3",
19+
"@deskpro/deskpro-ui": "^8.2.1",
2020
"@fortawesome/free-solid-svg-icons": "^6.7.2",
2121
"@fortawesome/react-fontawesome": "^0.2.2",
2222
"@heroicons/react": "1.0.6",
@@ -32,28 +32,26 @@
3232
"react-dom": "^17.0.2",
3333
"react-error-boundary": "^3.1.4",
3434
"react-resize-observer": "^1.1.1",
35-
"react-router-dom": "^6.28.1",
35+
"react-router-dom": "^6.29.0",
3636
"react-time-ago": "^7.3.3",
3737
"showdown": "^2.1.0",
3838
"simplebar": "^6.3.0",
39-
"styled-components": "^6.1.14",
39+
"styled-components": "^6.1.15",
4040
"tippy.js": "^6.3.7",
4141
"ts-pattern": "^3.3.5",
4242
"use-debounce": "^8.0.4",
43-
"uuid": "^9.0.1",
4443
"yup": "^0.32.11"
4544
},
4645
"devDependencies": {
4746
"@testing-library/jest-dom": "^5.17.0",
4847
"@testing-library/react": "^12.1.5",
4948
"@types/jest": "^29.5.14",
50-
"@types/lodash": "^4.17.14",
49+
"@types/lodash": "^4.17.15",
5150
"@types/react": "^18.3.18",
5251
"@types/react-copy-to-clipboard": "^5.0.7",
5352
"@types/react-dom": "^18.3.5",
5453
"@types/showdown": "^2.0.6",
5554
"@types/testing-library__jest-dom": "^5.14.9",
56-
"@types/uuid": "^8.3.4",
5755
"@typescript-eslint/eslint-plugin": "5.6.0",
5856
"@typescript-eslint/parser": "5.6.0",
5957
"@vitejs/plugin-react": "^1.3.2",
@@ -67,7 +65,7 @@
6765
"rollup-plugin-copy": "3.4.0",
6866
"slugify": "^1.6.6",
6967
"ts-jest": "^29.2.5",
70-
"typescript": "^5.7.2",
71-
"vite": "^6.0.11"
68+
"typescript": "^5.7.3",
69+
"vite": "^6.1.0"
7270
}
7371
}

0 commit comments

Comments
 (0)