From 90b37323cac1cc801216c31351b2db14cafdc706 Mon Sep 17 00:00:00 2001 From: yaroslavmo Date: Fri, 4 Feb 2022 21:07:45 +0200 Subject: [PATCH 1/4] DP-461 Update DreamFactory with new logo --- .../views/df-top-level-nav-std.html | 2 +- app/images/Logo-dreamfactory-purple-grey.svg | 371 +++++++++++++++--- .../views/df-top-level-nav-std.html | 2 +- dist/images/Logo-dreamfactory-purple-grey.svg | 371 +++++++++++++++--- 4 files changed, 650 insertions(+), 96 deletions(-) diff --git a/app/admin_components/adf-utility/views/df-top-level-nav-std.html b/app/admin_components/adf-utility/views/df-top-level-nav-std.html index 74db6ce0..f7c928f2 100644 --- a/app/admin_components/adf-utility/views/df-top-level-nav-std.html +++ b/app/admin_components/adf-utility/views/df-top-level-nav-std.html @@ -10,7 +10,7 @@ - + diff --git a/app/images/Logo-dreamfactory-purple-grey.svg b/app/images/Logo-dreamfactory-purple-grey.svg index 5048e724..79243d78 100644 --- a/app/images/Logo-dreamfactory-purple-grey.svg +++ b/app/images/Logo-dreamfactory-purple-grey.svg @@ -1,47 +1,324 @@ - - - - Logo - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + Artboard 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Artboard 1 + + + + diff --git a/dist/admin_components/adf-utility/views/df-top-level-nav-std.html b/dist/admin_components/adf-utility/views/df-top-level-nav-std.html index 727fcda2..e3b12115 100644 --- a/dist/admin_components/adf-utility/views/df-top-level-nav-std.html +++ b/dist/admin_components/adf-utility/views/df-top-level-nav-std.html @@ -1 +1 @@ -
\ No newline at end of file +
\ No newline at end of file diff --git a/dist/images/Logo-dreamfactory-purple-grey.svg b/dist/images/Logo-dreamfactory-purple-grey.svg index 5048e724..79243d78 100644 --- a/dist/images/Logo-dreamfactory-purple-grey.svg +++ b/dist/images/Logo-dreamfactory-purple-grey.svg @@ -1,47 +1,324 @@ - - - - Logo - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + Artboard 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Artboard 1 + + + + From 9e26b6ae3987fd5313500be038bbfa5bf803956f Mon Sep 17 00:00:00 2001 From: Ryugi Date: Fri, 11 Mar 2022 17:03:51 +0900 Subject: [PATCH 2/4] DP-351 Update MemSQL to SingleStore --- .../adf-services/dreamfactory-services.js | 18 ++++++++++++++---- .../adf-services/views/df-manage-services.html | 6 +++++- .../adf-services/views/df-service-info.html | 2 +- .../adf-services/views/df-manage-services.html | 2 +- dist/index.html | 2 +- dist/scripts/app.186b557f.js | 1 - dist/scripts/app.b286e638.js | 1 + 7 files changed, 23 insertions(+), 9 deletions(-) delete mode 100644 dist/scripts/app.186b557f.js create mode 100644 dist/scripts/app.b286e638.js diff --git a/app/admin_components/adf-services/dreamfactory-services.js b/app/admin_components/adf-services/dreamfactory-services.js index aeeeaf59..398d07ba 100644 --- a/app/admin_components/adf-services/dreamfactory-services.js +++ b/app/admin_components/adf-services/dreamfactory-services.js @@ -373,6 +373,7 @@ angular.module('dfServices', ['ngRoute', 'dfUtility', 'dfApplication']) } scope.services = _services; + }); @@ -696,7 +697,7 @@ angular.module('dfServices', ['ngRoute', 'dfUtility', 'dfApplication']) testResults.then(function (result) { scope.notifyTestResults(result); }) - } + } }, function (reject) { @@ -1044,7 +1045,7 @@ angular.module('dfServices', ['ngRoute', 'dfUtility', 'dfApplication']) "group": "Database" }, { "name": "memsql", - "label": "MemSQL", + "label": "SingleStore", "description": "Database service supporting MemSQL connections.", "group": "Database" }, { @@ -1243,7 +1244,6 @@ angular.module('dfServices', ['ngRoute', 'dfUtility', 'dfApplication']) // sort groups per above list // service types within each group are ordered as returned by server groups = scope.sortArray(groups, sortingArray); - // sort each array of service types into a staggered list to // accommodate 2 columns when there are more than X items. // doing this work here allows the CSS to remain really simple @@ -1266,7 +1266,17 @@ angular.module('dfServices', ['ngRoute', 'dfUtility', 'dfApplication']) angular.forEach(typeObj, function (types, group) { var newTypes = angular.copy(types); var limit = scope.serviceTypesSingleColLimit, i, j; + if (types.length > limit) { + + // Order Database services by label --> MemSQL re-branded to SingleStore + if(types.map(function(obj) {return obj.label}).includes('SingleStore')) { + types = types.sort( + function(a,b){ + return a.label.toLowerCase() > b.label.toLowerCase() ? 1:-1; + }); + } + for (i = 0, j = 0; i < types.length; i += 2) { newTypes[i] = types[j++]; } @@ -1280,7 +1290,6 @@ angular.module('dfServices', ['ngRoute', 'dfUtility', 'dfApplication']) var _serviceTypes = []; for (var i = 0; i < groups.length; i++) { - _serviceTypes.push({"group_name": groups[i], "group_types": newTypeObj[groups[i]]}); } scope.serviceTypes = _serviceTypes; @@ -1329,6 +1338,7 @@ angular.module('dfServices', ['ngRoute', 'dfUtility', 'dfApplication']) } } }; + }]) .directive('dfServiceConfig', ['MOD_SERVICES_ASSET_PATH', 'dfApplicationData', 'dfObjectService', '$compile', '$rootScope', 'dfNotify', '$http', 'INSTANCE_URL', 'UserDataService', function (MOD_SERVICES_ASSET_PATH, dfApplicationData, dfObjectService, $compile, $rootScope, dfNotify, $http, INSTANCE_URL, UserDataService) { diff --git a/app/admin_components/adf-services/views/df-manage-services.html b/app/admin_components/adf-services/views/df-manage-services.html index e8e0dc0f..169c696e 100644 --- a/app/admin_components/adf-services/views/df-manage-services.html +++ b/app/admin_components/adf-services/views/df-manage-services.html @@ -77,8 +77,12 @@ +
+ {{ value === 'memsql' ? 'singlestore' : value }} +
+
- {{value}} + {{ value }}
diff --git a/app/admin_components/adf-services/views/df-service-info.html b/app/admin_components/adf-services/views/df-service-info.html index 86457698..55979904 100644 --- a/app/admin_components/adf-services/views/df-service-info.html +++ b/app/admin_components/adf-services/views/df-service-info.html @@ -81,6 +81,6 @@

Roles Associated with this Service

- + diff --git a/dist/admin_components/adf-services/views/df-manage-services.html b/dist/admin_components/adf-services/views/df-manage-services.html index 99dbd81f..a9165e5c 100644 --- a/dist/admin_components/adf-services/views/df-manage-services.html +++ b/dist/admin_components/adf-services/views/df-manage-services.html @@ -1 +1 @@ -
{{field.label}}
{{value}}
\ No newline at end of file +
{{field.label}}
{{ value === 'memsql' ? 'singlestore' : value }}
{{ value }}
\ No newline at end of file diff --git a/dist/index.html b/dist/index.html index ab9bfbc2..6b3de996 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.