From 43687d31bb2a0aca4e987a09be05abafce261c17 Mon Sep 17 00:00:00 2001 From: Yaroslav Date: Tue, 21 Apr 2020 19:16:35 +0300 Subject: [PATCH] DP-201 (Changing DF_RESOURCE_WRAPPER breaks the UI) - Use resources_wrapper from the environment endpoint - Fix default resources string wrapper hardcode --- app/admin_components/adf-services/dreamfactory-services.js | 6 ++++-- dist/index.html | 2 +- dist/scripts/app.05a1ec0d.js | 1 + dist/scripts/app.2a589f01.js | 1 - 4 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 dist/scripts/app.05a1ec0d.js delete mode 100644 dist/scripts/app.2a589f01.js diff --git a/app/admin_components/adf-services/dreamfactory-services.js b/app/admin_components/adf-services/dreamfactory-services.js index daf148b5..55500925 100644 --- a/app/admin_components/adf-services/dreamfactory-services.js +++ b/app/admin_components/adf-services/dreamfactory-services.js @@ -22,7 +22,7 @@ angular.module('dfServices', ['ngRoute', 'dfUtility']) }]) - .controller('ServicesCtrl', ['$rootScope', '$scope', 'dfApplicationData', 'dfNotify', '$location', function ($rootScope, $scope, dfApplicationData, dfNotify, $location) { + .controller('ServicesCtrl', ['$rootScope', '$scope', 'dfApplicationData', 'dfNotify', '$location', 'SystemConfigDataService', function ($rootScope, $scope, dfApplicationData, dfNotify, $location, SystemConfigDataService) { $scope.$parent.title = 'Services'; $scope.$parent.titleIcon = 'cubes'; @@ -66,11 +66,13 @@ angular.module('dfServices', ['ngRoute', 'dfUtility']) // eventlist is loaded only as needed to improve user experience var apis = ['service', 'service_link', 'storage_service_link', 'service_type', 'environment']; + var resourcesWrapper = SystemConfigDataService.getSystemConfig().config.resources_wrapper; + dfApplicationData.getApiData(apis).then( function (response) { var newApiData = {}; apis.forEach(function(value, index) { - newApiData[value] = response[index].resource ? response[index].resource : response[index]; + newApiData[value] = response[index][resourcesWrapper] ? response[index][resourcesWrapper] : response[index]; }); $scope.apiData = newApiData; if (init) { diff --git a/dist/index.html b/dist/index.html index 085adbb9..62154278 100644 --- a/dist/index.html +++ b/dist/index.html @@ -2,7 +2,7 @@

You are using an outdated browser. Please upgrade your browser to improve your experience.