DP-351 Update MemSQL to SingleStore

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": "MemSQL (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) {

app/admin_components/adf-services/views/df-manage-services.html

@@ -77,8 +77,12 @@
                                     </span>
                                 </div>
 
+                                <div ng-switch-when="type">
+                                  {{ value === 'memsql' ? 'memsql (singlestore)' : value }}
+                                </div>
+
                                 <div ng-switch-default>
-                                    {{value}}
+                                  {{ value }}
                                 </div>
                             </div>
                         </td>

app/admin_components/adf-services/views/df-service-info.html

@@ -81,6 +81,6 @@ <h4>Roles Associated with this Service</h4>
                 </div>
             </div>
         </div>
-    </div>           
+    </div>
 </div>
 

app/scripts/app.js

@@ -120,7 +120,7 @@ angular
     })
 
     // Set application version number
-    .constant('APP_VERSION', '4.10.1')
+    .constant('APP_VERSION', '4.11.0')
 
     // Set global url for this application
     .constant('INSTANCE_BASE_URL', '')

dist/admin_components/adf-services/views/df-manage-services.html

@@ -1 +1 @@
-<div> <div data-ng-hide="currentEditService"> <!-- Section Header --> <df-section-header data-title="'Manage Services'"></df-section-header> <!-- Tool Bar --> <df-section-toolbar> <div class="btn-toolbar pull-left" role="toolbar" aria-label="Toolbar with button groups"> <div class="btn-group" role="group" aria-label="Third group"> <df-toolbar-paginate data-api="'service'"></df-toolbar-paginate> </div> <div class="btn-group" role="group" aria-label="Third group"> <input type="text" data-ng-model="$parent.filterText" data-ng-change="changeFilter($parent.filterText)" class="df-search-box" placeholder="Search"> </div> <div class="btn-group" role="group" aria-label="Third group"> <div class="btn-group btn-group-sm hidden-xs df-btn-group"> <button class="btn btn-default" data-ng-click="deleteSelectedServices()" data-ng-disabled="selectedServices.length === 0" title="Delete selected services"><i class="fa fa-fw fa-trash"></i></button> </div> </div> </div> <div style="clear: both"></div> </df-section-toolbar> <div data-ng-show="services.length === 0 && !filterText"> <df-empty-section></df-empty-section> </div> <div data-ng-show="services.length === 0 && filterText"> <df-empty-search-result></df-empty-search-result> </div> <div data-ng-show="services.length > 0"> <div> <table class="table table-responsive table-bordered table-striped table-hover table-condensed"> <thead> <th></th> <th data-ng-class="order.orderBy === field.name ? 'df-th-selected' : ''" data-ng-click="orderOnSelect(field)" data-ng-repeat="field in fields"> <span class="df-th-text" style="white-space: nowrap">{{field.label}} <i style="margin-left: 5px;" data-ng-if="order.orderBy === field.name" class="fa" data-ng-class="order.orderBy === field.name && order.orderByReverse ? 'fa-caret-down' : 'fa-caret-up'"></i> </span> </th> </thead> <tbody> <tr data-ng-repeat="obj in services | orderObjectBy:order.orderBy:order.orderByReverse" class="repeated-item" class="repeated-item" data-ng-class="obj.__dfUI.selected ? 'danger' : ''"> <td style="width: 80px"> <div class="cell-content"> <div data-ng-if="obj.record.deletable == true"> <div class="checkbox" style="margin: 0"> <label> <input type="checkbox" data-ng-checked="obj.__dfUI.selected" data-ng-click="setSelected(obj)"> <div class="btn-group btn-group-xs"> <button id="services_table_row_delete_{{obj.record.id}}" type="button" class="btn btn-default" data-ng-click="deleteService(obj)" title="Delete service"><i class="fa fa-trash"></i></button> </div> </label> </div> </div> </div> </td> <td id="services_table_row_{{$index}}_{{obj.record.id}}" data-ng-click="editService(obj.record)" data-ng-repeat="value in obj.record | orderAndShowValue : fields track by $index"> <div class="cell-content" ng-switch="fields[$index].name"> <div ng-switch-when="is_active"> <span ng-if="value == true"> <i class="fa fa-check"></i> </span> <span ng-if="value == false"> <i class="fa fa-times"></i> </span> </div> <div ng-switch-default> {{value}} </div> </div> </td> </tr> </tbody> </table> </div> </div> </div> <!-- Edit Service --> <div data-ng-show="currentEditService"> <df-service-details data-service-data="currentEditService" data-new-service="false" data-api-data="apiData"></df-service-details> </div> </div> 
+<div> <div data-ng-hide="currentEditService"> <!-- Section Header --> <df-section-header data-title="'Manage Services'"></df-section-header> <!-- Tool Bar --> <df-section-toolbar> <div class="btn-toolbar pull-left" role="toolbar" aria-label="Toolbar with button groups"> <div class="btn-group" role="group" aria-label="Third group"> <df-toolbar-paginate data-api="'service'"></df-toolbar-paginate> </div> <div class="btn-group" role="group" aria-label="Third group"> <input type="text" data-ng-model="$parent.filterText" data-ng-change="changeFilter($parent.filterText)" class="df-search-box" placeholder="Search"> </div> <div class="btn-group" role="group" aria-label="Third group"> <div class="btn-group btn-group-sm hidden-xs df-btn-group"> <button class="btn btn-default" data-ng-click="deleteSelectedServices()" data-ng-disabled="selectedServices.length === 0" title="Delete selected services"><i class="fa fa-fw fa-trash"></i></button> </div> </div> </div> <div style="clear: both"></div> </df-section-toolbar> <div data-ng-show="services.length === 0 && !filterText"> <df-empty-section></df-empty-section> </div> <div data-ng-show="services.length === 0 && filterText"> <df-empty-search-result></df-empty-search-result> </div> <div data-ng-show="services.length > 0"> <div> <table class="table table-responsive table-bordered table-striped table-hover table-condensed"> <thead> <th></th> <th data-ng-class="order.orderBy === field.name ? 'df-th-selected' : ''" data-ng-click="orderOnSelect(field)" data-ng-repeat="field in fields"> <span class="df-th-text" style="white-space: nowrap">{{field.label}} <i style="margin-left: 5px;" data-ng-if="order.orderBy === field.name" class="fa" data-ng-class="order.orderBy === field.name && order.orderByReverse ? 'fa-caret-down' : 'fa-caret-up'"></i> </span> </th> </thead> <tbody> <tr data-ng-repeat="obj in services | orderObjectBy:order.orderBy:order.orderByReverse" class="repeated-item" class="repeated-item" data-ng-class="obj.__dfUI.selected ? 'danger' : ''"> <td style="width: 80px"> <div class="cell-content"> <div data-ng-if="obj.record.deletable == true"> <div class="checkbox" style="margin: 0"> <label> <input type="checkbox" data-ng-checked="obj.__dfUI.selected" data-ng-click="setSelected(obj)"> <div class="btn-group btn-group-xs"> <button id="services_table_row_delete_{{obj.record.id}}" type="button" class="btn btn-default" data-ng-click="deleteService(obj)" title="Delete service"><i class="fa fa-trash"></i></button> </div> </label> </div> </div> </div> </td> <td id="services_table_row_{{$index}}_{{obj.record.id}}" data-ng-click="editService(obj.record)" data-ng-repeat="value in obj.record | orderAndShowValue : fields track by $index"> <div class="cell-content" ng-switch="fields[$index].name"> <div ng-switch-when="is_active"> <span ng-if="value == true"> <i class="fa fa-check"></i> </span> <span ng-if="value == false"> <i class="fa fa-times"></i> </span> </div> <div ng-switch-when="type"> {{ value === 'memsql' ? 'memsql (singlestore)' : value }} </div> <div ng-switch-default> {{ value }} </div> </div> </td> </tr> </tbody> </table> </div> </div> </div> <!-- Edit Service --> <div data-ng-show="currentEditService"> <df-service-details data-service-data="currentEditService" data-new-service="false" data-api-data="apiData"></df-service-details> </div> </div> 

