make habpanel work with non-root context path

hubsif · hubsif · commit 1dcd0e9e6b5c · 2022-04-05T20:26:18.000+02:00
Signed-off-by: Hubert Nusser &lt;hubsif@gmx.de&gt;
diff --git a/bundles/org.openhab.ui.habpanel/web/app/services/icon.service.js b/bundles/org.openhab.ui.habpanel/web/app/services/icon.service.js
@@ -25,7 +25,7 @@
 
         function getIconUrl(iconset, icon, state) {
             if (iconset === 'custom-icon') {
-                return '/icon/' + icon + '?format=svg' + ((state) ? '&state=' + state : '');
+                return '../icon/' + icon + '?format=svg' + ((state) ? '&state=' + state : '');
             } else if (iconset === 'custom-url') {
                 return icon;
             }
@@ -34,7 +34,7 @@
             if (set.type === 'builtin') {
                 return 'assets/icons/' + set.id + '/' + icon + '.svg';
             } else {
-                return '/icon/' + icon + '?format=svg' + ((state) ? '&state=' + state : '');
+                return '../icon/' + icon + '?format=svg' + ((state) ? '&state=' + state : '');
             }
         }
 
diff --git a/bundles/org.openhab.ui.habpanel/web/app/services/oh2storage.service.js b/bundles/org.openhab.ui.habpanel/web/app/services/oh2storage.service.js
@@ -31,7 +31,7 @@
 
                 $http({
                     method: 'GET',
-                    url: '/rest/services/' + SERVICE_NAME + '/config',
+                    url: '../rest/services/' + SERVICE_NAME + '/config',
                     headers: headers
                 }).then(function (resp) {
                     console.log('openHAB 2 service configuration loaded');
@@ -77,7 +77,7 @@
             OH3StorageService.getAccessToken().then(function (accessToken) {
                 $http({
                     method: 'PUT',
-                    url: '/rest/services/' + SERVICE_NAME + '/config',
+                    url: '../rest/services/' + SERVICE_NAME + '/config',
                     data: OH2ServiceConfiguration,
                     headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer ' + accessToken }
                 }).then (function (resp) {
diff --git a/bundles/org.openhab.ui.habpanel/web/app/services/oh3storage.service.js b/bundles/org.openhab.ui.habpanel/web/app/services/oh3storage.service.js
@@ -26,7 +26,7 @@
             } else {
                 $http({
                     method: 'POST',
-                    url: '/rest/auth/token',
+                    url: '../rest/auth/token',
                     data: 'grant_type=refresh_token&client_id=' + window.location.origin +
                         '&redirect_uri=' + window.location.origin + '&refresh_token=' + refreshToken,
                     headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
@@ -49,7 +49,7 @@
             if (!refreshToken) {
                 $rootScope.lockEditing = true;
             }
-            $http.get('/rest/ui/components/habpanel:panelconfig').then(function (data) {
+            $http.get('../rest/ui/components/habpanel:panelconfig').then(function (data) {
                 console.log('Panel configurations loaded');
                 $rootScope.panelsRegistry = transformUIComponentsToPanelRegistry(data.data);
                 deferred.resolve($rootScope.panelsRegistry);
@@ -77,11 +77,11 @@
                     headers['Authorization'] = 'Bearer ' + accessToken
                 }
 
-                $http.get('/rest/ui/components/habpanel:panelconfig/' + getCurrentPanelConfig()).then(function (data) {
+                $http.get('../rest/ui/components/habpanel:panelconfig/' + getCurrentPanelConfig()).then(function (data) {
                     // update
                     $http({
                         method: 'PUT',
-                        url: '/rest/ui/components/habpanel:panelconfig/' + getCurrentPanelConfig(),
+                        url: '../rest/ui/components/habpanel:panelconfig/' + getCurrentPanelConfig(),
                         data: transformPanelConfigurationToUIComponent(getCurrentPanelConfig(), panelConfiguration),
                         headers: headers
                     }).then (function (resp) {
@@ -95,7 +95,7 @@
                     // assume the error is 404?
                     $http({
                         method: 'POST',
-                        url: '/rest/ui/components/habpanel:panelconfig',
+                        url: '../rest/ui/components/habpanel:panelconfig',
                         data: transformPanelConfigurationToUIComponent(getCurrentPanelConfig(), panelConfiguration),
                         headers: headers
                     }).then (function (resp) {
@@ -127,7 +127,7 @@
 
                 $http({
                     method: 'DELETE',
-                    url: '/rest/ui/components/habpanel:panelconfig/' + id,
+                    url: '../rest/ui/components/habpanel:panelconfig/' + id,
                     headers: headers
                 }).then (function (resp) {
                     console.log('Panel configuration deleted');
diff --git a/bundles/org.openhab.ui.habpanel/web/app/services/openhab.service.js b/bundles/org.openhab.ui.habpanel/web/app/services/openhab.service.js
@@ -32,7 +32,7 @@
                 $timeout($rootScope.$emit('openhab-update'));
             }
 
-            $http.get('/rest/items')
+            $http.get('../rest/items')
             .then(function (data) {
                 if (angular.isArray(data.data)) {
                     console.log("Loaded " + data.data.length + " openHAB items");
@@ -71,7 +71,7 @@
         function sendCmd(item, cmd) {
             $http({
                 method : 'POST',
-                url    : '/rest/items/' + item,
+                url    : '../rest/items/' + item,
                 data   : cmd,
                 headers: { 'Content-Type': 'text/plain' }
             }).then(function (data) {
@@ -92,7 +92,7 @@
             if (locale) {
                 deferred.resolve(locale);
             } else {
-                $http.get('/rest/')
+                $http.get('../rest/')
                 .then(function (response) {
                     if (!response.data.locale) {
                         if (navigator && navigator.languages) {
@@ -145,7 +145,7 @@
         function sendVoice(text) {
             $http({
                 method : 'POST',
-                url    : '/rest/voice/interpreters',
+                url    : '../rest/voice/interpreters',
                 data   : text,
                 headers: { 'Content-Type': 'text/plain' }
             }).then(function (data) {
@@ -161,7 +161,7 @@
         
         function registerEventSource() {
             if (typeof(EventSource) !== "undefined") {
-                var source = new EventSource('/rest/events?topics=openhab/items/*/statechanged,openhab/items/*/*/statechanged,openhab/webaudio/playurl');
+                var source = new EventSource('../rest/events?topics=openhab/items/*/statechanged,openhab/items/*/*/statechanged,openhab/webaudio/playurl');
                 liveUpdatesEnabled = true;
 
                 source.onmessage = function (event) {
@@ -192,7 +192,7 @@
                                         }
                                     } else {
                                         // fetch the new transformed state
-                                        $http.get('/rest/items/' + item.name).then(function (response) {
+                                        $http.get('../rest/items/' + item.name).then(function (response) {
                                             if (response.data && response.data.transformedState) {
                                                 item.transformedState = response.data.transformedState;
                                                 $rootScope.$emit('openhab-update', item);
diff --git a/bundles/org.openhab.ui.habpanel/web/app/settings/settings.widgets.gallery.controller.js b/bundles/org.openhab.ui.habpanel/web/app/settings/settings.widgets.gallery.controller.js
@@ -20,7 +20,7 @@
             vm.progressMax = 1;
             vm.progressCurrent = 1;
 
-            $http.get('/rest/habpanel/gallery/community/widgets')
+            $http.get('../rest/habpanel/gallery/community/widgets')
             .then(function (resp) {
                 vm.busy = false;
                 if (resp.data) {
@@ -52,7 +52,7 @@
             vm.progressMax = 1;
             vm.progressCurrent = 1;
 
-            $http.get('/rest/habpanel/gallery/community/widgets/' + id)
+            $http.get('../rest/habpanel/gallery/community/widgets/' + id)
             .then(function (resp) {
                 vm.galleryItemDetails = resp.data;
                 if (vm.galleryItemDetails.authorAvatarUrl)
diff --git a/bundles/org.openhab.ui.habpanel/web/app/widgets/chart/chart.widget.js b/bundles/org.openhab.ui.habpanel/web/app/widgets/chart/chart.widget.js
@@ -117,7 +117,7 @@
 
                 vm.rawdata = [];
                 for (var i = 0; i < vm.widget.series.length; i++) {
-                    vm.rawdata[i] = $http.get('/rest/persistence/items/' + vm.widget.series[i].item + "?starttime=" + startDate.toISOString() + (vm.widget.service ? '&serviceId=' + vm.widget.service : ''));
+                    vm.rawdata[i] = $http.get('../rest/persistence/items/' + vm.widget.series[i].item + "?starttime=" + startDate.toISOString() + (vm.widget.service ? '&serviceId=' + vm.widget.service : ''));
                 }
 
                 $q.all(vm.rawdata).then(function (values) {
diff --git a/bundles/org.openhab.ui.habpanel/web/app/widgets/timeline/timeline.widget.js b/bundles/org.openhab.ui.habpanel/web/app/widgets/timeline/timeline.widget.js
@@ -218,7 +218,7 @@
 
             vm.rawdata = [];
             for (var i = 0; i < vm.widget.series.length; i++) {
-                vm.rawdata[i] = $http.get('/rest/persistence/items/' + vm.widget.series[i].item + "?boundary=true&starttime=" + startDate.toISOString() + (vm.widget.service ? '&serviceId=' + vm.widget.service : ''));
+                vm.rawdata[i] = $http.get('../rest/persistence/items/' + vm.widget.series[i].item + "?boundary=true&starttime=" + startDate.toISOString() + (vm.widget.service ? '&serviceId=' + vm.widget.service : ''));
             }
 
 

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`
`26`	`26`	`function getIconUrl(iconset, icon, state) {`
`27`	`27`	`if (iconset === 'custom-icon') {`
`28`		`- return '/icon/' + icon + '?format=svg' + ((state) ? '&state=' + state : '');`
	`28`	`+ return '../icon/' + icon + '?format=svg' + ((state) ? '&state=' + state : '');`
`29`	`29`	`} else if (iconset === 'custom-url') {`
`30`	`30`	`return icon;`
`31`	`31`	`}`
`@@ -34,7 +34,7 @@`
`34`	`34`	`if (set.type === 'builtin') {`
`35`	`35`	`return 'assets/icons/' + set.id + '/' + icon + '.svg';`
`36`	`36`	`} else {`
`37`		`- return '/icon/' + icon + '?format=svg' + ((state) ? '&state=' + state : '');`
	`37`	`+ return '../icon/' + icon + '?format=svg' + ((state) ? '&state=' + state : '');`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@`
`117`	`117`
`118`	`118`	`vm.rawdata = [];`
`119`	`119`	`for (var i = 0; i < vm.widget.series.length; i++) {`
`120`		`- vm.rawdata[i] = $http.get('/rest/persistence/items/' + vm.widget.series[i].item + "?starttime=" + startDate.toISOString() + (vm.widget.service ? '&serviceId=' + vm.widget.service : ''));`
	`120`	`+ vm.rawdata[i] = $http.get('../rest/persistence/items/' + vm.widget.series[i].item + "?starttime=" + startDate.toISOString() + (vm.widget.service ? '&serviceId=' + vm.widget.service : ''));`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`$q.all(vm.rawdata).then(function (values) {`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@`
`218`	`218`
`219`	`219`	`vm.rawdata = [];`
`220`	`220`	`for (var i = 0; i < vm.widget.series.length; i++) {`
`221`		`- vm.rawdata[i] = $http.get('/rest/persistence/items/' + vm.widget.series[i].item + "?boundary=true&starttime=" + startDate.toISOString() + (vm.widget.service ? '&serviceId=' + vm.widget.service : ''));`
	`221`	`+ vm.rawdata[i] = $http.get('../rest/persistence/items/' + vm.widget.series[i].item + "?boundary=true&starttime=" + startDate.toISOString() + (vm.widget.service ? '&serviceId=' + vm.widget.service : ''));`
`222`	`222`	`}`
`223`	`223`
`224`	`224`