diff --git a/CHANGES.rst b/CHANGES.rst index 154936320..47af728c8 100644 --- a/CHANGES.rst +++ b/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. diff --git a/DEVELOP.rst b/DEVELOP.rst index 3569591f3..d927131ca 100644 --- a/DEVELOP.rst +++ b/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 diff --git a/app/app.module.js b/app/app.module.js index b36de9510..528b72f58 100644 --- a/app/app.module.js +++ b/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(); diff --git a/app/conf/plugins.json b/app/conf/plugins.json index f53e5a6aa..5f62ae6a7 100644 --- a/app/conf/plugins.json +++ b/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", diff --git a/app/enterprise.module.js b/app/enterprise.module.js deleted file mode 100644 index da1801694..000000000 --- a/app/enterprise.module.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -// for loading styles we need to load main scss file -import './styles/styles-enterprise.scss'; - diff --git a/app/plugins/monitoring/LICENSE b/app/plugins/monitoring/LICENSE deleted file mode 100644 index 1ed3a4d74..000000000 --- a/app/plugins/monitoring/LICENSE +++ /dev/null @@ -1,17 +0,0 @@ -CrateDB Enterprise Module -Copyright 2013-2017 Crate.io Inc. ("Crate.io") - -This module contains 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, via any medium is strictly prohibited. - -To use this module, 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. diff --git a/app/plugins/monitoring/NOTICE b/app/plugins/monitoring/NOTICE deleted file mode 100644 index 4800784d5..000000000 --- a/app/plugins/monitoring/NOTICE +++ /dev/null @@ -1,13 +0,0 @@ -CrateDB Sample Enterprise Module -Copyright 2013-2017 Crate.io Inc. ("Crate.io") - - -Third party dependencies: - -==================================================================================== - -Angularjs -https://angularjs.org -License: The MIT License (https://github.com/angular/angular.js/blob/master/LICENSE) - -==================================================================================== diff --git a/app/plugins/monitoring/README.rst b/app/plugins/monitoring/README.rst index 51fe59a81..d3d052ef0 100644 --- a/app/plugins/monitoring/README.rst +++ b/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", diff --git a/app/plugins/monitoring/monitoring.css b/app/plugins/monitoring/monitoring.css index 6d9aadd5a..2c73f7d80 100644 --- a/app/plugins/monitoring/monitoring.css +++ b/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; } diff --git a/app/plugins/monitoring/monitoring.js b/app/plugins/monitoring/monitoring.js index 6220152a7..f2b77f010 100644 --- a/app/plugins/monitoring/monitoring.js +++ b/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']) diff --git a/app/plugins/monitoring/static/icons/icon-monitoring.svg b/app/plugins/monitoring/static/icons/icon-monitoring.svg index 8eacf5bd3..45c39eb94 100644 --- a/app/plugins/monitoring/static/icons/icon-monitoring.svg +++ b/app/plugins/monitoring/static/icons/icon-monitoring.svg @@ -5,15 +5,13 @@ Created with Sketch. - - - - - - - + + + + + - \ No newline at end of file + diff --git a/app/plugins/monitoring/test/monitoringQueryService.test.js b/app/plugins/monitoring/test/monitoringQueryService.test.js index 82713caec..f16b66075 100644 --- a/app/plugins/monitoring/test/monitoringQueryService.test.js +++ b/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'; diff --git a/app/plugins/monitoring/test/nullObject.test.js b/app/plugins/monitoring/test/nullObject.test.js index 90ba8d212..bdd8bedf4 100644 --- a/app/plugins/monitoring/test/nullObject.test.js +++ b/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; diff --git a/app/plugins/monitoring/test/nullSerie.test.js b/app/plugins/monitoring/test/nullSerie.test.js index d43abcb6d..c92476b6d 100644 --- a/app/plugins/monitoring/test/nullSerie.test.js +++ b/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; diff --git a/app/plugins/monitoring/test/pollService.test.js b/app/plugins/monitoring/test/pollService.test.js index 39e954ec0..47a1ecc02 100644 --- a/app/plugins/monitoring/test/pollService.test.js +++ b/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; diff --git a/app/scripts/controllers/common.js b/app/scripts/controllers/common.js index 5ce803df9..49cc2f2f6 100644 --- a/app/scripts/controllers/common.js +++ b/app/scripts/controllers/common.js @@ -2,50 +2,14 @@ const commons = angular.module('common', ['stats', 'udc', 'events', 'sql']) .provider('Settings', function () { - var enterprise; - var license_issued_to = ''; - var license_max_nodes = 1; - var license_expiry_date = ''; var user = ''; - if (localStorage.getItem('crate_setting_enterprise')) { - enterprise = localStorage.getItem('crate_setting_enterprise'); - } else { - enterprise = false; - } return { - setEnterprise: function(value) { - enterprise = value; - try { - localStorage.setItem('crate_setting_enterprise', value); - } catch (error) { - console.log('localStorage cannot be set in Safari private mode', error); - } - }, - setLicenseIssuedTo: function(value) { - license_issued_to = value; - }, - setLicenseMaxNodes: function(value) { - license_max_nodes = value; - }, - setLicenseExpiryDate: function(value) { - if (!value) { - license_expiry_date = '∞'; - } else { - license_expiry_date = new Date(value).toUTCString(); - } - }, setUser: function(value) { user = value; }, $get: function() { return { - enterprise: enterprise, - license: { - issued_to: license_issued_to, - expiry_date: license_expiry_date, - max_nodes: license_max_nodes - }, user: user }; } @@ -56,16 +20,14 @@ const commons = angular.module('common', ['stats', 'udc', 'events', 'sql']) ClusterState, ChecksService, UidLoader, UdcSettings, Settings, Clipboard, ClusterEventsHandler, SQLQuery, queryResultToObjects) { - //query for current_user (Enterprise Feature) - if (Settings.enterprise) { - var userStmt = 'SELECT CURRENT_USER'; - SQLQuery.execute(userStmt, {}, false, false, false) - .then(function(query) { - var result = queryResultToObjects(query, ['user']); - Settings.user = result[0].user; - $scope.userName = Settings.user; - }); - } + // Query for current user. + var userStmt = 'SELECT CURRENT_USER'; + SQLQuery.execute(userStmt, {}, false, false, false) + .then(function(query) { + var result = queryResultToObjects(query, ['user']); + Settings.user = result[0].user; + $scope.userName = Settings.user; + }); var HEALTH = ['good', 'warning', 'critical', '--']; var LABELS = ['cr-bubble--success', 'cr-bubble--warning', 'cr-bubble--danger', 'cr-bubble--danger']; @@ -90,9 +52,6 @@ const commons = angular.module('common', ['stats', 'udc', 'events', 'sql']) }; var showSideNav = false; - $scope.enterprise = Settings.enterprise; - $scope.license = Settings.license; - $scope.toggleSideNav = function() { showSideNav = !showSideNav; if (showSideNav) { diff --git a/app/scripts/controllers/console.js b/app/scripts/controllers/console.js index 5c78f1c59..2e3860c37 100644 --- a/app/scripts/controllers/console.js +++ b/app/scripts/controllers/console.js @@ -448,7 +448,7 @@ const crate_console = angular.module('console', ['sql', 'datatypechecks', 'stats 'integer_value', 'intersect', 'intersection', 'interval', 'into', 'ip', 'is', 'isolation', 'iterate', 'join', 'key', 'kill', 'language', 'large', 'last', 'last_value', 'lateral', 'lead', 'leading', - 'leave', 'left', 'level', 'license', 'like', 'like_regex', 'limit', + 'leave', 'left', 'level', 'like', 'like_regex', 'limit', 'llt', 'ln', 'local', 'localtime', 'localtimestamp', 'locator', 'logical', 'long', 'loop', 'lower', 'lt', 'lte', 'map', 'match', 'materialized', 'max', 'member', 'merge', 'method', 'min', 'minus', diff --git a/app/styles/styles-enterprise.scss b/app/styles/styles-enterprise.scss deleted file mode 100644 index e87373a1d..000000000 --- a/app/styles/styles-enterprise.scss +++ /dev/null @@ -1,40 +0,0 @@ -// for fixing of loading bootstrap icon files -$icon-font-path: '~bootstrap-sass/assets/fonts/bootstrap/'; - -/*=========================================== -===== Loading Custom Setup of Variables ===== -=============================================*/ -@import 'vars/typography'; - -/*======================================== -========= Loading Vendor Styles ========== -==========================================*/ -@import '~bootstrap-sass/assets/stylesheets/bootstrap'; - -@import '~font-awesome/css/font-awesome.css'; -@import '~codemirror/lib/codemirror.css'; -@import '~codemirror/theme/monokai.css'; -@import '~nvd3/build/nv.d3.css'; - - -/*=========================================== -========= Loading Customize Styles ========== -=============================================*/ -// loading variables -@import 'vars/dark-theme-variables'; -@import 'vars/path'; - -// loading views -@import 'views/common'; -@import 'views/charts'; -@import 'views/console'; -@import 'views/nav'; -@import 'views/nodelist'; -@import 'views/overview'; -@import 'views/simple-sidebar'; -@import 'views/statusbar'; -@import 'views/tablelist'; -@import 'views/tables'; -@import 'views/views'; -@import 'views/tutorial'; -@import 'views/node'; diff --git a/app/styles/styles.scss b/app/styles/styles.scss index 329911ea1..06681e3cc 100755 --- a/app/styles/styles.scss +++ b/app/styles/styles.scss @@ -21,7 +21,11 @@ $icon-font-path: '~bootstrap-sass/assets/fonts/bootstrap/'; ========= Loading Customize Styles ========== =============================================*/ // loading variables -@import 'vars/light-theme-variables'; + +// TODO: Add a switch for selecting light vs. dark theme. +// @import 'vars/light-theme-variables'; +@import 'vars/dark-theme-variables'; + @import 'vars/path'; // loading views diff --git a/app/styles/views/_statusbar.scss b/app/styles/views/_statusbar.scss index de8e4f871..fb6870aaf 100644 --- a/app/styles/views/_statusbar.scss +++ b/app/styles/views/_statusbar.scss @@ -41,18 +41,6 @@ .status-bar__icon > img { margin-right: 10px; } -.status-bar__license { - padding-top: 5px; - padding-bottom: 5px; - padding-left: 20px; - padding-right: 20px; - font-size: 12px; - cursor: pointer; - overflow: hidden; - height: $status-bar-height; - border-left: $status-bar-border-bottom; - border-right: $status-bar-border-bottom; -} .status-bar__user { height: $status-bar-height; @@ -74,28 +62,6 @@ .status-bar__notifications { display: flex; } -.status-bar__license:hover{ - background-color: $side-bar-element-hover-bg-color; -} - -.status-bar__license:active{ - background-color: $side-bar-element-active-bg-color; -} - -.status-bar__license--unlicensed{ - @extend .status-bar__license; - cursor: initial; - padding: 0px 20px; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - -} -.status-bar__license--unlicensed:hover, -.status-bar__license--unlicensed:active{ - background-color: none; -} .status-bar__icon--menu{ cursor: pointer; diff --git a/app/views/statusbar.html b/app/views/statusbar.html index 919657cce..c6b23b6fe 100644 --- a/app/views/statusbar.html +++ b/app/views/statusbar.html @@ -4,13 +4,7 @@
- - -
-
Licensed to: {{ license['issued_to'] | limitTo:30 }}
-
Max nodes: {{ license['max_nodes'] }} Expires: {{ license['expiry_date'] }}
-
-
Unlicensed
+
@@ -35,7 +29,7 @@
Load: {{ load1 }}/{{ load5 }}/{{ load15 }}
-
+
{{userName}}
diff --git a/docs/index.rst b/docs/index.rst index 83418a953..d5a11512b 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -47,11 +47,6 @@ This is what the Admin UI looks like when it first loads: .. image:: _assets/img/admin-ui.png -.. NOTE:: - - This is the standard theme. The `Community Edition`_ of CrateDB uses a - lighter theme. - Take note of the `status bar`_ (at the top) and the `tabs`_ (down the left side). @@ -116,15 +111,13 @@ On the left-hand side, from top to bottom, the tabs are: - :ref:`SQL console ` - :ref:`Tables browser ` - :ref:`Views browser ` -- :ref:`Shards browser ` (`enterprise feature`_) +- :ref:`Shards browser ` - :ref:`Cluster browser ` -- :ref:`Monitoring overview ` (`enterprise feature`_) -- :ref:`Privileges browser ` (`enterprise feature`_) +- :ref:`Monitoring overview ` +- :ref:`Privileges browser ` - :ref:`Help screen ` .. _Cluster name: https://crate.io/docs/crate/reference/en/latest/config/node.html#basics -.. _Community Edition: https://crate.io/docs/crate/reference/en/latest/editions.html#cratedb-community-edition .. _CrateDB Rest API: https://crate.io/docs/crate/reference/en/latest/interfaces/http.html -.. _enterprise feature: https://crate.io/docs/crate/reference/en/latest/editions.html#cratedb .. _hosted on GitHub: https://github.com/crate/crate-admin diff --git a/docs/monitoring.rst b/docs/monitoring.rst index c2dc9cb52..287294343 100644 --- a/docs/monitoring.rst +++ b/docs/monitoring.rst @@ -7,10 +7,6 @@ Monitoring overview The :ref:`CrateDB Admin UI ` comes with a *monitoring overview* screen that allows you to monitor key operational statistics. -.. NOTE:: - - The monitoring overview is an `enterprise feature`_. - .. rubric:: Table of contents .. contents:: @@ -70,7 +66,6 @@ The monitoring page has two live charts: .. _DELETE: https://crate.io/docs/crate/reference/en/latest/sql/statements/delete.html -.. _enterprise feature: https://crate.io/docs/crate/reference/en/latest/enterprise/index.html .. _INSERT: https://crate.io/docs/crate/reference/en/latest/sql/statements/insert.html .. _SELECT: https://crate.io/docs/crate/reference/en/latest/sql/statements/select.html .. _UPDATE: https://crate.io/docs/crate/reference/en/latest/sql/statements/update.html diff --git a/docs/privileges.rst b/docs/privileges.rst index 53828e8fe..c215a6512 100644 --- a/docs/privileges.rst +++ b/docs/privileges.rst @@ -7,10 +7,6 @@ Privileges browser The :ref:`CrateDB Admin UI ` comes with a *privileges browser* that allows you to inspect `users`_ and `privileges`_. -.. NOTE:: - - The privileges browser is an `enterprise feature`_. - .. rubric:: Table of contents .. contents:: @@ -61,7 +57,6 @@ Features privileges with an column value that matches the entered text. -.. _enterprise feature: https://crate.io/docs/crate/reference/en/latest/enterprise/index.html .. _privileges: https://crate.io/docs/crate/reference/en/latest/admin/privileges.html .. _user administration: https://crate.io/docs/crate/reference/en/latest/admin/user-management.html .. _user: https://crate.io/docs/crate/reference/en/latest/admin/user-management.html diff --git a/docs/shards.rst b/docs/shards.rst index 3032ec4bd..912e3709f 100644 --- a/docs/shards.rst +++ b/docs/shards.rst @@ -7,10 +7,6 @@ Shards browser The :ref:`CrateDB Admin UI ` comes with a *shards browser* that provides you with a visual overview of all the `shards`_ in your cluster. -.. NOTE:: - - The shards browser is an `enterprise feature`_. - .. rubric:: Table of contents .. contents:: @@ -95,6 +91,5 @@ Features .. _BLOB tables: https://crate.io/docs/crate/reference/en/latest/general/blobs.html .. _document tables: https://crate.io/docs/crate/reference/en/latest/general/ddl/create-table.html -.. _enterprise feature: https://crate.io/docs/crate/reference/en/latest/enterprise/index.html .. _replica: https://crate.io/docs/crate/reference/en/latest/general/ddl/replication.html .. _shards: https://crate.io/docs/crate/reference/en/latest/general/ddl/sharding.html diff --git a/webpack.dev.config.js b/webpack.dev.config.js index 7995cf9ff..a970ae4af 100644 --- a/webpack.dev.config.js +++ b/webpack.dev.config.js @@ -15,7 +15,6 @@ module.exports = { entry: { 'vendor': './app/vendor.module.js', 'app': './app/app.module.js', - 'enterprise': './app/enterprise.module.js' }, output: { filename: 'static/libs/[name].bundle.js', @@ -30,7 +29,6 @@ module.exports = { template: './app/index.tpl.html', inject: 'head', filename: 'index.html', - excludeAssets: [/enterprise.css/] }), new CopyWebpackPlugin([ { diff --git a/webpack.prod.config.js b/webpack.prod.config.js index f76807142..1d624f7cb 100644 --- a/webpack.prod.config.js +++ b/webpack.prod.config.js @@ -14,7 +14,6 @@ module.exports = { entry: { 'vendor': './app/vendor.module.js', 'app': './app/app.module.js', - 'enterprise': './app/enterprise.module.js' }, output: { filename: 'static/libs/[name].bundle.js', @@ -29,7 +28,6 @@ module.exports = { template: './app/index.tpl.html', inject: 'head', filename: 'index.html', - excludeAssets: [/enterprise.css/] }), new CopyWebpackPlugin([ {