Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 46AF018856 for ; Sat, 20 Feb 2016 07:42:57 +0000 (UTC) Received: (qmail 13707 invoked by uid 500); 20 Feb 2016 07:42:57 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 13616 invoked by uid 500); 20 Feb 2016 07:42:57 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 13492 invoked by uid 99); 20 Feb 2016 07:42:57 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Feb 2016 07:42:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D2228E0C6F; Sat, 20 Feb 2016 07:42:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Date: Sat, 20 Feb 2016 07:43:03 -0000 Message-Id: <0313e53a8709490198f269366132b79b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [8/8] ignite git commit: IGNITE-2612 WIP reworking caches screen to Angular directives. IGNITE-2612 WIP reworking caches screen to Angular directives. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b5aaa23a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b5aaa23a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b5aaa23a Branch: refs/heads/ignite-2612 Commit: b5aaa23a6aea1102319649b4076254312c4c2963 Parents: 7d33af3 Author: Alexey Kuznetsov Authored: Sat Feb 20 14:43:15 2016 +0700 Committer: Alexey Kuznetsov Committed: Sat Feb 20 14:43:15 2016 +0700 ---------------------------------------------------------------------- .../advanced-options-hide.directive.js | 26 ++++++++++++++++++++ .../advanced-options/advanced-options-hide.jade | 19 ++++++++++++++ .../advanced-options-toggle.directive.js | 26 ++++++++++++++++++++ .../advanced-options-toggle.jade | 19 ++++++++++++++ .../control-center-web/src/main/js/app/index.js | 4 +++ .../app/modules/states/configuration.state.js | 8 ++++++ .../caches/concurrency.directive.js | 2 +- .../configuration/caches/concurrency.jade | 6 ++--- .../states/configuration/caches/memory.jade | 6 ++--- .../configuration/caches/query.directive.js | 2 +- .../states/configuration/caches/query.jade | 6 ++--- .../configuration/caches/store.directive.js | 2 +- .../states/configuration/caches/store.jade | 6 ++--- .../src/main/js/views/configuration/caches.jade | 14 ++++++++--- .../main/js/views/configuration/clusters.jade | 12 +++------ 15 files changed, 131 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-hide.directive.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-hide.directive.js b/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-hide.directive.js new file mode 100644 index 0000000..9a136ec --- /dev/null +++ b/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-hide.directive.js @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import template from './advanced-options-hide.jade!'; + +export default ['igniteAdvancedOptionsHide', [() => { + return { + restrict: 'E', + template, + replace: true + }; +}]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-hide.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-hide.jade b/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-hide.jade new file mode 100644 index 0000000..355f209 --- /dev/null +++ b/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-hide.jade @@ -0,0 +1,19 @@ +//- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +.advanced-options + i.fa.fa-chevron-circle-down(ng-click='ui.expanded = !ui.expanded') + a(ng-click='ui.expanded = !ui.expanded') Hide advanced settings... http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-toggle.directive.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-toggle.directive.js b/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-toggle.directive.js new file mode 100644 index 0000000..651e714 --- /dev/null +++ b/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-toggle.directive.js @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import template from './advanced-options-toggle.jade!'; + +export default ['igniteAdvancedOptionsToggle', [() => { + return { + restrict: 'E', + template, + replace: true + }; +}]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-toggle.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-toggle.jade b/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-toggle.jade new file mode 100644 index 0000000..7a2b197 --- /dev/null +++ b/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-toggle.jade @@ -0,0 +1,19 @@ +//- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +.advanced-options + i.fa(ng-click='toggleExpanded()' ng-class='ui.expanded ? "fa-chevron-circle-down" : "fa-chevron-circle-right"') + a(ng-click='toggleExpanded()') {{ui.expanded ? 'Hide advanced settings...' : 'Show advanced settings...'}} http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/index.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/index.js b/modules/control-center-web/src/main/js/app/index.js index fca3027..c889a61 100644 --- a/modules/control-center-web/src/main/js/app/index.js +++ b/modules/control-center-web/src/main/js/app/index.js @@ -81,6 +81,8 @@ import './modules/Version/Version.provider'; // endignite // Directives. +import igniteAdvancedOptionsHide from './directives/advanced-options/advanced-options-hide.directive'; +import igniteAdvancedOptionsToggle from './directives/advanced-options/advanced-options-toggle.directive'; import igniteLoading from './directives/loading/loading.directive'; import igniteInformation from './directives/information/information.directive'; import igniteUiAce from './directives/ui-ace/ui-ace.directive'; @@ -130,6 +132,8 @@ angular 'ignite-console.version' ]) // Directives. +.directive(...igniteAdvancedOptionsHide) +.directive(...igniteAdvancedOptionsToggle) .directive(...igniteLoading) .directive(...igniteInformation) .directive(...igniteUiAce) http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js b/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js index 83f5641..c2cc37a 100644 --- a/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js +++ b/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js @@ -45,6 +45,10 @@ import clustersTransactions from './configuration/clusters/transactions.directiv // Caches screen. import cachesGeneral from './configuration/caches/general.directive'; +import cachesMemory from './configuration/caches/memory.directive'; +import cachesQuery from './configuration/caches/query.directive'; +import cachesStore from './configuration/caches/store.directive'; +import cachesConcurrency from './configuration/caches/concurrency.directive'; // Summary screen. import ConfigurationSummaryCtrl from './configuration/summary/summary.controller'; @@ -82,6 +86,10 @@ angular .directive(...clustersGeneralDiscoveryVm) // Caches screen .directive(...cachesGeneral) +.directive(...cachesMemory) +.directive(...cachesQuery) +.directive(...cachesStore) +.directive(...cachesConcurrency) // Summary screen .directive(...summaryTabs) // Services. http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.directive.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.directive.js b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.directive.js index fcf0877..0e00a4b 100644 --- a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.directive.js +++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.directive.js @@ -17,7 +17,7 @@ import template from './concurrency.jade!'; -export default ['igniteConfigurationCachesGeneral', [() => { +export default ['igniteConfigurationCachesConcurrency', [() => { return { scope: true, restrict: 'E', http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.jade index 689b036..f0b8370 100644 --- a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.jade +++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.jade @@ -16,12 +16,12 @@ - var model = 'backupItem' -form.panel.panel-default(name='general' novalidate) +form.panel.panel-default(name='concurrency' novalidate) .panel-heading(bs-collapse-toggle) ignite-form-panel-chevron - label General + label Concurrency control ignite-form-revert - .panel-collapse(role='tabpanel' bs-collapse-target id='general') + .panel-collapse(role='tabpanel' bs-collapse-target id='concurrency') .panel-body .col-sm-6 .settings-row http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.jade index 689b036..e073dcd 100644 --- a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.jade +++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.jade @@ -16,12 +16,12 @@ - var model = 'backupItem' -form.panel.panel-default(name='general' novalidate) +form.panel.panel-default(name='memory' novalidate) .panel-heading(bs-collapse-toggle) ignite-form-panel-chevron - label General + label Memory ignite-form-revert - .panel-collapse(role='tabpanel' bs-collapse-target id='general') + .panel-collapse(role='tabpanel' bs-collapse-target id='memory') .panel-body .col-sm-6 .settings-row http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.directive.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.directive.js b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.directive.js index 25e958c..b3b6edb 100644 --- a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.directive.js +++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.directive.js @@ -17,7 +17,7 @@ import template from './query.jade!'; -export default ['igniteConfigurationCachesMemory', [() => { +export default ['igniteConfigurationCachesQuery', [() => { return { scope: true, restrict: 'E', http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.jade index 689b036..6bb78c1 100644 --- a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.jade +++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.jade @@ -16,12 +16,12 @@ - var model = 'backupItem' -form.panel.panel-default(name='general' novalidate) +form.panel.panel-default(name='query' novalidate) .panel-heading(bs-collapse-toggle) ignite-form-panel-chevron - label General + label Queries & Indexing ignite-form-revert - .panel-collapse(role='tabpanel' bs-collapse-target id='general') + .panel-collapse(role='tabpanel' bs-collapse-target id='query') .panel-body .col-sm-6 .settings-row http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.directive.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.directive.js b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.directive.js index 4964a7e..168eb85 100644 --- a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.directive.js +++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.directive.js @@ -17,7 +17,7 @@ import template from './store.jade!'; -export default ['igniteConfigurationCachesMemory', [() => { +export default ['igniteConfigurationCachesStore', [() => { return { scope: true, restrict: 'E', http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.jade index 689b036..f335184 100644 --- a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.jade +++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.jade @@ -16,12 +16,12 @@ - var model = 'backupItem' -form.panel.panel-default(name='general' novalidate) +form.panel.panel-default(name='store' novalidate) .panel-heading(bs-collapse-toggle) ignite-form-panel-chevron - label General + label Store ignite-form-revert - .panel-collapse(role='tabpanel' bs-collapse-target id='general') + .panel-collapse(role='tabpanel' bs-collapse-target id='store') .panel-body .col-sm-6 .settings-row http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/views/configuration/caches.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/caches.jade b/modules/control-center-web/src/main/js/views/configuration/caches.jade index 4c10464..62d4da2 100644 --- a/modules/control-center-web/src/main/js/views/configuration/caches.jade +++ b/modules/control-center-web/src/main/js/views/configuration/caches.jade @@ -37,8 +37,14 @@ include ../includes/infos ignite-configuration-caches-memory ignite-configuration-caches-query ignite-configuration-caches-store - ignite-configuration-caches-concurrency - ignite-configuration-caches-rebalance - ignite-configuration-caches-server-near-cache - ignite-configuration-caches-statistics + + ignite-advanced-options-toggle + + div(ng-show='ui.expanded') + ignite-configuration-caches-concurrency + ignite-configuration-caches-rebalance + ignite-configuration-caches-server-near-cache + ignite-configuration-caches-statistics + + ignite-advanced-options-hide http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/views/configuration/clusters.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/clusters.jade b/modules/control-center-web/src/main/js/views/configuration/clusters.jade index da32e0d..3a6ab07 100644 --- a/modules/control-center-web/src/main/js/views/configuration/clusters.jade +++ b/modules/control-center-web/src/main/js/views/configuration/clusters.jade @@ -53,11 +53,9 @@ include ../includes/infos form.form-horizontal(name='ui.inputForm' ng-show='contentVisible()' novalidate) .panel-group(ng-click='triggerDigest = true') ignite-configuration-clusters-general - .advanced-options - i.fa( - ng-click='toggleExpanded()' - ng-class='ui.expanded ? "fa-chevron-circle-down" : "fa-chevron-circle-right"') - a(ng-click='toggleExpanded()') {{ui.expanded ? 'Hide advanced settings...' : 'Show advanced settings...'}} + + ignite-advanced-options-toggle + div(ng-show='ui.expanded') ignite-configuration-clusters-atomic ignite-configuration-clusters-binary @@ -75,6 +73,4 @@ include ../includes/infos ignite-configuration-clusters-thread ignite-configuration-clusters-transactions - .advanced-options - i.fa.fa-chevron-circle-down(ng-click='ui.expanded = !ui.expanded') - a(ng-click='ui.expanded = !ui.expanded') Hide advanced settings... + ignite-advanced-options-hide