Align with license change

CHANGES.rst

@@ -6,7 +6,10 @@ Changes for Crate Admin Interface
 Unreleased
 ==========
 
+- Align with license change. Enterprise features are now available to everyone.
+
 - Fixed translations. French now works again.
+
 - Fixed missing whitespace.
 
 

DEVELOP.rst

@@ -100,10 +100,7 @@ Adding New Stylesheets
 ======================
 
 When a new stylesheet is created it should be imported to
-``./styles/styles.scss`` and/or ``./styles/styles-enterprise.scss``
-
-Vendor styles should also be imported to ``./styles/styles.scss``
-and ``./styles/styles-enterprise.scss``
+``./styles/styles.scss``, this applies to both vanilla and vendor stylesheets.
 
 
 Running Tests

app/app.module.js

@@ -33,9 +33,6 @@ var MODULES = [
   'oc.lazyLoad'
 ];
 
-var DEFAULT_PLUGINS = [];
-var ENTERPRISE_PLUGINS = [];
-
 var ROUTING = {
   '/': {
     'name': 'overview',
@@ -125,77 +122,9 @@ var loadStylesheet = function (url) {
 // todo: load json from rest endpoint
 $.get('static/conf/plugins.json', function (plugins) {
 
-  ENTERPRISE_PLUGINS = plugins.filter(function (p) {
-    return p.enterprise;
-  }).map(function (el) {
-    return {
-      name: el.name,
-      files: [el.uri],
-      routing: el.routing,
-      stylesheet: el.stylesheet
-    };
-  });
-  DEFAULT_PLUGINS = plugins.filter(function (p) {
-    return !p.enterprise;
-  });
-
   //function to create 'crate' module and bootstrap app
   var loadApp = function () {
     appModule = angular.module('crate', MODULES);
-    appModule.config(['SQLQueryProvider', 'queryResultToObjectsProvider', '$ocLazyLoadProvider', '$stateProvider',
-      'SettingsProvider',
-      function (SQLQueryProvider, queryResultToObjectsProvider, $ocLazyLoadProvider,
-        $stateProvider, SettingsProvider) {
-
-        if (SettingsProvider.$get().enterprise === true) {
-          loadStylesheet('static/styles/enterprise.css');
-        }
-        var stmt = `
-          SELECT
-            license['issued_to'] as issued_to,
-            license['expiry_date'] as expiry_date,
-            license['max_nodes'] as max_nodes
-          FROM
-            sys.cluster
-        `;
-        SQLQueryProvider.$get().execute(stmt, {}, false, false, false)
-          .then(function (query) {
-            let result = queryResultToObjectsProvider.$get()(
-              query,
-              ['issued_to', 'expiry_date', 'max_nodes']
-            )[0];
-            SettingsProvider.setEnterprise(result.issued_to != null);
-            SettingsProvider.setLicenseIssuedTo(result.issued_to);
-            SettingsProvider.setLicenseExpiryDate(result.expiry_date);
-            SettingsProvider.setLicenseMaxNodes(result.max_nodes);
-            if (SettingsProvider.$get().enterprise) {
-              loadStylesheet('static/styles/enterprise.css');
-              $ocLazyLoadProvider.config({
-                modules: ENTERPRISE_PLUGINS,
-                events: true
-              });
-
-              $ocLazyLoadProvider.$get().load(ENTERPRISE_PLUGINS);
-
-              for (var i = 0; i < ENTERPRISE_PLUGINS.length; i++) {
-                loadStylesheet(ENTERPRISE_PLUGINS[i].stylesheet);
-                var routing = ENTERPRISE_PLUGINS[i].routing;
-                if (routing) {
-                  for (var pattern in routing) {
-                    $stateProvider.state(routing[pattern]);
-                  }
-                }
-              }
-              console.info('Loaded Enterprise Plugins:', ENTERPRISE_PLUGINS.map(function (o) {
-                return o.name;
-              }));
-            }
-          }, function () {
-            SettingsProvider.setEnterprise(false);
-            console.info('Failed to load Enterprise settings');
-          });
-      }
-    ]);
 
     appModule.config(['$stateProvider', '$httpProvider', '$urlMatcherFactoryProvider', '$urlRouterProvider',
       function ($stateProvider, $httpProvider, $urlMatcherFactoryProvider, $urlRouterProvider) {
@@ -208,8 +137,8 @@ $.get('static/conf/plugins.json', function (plugins) {
           $stateProvider.state(ROUTING[pattern]);
         }
         // register routing from plugins
-        for (var i = 0; i < DEFAULT_PLUGINS.length; i++) {
-          var routing = DEFAULT_PLUGINS[i].routing;
+        for (var i = 0; i < plugins.length; i++) {
+          var routing = plugins[i].routing;
           if (routing) {
             for (pattern in routing) {
               $stateProvider.state(routing[pattern]);
@@ -278,21 +207,21 @@ $.get('static/conf/plugins.json', function (plugins) {
   };
 
   var promises = [];
-  for (var i = 0; i < DEFAULT_PLUGINS.length; i++) {
-    promises.push(loadScript(DEFAULT_PLUGINS[i].uri));
-    if (DEFAULT_PLUGINS[i].stylesheet) {
-      promises.push(loadStylesheet(DEFAULT_PLUGINS[i].stylesheet));
+  for (var i = 0; i < plugins.length; i++) {
+    promises.push(loadScript(plugins[i].uri));
+    if (plugins[i].stylesheet) {
+      promises.push(loadStylesheet(plugins[i].stylesheet));
     }
   }
 
   $.when.apply($, promises).then(function () {
-    console.info('Loaded Modules:', MODULES);
-    console.info('Default Plugins:', DEFAULT_PLUGINS.map(function (el) {
+    console.info('Modules:', MODULES);
+    console.info('Plugins:', plugins.map(function (el) {
       return el.name;
     }));
 
     //onSucess: update the modules and load the app
-    MODULES = MODULES.concat(DEFAULT_PLUGINS.map(function (el) {
+    MODULES = MODULES.concat(plugins.map(function (el) {
       return el.name;
     }));
     loadApp();

app/conf/plugins.json

@@ -1,7 +1,6 @@
 [{
   "name": "tutorial",
   "uri": "static/plugins/tutorial/tutorial.js",
-  "enterprise": false,
   "routing": {
     "/help": {
       "name": "tutorial",
@@ -14,7 +13,6 @@
   "name": "monitoring",
   "uri": "static/plugins/monitoring/monitoring.js",
   "stylesheet": "static/plugins/monitoring/monitoring.css",
-  "enterprise": true,
   "routing": {
     "/monitoring": {
       "name": "monitoring",
@@ -27,7 +25,6 @@
   "name": "privileges",
   "uri": "static/plugins/privileges/privileges.js",
   "stylesheet": "static/plugins/privileges/privileges.css",
-  "enterprise": true,
   "routing": {
     "/privileges": {
       "name": "privileges",
@@ -44,7 +41,6 @@
   "name": "shards",
   "uri": "static/plugins/shards/shards.js",
   "stylesheet": "static/plugins/shards/shards.css",
-  "enterprise": true,
   "routing": {
     "/shards": {
       "name": "shards",

app/plugins/monitoring/README.rst

@@ -14,10 +14,10 @@ contains the following:
 .. code-block:: json
 
     {
-      "name": "monitoring",
+      "enabled": true,
+      "name":   "monitoring",
       "uri": "plugins/monitoring/monitoring.js",
       "stylesheet": "plugins/monitoring/monitoring.css",
-      "enterprise": true,
       "routing": {
         "/monitoring": {
           "templateUrl": "plugins/monitoring/monitoring.html",

app/plugins/monitoring/monitoring.css

@@ -1,21 +1,3 @@
-/*
- * This file is part of a module with proprietary Enterprise Features.
- *
- * Licensed to Crate.io Inc. ("Crate.io") under one or more contributor 
- * license agreements.  See the NOTICE file distributed with this work for
- * additional information regarding copyright ownership.
- *
- * Unauthorized copying of this file, via any medium is strictly prohibited.
- *
- * To use this file, Crate.io must have given you permission to enable and
- * use such Enterprise Features and you must have a valid Enterprise or
- * Subscription Agreement with Crate.io.  If you enable or use the Enterprise
- * Features, you represent and warrant that you have a valid Enterprise or
- * Subscription Agreement with Crate.io.  Your use of the Enterprise Features
- * if governed by the terms and conditions of your Enterprise or Subscription
- * Agreement with Crate.io.
- */
-
 .cr-radio-button__monitoring__toggle--overall {
   background-color: #00ff9b;
 }

app/plugins/monitoring/monitoring.js

@@ -1,20 +1,3 @@
-/*
- * This file is part of a module with proprietary Enterprise Features.
- *
- * Licensed to Crate.io Inc. ("Crate.io") under one or more contributor 
- * license agreements.  See the NOTICE file distributed with this work for
- * additional information regarding copyright ownership.
- *
- * Unauthorized copying of this file, via any medium is strictly prohibited.
- *
- * To use this file, Crate.io must have given you permission to enable and
- * use such Enterprise Features and you must have a valid Enterprise or
- * Subscription Agreement with Crate.io.  If you enable or use the Enterprise
- * Features, you represent and warrant that you have a valid Enterprise or
- * Subscription Agreement with Crate.io.  Your use of the Enterprise Features
- * if governed by the terms and conditions of your Enterprise or Subscription
- * Agreement with Crate.io.
- */
 'use strict';
 
 angular.module('monitoring', ['events'])

app/plugins/monitoring/test/monitoringQueryService.test.js

@@ -1,20 +1,3 @@
-/*
- * This file is part of a module with proprietary Enterprise Features.
- *
- * Licensed to Crate.io Inc. ("Crate.io") under one or more contributor 
- * license agreements.  See the NOTICE file distributed with this work for
- * additional information regarding copyright ownership.
- *
- * Unauthorized copying of this file, via any medium is strictly prohibited.
- *
- * To use this file, Crate.io must have given you permission to enable and
- * use such Enterprise Features and you must have a valid Enterprise or
- * Subscription Agreement with Crate.io.  If you enable or use the Enterprise
- * Features, you represent and warrant that you have a valid Enterprise or
- * Subscription Agreement with Crate.io.  Your use of the Enterprise Features
- * if governed by the terms and conditions of your Enterprise or Subscription
- * Agreement with Crate.io.
- */
 describe('monitoring', function() {
   'use strict';
 

app/plugins/monitoring/test/nullObject.test.js

@@ -1,20 +1,3 @@
-/*
- * This file is part of a module with proprietary Enterprise Features.
- *
- * Licensed to Crate.io Inc. ("Crate.io") under one or more contributor 
- * license agreements.  See the NOTICE file distributed with this work for
- * additional information regarding copyright ownership.
- *
- * Unauthorized copying of this file, via any medium is strictly prohibited.
- *
- * To use this file, Crate.io must have given you permission to enable and
- * use such Enterprise Features and you must have a valid Enterprise or
- * Subscription Agreement with Crate.io.  If you enable or use the Enterprise
- * Features, you represent and warrant that you have a valid Enterprise or
- * Subscription Agreement with Crate.io.  Your use of the Enterprise Features
- * if governed by the terms and conditions of your Enterprise or Subscription
- * Agreement with Crate.io.
- */
 describe('NullOverAllSeries', function() {
   'use strict';
   var mockNullOverAllSeries;

app/plugins/monitoring/test/nullSerie.test.js

@@ -1,20 +1,3 @@
-/*
- * This file is part of a module with proprietary Enterprise Features.
- *
- * Licensed to Crate.io Inc. ("Crate.io") under one or more contributor 
- * license agreements.  See the NOTICE file distributed with this work for
- * additional information regarding copyright ownership.
- *
- * Unauthorized copying of this file, via any medium is strictly prohibited.
- *
- * To use this file, Crate.io must have given you permission to enable and
- * use such Enterprise Features and you must have a valid Enterprise or
- * Subscription Agreement with Crate.io.  If you enable or use the Enterprise
- * Features, you represent and warrant that you have a valid Enterprise or
- * Subscription Agreement with Crate.io.  Your use of the Enterprise Features
- * if governed by the terms and conditions of your Enterprise or Subscription
- * Agreement with Crate.io.
- */
 describe('NullSerie', function() {
   'use strict';
   var mockNullSerie;

app/plugins/monitoring/test/pollService.test.js

@@ -1,20 +1,3 @@
-/*
- * This file is part of a module with proprietary Enterprise Features.
- *
- * Licensed to Crate.io Inc. ("Crate.io") under one or more contributor 
- * license agreements.  See the NOTICE file distributed with this work for
- * additional information regarding copyright ownership.
- *
- * Unauthorized copying of this file, via any medium is strictly prohibited.
- *
- * To use this file, Crate.io must have given you permission to enable and
- * use such Enterprise Features and you must have a valid Enterprise or
- * Subscription Agreement with Crate.io.  If you enable or use the Enterprise
- * Features, you represent and warrant that you have a valid Enterprise or
- * Subscription Agreement with Crate.io.  Your use of the Enterprise Features
- * if governed by the terms and conditions of your Enterprise or Subscription
- * Agreement with Crate.io.
- */
 describe('MonitoringPollService', function() {
   'use strict';
   var mockPollService;