Repository: ignite Updated Branches: refs/heads/master a7651b2f0 -> 56ba0a52d
IGNITE-8267 Web console: Adjusted UI for connector configuration fields. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/56ba0a52 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/56ba0a52 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/56ba0a52 Branch: refs/heads/master Commit: 56ba0a52de2bf6e0227d96294a0c613911fc1228 Parents: a7651b2 Author: Ilya Borisov <[email protected]> Authored: Thu Apr 26 23:57:06 2018 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Thu Apr 26 23:57:06 2018 +0700 ---------------------------------------------------------------------- .../templates/client-connector.pug | 10 +++--- .../cluster-edit-form/templates/igfs.pug | 34 -------------------- .../cluster-edit-form/templates/odbc.pug | 14 ++++---- .../templates/sql-connector.pug | 10 +++--- 4 files changed, 17 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/56ba0a52/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/client-connector.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/client-connector.pug b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/client-connector.pug index d27fa14..620137b 100644 --- a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/client-connector.pug +++ b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/client-connector.pug @@ -29,17 +29,17 @@ panel-collapsible(ng-show='$ctrl.available("2.3.0")' ng-form=form on-open=`ui.lo .pca-form-column-6.pc-form-grid-row .pc-form-grid-col-60 +checkbox('Enabled', connectionEnabled, '"ClientConnectorEnabled"', 'Flag indicating whether to configure client connector configuration') - .pc-form-grid-col-40 + .pc-form-grid-col-60 +text-enabled('Host:', `${connectionModel}.host`, '"ClientConnectorHost"', connectionEnabled, 'false', 'localhost') - .pc-form-grid-col-20 + .pc-form-grid-col-30 +number('Port:', `${connectionModel}.port`, '"ClientConnectorPort"', connectionEnabled, '10800', '1025') - .pc-form-grid-col-20 + .pc-form-grid-col-30 +number('Port range:', `${connectionModel}.portRange`, '"ClientConnectorPortRange"', connectionEnabled, '100', '0') - .pc-form-grid-col-20 + .pc-form-grid-col-30 +number('Socket send buffer size:', `${connectionModel}.socketSendBufferSize`, '"ClientConnectorSocketSendBufferSize"', connectionEnabled, '0', '0', 'Socket send buffer size<br/>\ When set to <b>0</b>, operation system default will be used') - .pc-form-grid-col-20 + .pc-form-grid-col-30 +number('Socket receive buffer size:', `${connectionModel}.socketReceiveBufferSize`, '"ClientConnectorSocketReceiveBufferSize"', connectionEnabled, '0', '0', 'Socket receive buffer size<br/>\ When set to <b>0</b>, operation system default will be used') http://git-wip-us.apache.org/repos/asf/ignite/blob/56ba0a52/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/igfs.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/igfs.pug b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/igfs.pug deleted file mode 100644 index c1216a2..0000000 --- a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/igfs.pug +++ /dev/null @@ -1,34 +0,0 @@ -//- - 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. - -include /app/helpers/jade/mixins - --var form = 'igfs' --var model = '$ctrl.clonedCluster' - -panel-collapsible(ng-form=form on-open=`ui.loadPanel('${form}')`) - panel-title IGFS - panel-description - | IGFS (Ignite In-Memory File System) configurations assigned to cluster. - | #[a.link-success(href="https://apacheignite-fs.readme.io/docs/in-memory-file-system"; target="_blank") More info] - panel-content.pca-form-row(ng-if=`ui.isPanelLoaded('${form}')`) - .pca-form-column-6 - .settings-row - +dropdown-multiple('<span>IGFS:</span><a ui-sref="base.configuration.edit.advanced.igfs({linkId: linkId()})"> (add)</a>', - `${model}.igfss`, '"igfss"', true, 'Choose IGFS', 'No IGFS configured', 'igfss', - 'Select IGFS to start in cluster or add a new IGFS') - .pca-form-column-6 - +preview-xml-java(model, 'igfss', 'igfss') http://git-wip-us.apache.org/repos/asf/ignite/blob/56ba0a52/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/odbc.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/odbc.pug b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/odbc.pug index 74b1f02..481a9aa 100644 --- a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/odbc.pug +++ b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/odbc.pug @@ -30,8 +30,8 @@ panel-collapsible( | ODBC server configuration. | #[a.link-success(href="https://apacheignite.readme.io/docs/odbc-driver"; target="_blank") More info] panel-content.pca-form-row(ng-if=`$ctrl.available(["1.0.0", "2.1.0"]) && ui.isPanelLoaded('${form}')`) - .pca-form-column-6 - .settings-row + .pca-form-column-6.pc-form-grid-row + .pc-form-grid-col-60 +sane-form-field-checkbox({ label: 'Enabled', model: enabled, @@ -44,7 +44,7 @@ panel-collapsible( ui-validate-watch='$ctrl.Clusters.odbc.odbcEnabled.correctMarshallerWatch("$ctrl.clonedCluster")' ) +form-field-feedback(null, 'correctMarshaller', 'ODBC can only be used with BinaryMarshaller') - .settings-row + .pc-form-grid-col-60 +text-ip-address-with-port-range('ODBC endpoint address:', `${model}.endpointAddress`, '"endpointAddress"', enabled, '0.0.0.0:10800..10810', 'ODBC endpoint address. <br/>\ The following address formats are permitted:\ @@ -53,17 +53,17 @@ panel-collapsible( <li>hostname:port - will use provided hostname and port</li>\ <li>hostname:port_from..port_to - will use provided hostname and port range</li>\ </ul>') - .settings-row + .pc-form-grid-col-30 +number('Send buffer size:', `${model}.socketSendBufferSize`, '"ODBCSocketSendBufferSize"', enabled, '0', '0', 'Socket send buffer size.<br/>\ When set to <b>0</b>, operation system default will be used') - .settings-row + .pc-form-grid-col-30 +number('Socket receive buffer size:', `${model}.socketReceiveBufferSize`, '"ODBCSocketReceiveBufferSize"', enabled, '0', '0', 'Socket receive buffer size.<br/>\ When set to <b>0</b>, operation system default will be used') - .settings-row + .pc-form-grid-col-30 +number('Maximum open cursors', `${model}.maxOpenCursors`, '"maxOpenCursors"', enabled, '128', '1', 'Maximum number of opened cursors per connection') - .settings-row + .pc-form-grid-col-30 +number('Pool size:', `${model}.threadPoolSize`, '"ODBCThreadPoolSize"', enabled, 'max(8, availableProcessors)', '1', 'Size of thread pool that is in charge of processing ODBC tasks') .pca-form-column-6 http://git-wip-us.apache.org/repos/asf/ignite/blob/56ba0a52/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/sql-connector.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/sql-connector.pug b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/sql-connector.pug index 2e61fc2..708aa0d 100644 --- a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/sql-connector.pug +++ b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/sql-connector.pug @@ -32,17 +32,17 @@ panel-collapsible( .pca-form-column-6.pc-form-grid-row .pc-form-grid-col-60 +checkbox('Enabled', connectionEnabled, '"SqlConnectorEnabled"', 'Flag indicating whether to configure SQL connector configuration') - .pc-form-grid-col-40 + .pc-form-grid-col-60 +text-enabled('Host:', `${connectionModel}.host`, '"SqlConnectorHost"', connectionEnabled, 'false', 'localhost') - .pc-form-grid-col-20 + .pc-form-grid-col-30 +number('Port:', `${connectionModel}.port`, '"SqlConnectorPort"', connectionEnabled, '10800', '1025') - .pc-form-grid-col-20 + .pc-form-grid-col-30 +number('Port range:', `${connectionModel}.portRange`, '"SqlConnectorPortRange"', connectionEnabled, '100', '0') - .pc-form-grid-col-20 + .pc-form-grid-col-30 +number('Socket send buffer size:', `${connectionModel}.socketSendBufferSize`, '"SqlConnectorSocketSendBufferSize"', connectionEnabled, '0', '0', 'Socket send buffer size.<br/>\ When set to <b>0</b>, operation system default will be used') - .pc-form-grid-col-20 + .pc-form-grid-col-30 +number('Socket receive buffer size:', `${connectionModel}.socketReceiveBufferSize`, '"SqlConnectorSocketReceiveBufferSize"', connectionEnabled, '0', '0', 'Socket receive buffer size.<br/>\ When set to <b>0</b>, operation system default will be used')