dist/index.html

@@ -2,7 +2,7 @@
       <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
     <![endif]--> <!-- Add your site or application content here --> <div id="dreamfactoryApp" data-ng-controller="MainCtrl" df-popup-login> <div id="popup-login-container"></div> <!-- Top level Nav --> <df-top-level-nav-std data-ng-if="showHeader" data-options="topLevelNavOptions"></df-top-level-nav-std> <df-license-expired-banner data-ng-if="showLicenseExpiredBanner"></df-license-expired-banner> <div data-ng-if="showAdminComponentNav" style="margin: 10px auto;" class="df-menu"> <!-- Component nav and title --> <div class="container-fluid"> <div class="row"> <div class="col-xs-12"> <div class="col-md-2 df-menu-container df-menu-icon"> <df-component-title></df-component-title> </div> <div class="col-md-10 df-menu-container second-nav-menu-items"> <df-component-nav data-options="componentNavOptions"></df-component-nav> </div> </div> </div> </div> </div> <!-- Rendering Context --> <div class="container-fluid"> <div class="row"> <div class="col-xs-12"> <div data-ng-view=""></div> </div> </div> </div> <!--<df-main-loading></df-main-loading>--> <div id="mask"></div> </div> <!--[if lt IE 9]>
     <script src="scripts/oldieshim.d41d8cd9.js"></script>
-    <![endif]--> <script src="scripts/vendor.9e01592e.js"></script> <script src="scripts/app.186b557f.js"></script> <!-- other deps --> <script src="vendor/ace/ace.js"></script> <script src="vendor/ace/mode-javascript.js"></script> <script src="vendor/ace/mode-json.js"></script> <script src="vendor/ace/mode-yaml.js"></script> <script> setTimeout(function(){
+    <![endif]--> <script src="scripts/vendor.9e01592e.js"></script> <script src="scripts/app.ed5771b1.js"></script> <!-- other deps --> <script src="vendor/ace/ace.js"></script> <script src="vendor/ace/mode-javascript.js"></script> <script src="vendor/ace/mode-json.js"></script> <script src="vendor/ace/mode-yaml.js"></script> <script> setTimeout(function(){
 
       var _updateIntercom = function(userData) {
           var host = $body.injector().get("$location").host();