graphdb-workbench 2.3.1 → 2.4.0-TR1

package/dist/pages/autocomplete.html

@@ -1,4 +1,4 @@
-<link href="css/autocomplete.css?v=2.3.1" rel="stylesheet">
+<link href="css/autocomplete.css?v=2.4.0-TR1" rel="stylesheet">
 <div id="autocomplete" class="page">
 	<h1>
 		{{title}}

package/dist/pages/choose-repository-type.html

@@ -1,4 +1,4 @@
-<link href="css/repository.create.css?v=2.3.1" rel="stylesheet">
+<link href="css/repository.create.css?v=2.4.0-TR1" rel="stylesheet">
 
 <div>
     <h1 class="mb-3">{{pageTitle}}</h1>

package/dist/pages/cluster-management/clusterInfo.html

@@ -1,6 +1,6 @@
-<link href="css/clustermanagement.css?v=2.3.1" rel="stylesheet"/>
-<link href="css/rdf-details-side-panel.css?v=2.3.1" rel="stylesheet"/>
-<link href="js/lib/d3-tip/d3-tip.css?v=2.3.1" rel="stylesheet"/>
+<link href="css/clustermanagement.css?v=2.4.0-TR1" rel="stylesheet"/>
+<link href="css/rdf-details-side-panel.css?v=2.4.0-TR1" rel="stylesheet"/>
+<link href="js/lib/d3-tip/d3-tip.css?v=2.4.0-TR1" rel="stylesheet"/>
 
 <title>{{'view.clusterManagement.title' | translate}}</title>
 
@@ -23,22 +23,24 @@
 
 <div class="clearfix mb-2 d-flex" ng-if="!loader && clusterConfiguration">
     <div class="action-buttons">
-        <button type="button" class="btn btn-secondary delete-cluster-btn mr-2"
-                ng-click="showDeleteDialog()"
-                gdb-tooltip="{{'cluster_management.buttons.delete_cluster_tooltip' | translate}}"
-                tooltip-placement="bottom">
-            <span class="icon-trash"></span> {{'cluster_management.buttons.delete_cluster' | translate}}
-        </button>
-        <button type="button" class="btn btn-primary add-node-btn" ng-if="currentLeader"
-                ng-click="showAddNodeToClusterDialog()"
-                gdb-tooltip="{{'cluster_management.buttons.add_nodes_btn_tooltip' | translate}}" tooltip-placement="bottom">
-            <span class="icon-plus"></span> {{'cluster_management.buttons.add_nodes_btn' | translate}}
-        </button>
-        <button type="button" class="btn btn-secondary remove-node-btn mr-2" ng-if="currentLeader"
-                ng-click="showRemoveNodesFromClusterDialog()"
-                gdb-tooltip="{{'cluster_management.buttons.remove_nodes_btn_tooltip' | translate}}" tooltip-placement="bottom">
-            <span class="icon-minus"></span> {{'cluster_management.buttons.remove_nodes_btn' | translate}}
-        </button>
+        <div ng-if="isAdmin()" class="buttons-wrapper">
+            <button type="button" class="btn btn-secondary delete-cluster-btn mr-2"
+                    ng-click="showDeleteDialog()"
+                    gdb-tooltip="{{'cluster_management.buttons.delete_cluster_tooltip' | translate}}"
+                    tooltip-placement="bottom">
+                <span class="icon-trash"></span> {{'cluster_management.buttons.delete_cluster' | translate}}
+            </button>
+            <button type="button" class="btn btn-primary add-node-btn" ng-if="currentLeader"
+                    ng-click="showAddNodeToClusterDialog()"
+                    gdb-tooltip="{{'cluster_management.buttons.add_nodes_btn_tooltip' | translate}}" tooltip-placement="bottom">
+                <span class="icon-plus"></span> {{'cluster_management.buttons.add_nodes_btn' | translate}}
+            </button>
+            <button type="button" class="btn btn-secondary remove-node-btn mr-2" ng-if="currentLeader"
+                    ng-click="showRemoveNodesFromClusterDialog()"
+                    gdb-tooltip="{{'cluster_management.buttons.remove_nodes_btn_tooltip' | translate}}" tooltip-placement="bottom">
+                <span class="icon-minus"></span> {{'cluster_management.buttons.remove_nodes_btn' | translate}}
+            </button>
+        </div>
     </div>
     <button class="btn btn-link"
             ng-click="toggleSidePanel()"
@@ -96,8 +98,8 @@
         <h3 class="hovered-parent">
             {{'cluster_management.cluster_configuration.label' | translate}}
         </h3>
-        <div class="mb-2">
-            <button type="button" class="btn btn-primary delete-cluster-btn"
+        <div class="mb-2" ng-if="isAdmin()">
+            <button type="button" class="btn btn-primary edit-cluster-configuration"
                     ng-if="currentNode.nodeState === NodeState.LEADER"
                     ng-click="showEditConfigurationDialog()"
                     gdb-tooltip="{{'cluster_management.buttons.edit_cluster_tooltip' | translate}}"
@@ -108,7 +110,8 @@
         <div class="datasource mb-1">
             <div class="item clearfix break-word-alt small">
                 {{'cluster_management.cluster_configuration_properties.election_min_timeout' | translate}}
-                <em class="icon-info text-primary" gdb-tooltip="{{'cluster_management.cluster_configuration_properties.election_min_timeout_tooltip' | translate}}"></em>
+                <em class="icon-info text-primary"
+                    gdb-tooltip="{{'cluster_management.cluster_configuration_properties.election_min_timeout_tooltip' | translate}}"></em>
             </div>
             <div class="data-value">
                 <span>{{clusterConfiguration.electionMinTimeout | number}}</span>
@@ -117,7 +120,8 @@
         <div class="datasource mb-1">
             <div class="item clearfix break-word-alt small">
                 {{'cluster_management.cluster_configuration_properties.election_range_timeout' | translate}}
-                <em class="icon-info text-primary" gdb-tooltip="{{'cluster_management.cluster_configuration_properties.election_range_timeout_tooltip' | translate}}"></em>
+                <em class="icon-info text-primary"
+                    gdb-tooltip="{{'cluster_management.cluster_configuration_properties.election_range_timeout_tooltip' | translate}}"></em>
             </div>
             <div class="data-value">
                 <span>{{clusterConfiguration.electionRangeTimeout | number}}</span>
@@ -126,7 +130,8 @@
         <div class="datasource mb-1">
             <div class="item clearfix break-word-alt small">
                 {{'cluster_management.cluster_configuration_properties.heartbeat_interval' | translate}}
-                <em class="icon-info text-primary" gdb-tooltip="{{'cluster_management.cluster_configuration_properties.heartbeat_interval_tooltip' | translate}}"></em>
+                <em class="icon-info text-primary"
+                    gdb-tooltip="{{'cluster_management.cluster_configuration_properties.heartbeat_interval_tooltip' | translate}}"></em>
             </div>
             <div class="data-value">
                 <span>{{clusterConfiguration.heartbeatInterval | number}}</span>
@@ -135,7 +140,8 @@
         <div class="datasource mb-1">
             <div class="item clearfix break-word-alt small">
                 {{'cluster_management.cluster_configuration_properties.message_size_kb' | translate}}
-                <em class="icon-info text-primary" gdb-tooltip="{{'cluster_management.cluster_configuration_properties.message_size_kb_tooltip' | translate}}"></em>
+                <em class="icon-info text-primary"
+                    gdb-tooltip="{{'cluster_management.cluster_configuration_properties.message_size_kb_tooltip' | translate}}"></em>
             </div>
             <div class="data-value">
                 <span>{{clusterConfiguration.messageSizeKB | number}}</span>
@@ -144,7 +150,8 @@
         <div class="datasource mb-1">
             <div class="item clearfix break-word-alt small">
                 {{'cluster_management.cluster_configuration_properties.verification_timeout' | translate}}
-                <em class="icon-info text-primary" gdb-tooltip="{{'cluster_management.cluster_configuration_properties.verification_timeout_tooltip' | translate}}"></em>
+                <em class="icon-info text-primary"
+                    gdb-tooltip="{{'cluster_management.cluster_configuration_properties.verification_timeout_tooltip' | translate}}"></em>
             </div>
             <div class="data-value">
                 <span>{{clusterConfiguration.verificationTimeout | number}}</span>
@@ -154,7 +161,8 @@
         <ul>
             <li ng-repeat="node in clusterModel.nodes">
                 <a class="data-value" href="{{node.endpoint}}" target="_blank">{{node.endpoint}}</a>
-                <div class="small">{{ 'cluster_management.cluster_status.node.rpc_address' | translate }}: <span class="data-value">{{node.address}}</span></div>
+                <div class="small">{{ 'cluster_management.cluster_status.node.rpc_address' | translate }}: <span class="data-value">{{node.address}}</span>
+                </div>
                 <div class="small">{{ 'cluster_management.cluster_status.node.state' | translate }}: <span class="data-value">{{node.nodeState}}</span></div>
             </li>
         </ul>

package/dist/pages/create-index.html

@@ -1,16 +1,9 @@
-<link href="css/lib/angular-xeditable/xeditable.min.css?v=2.3.1" rel="stylesheet">
-
-<link href="css/lib/yasqe.min.css?v=2.3.1" rel="stylesheet"/>
-
-<link href="css/new-sparql.css?v=2.3.1" rel="stylesheet"/>
-
-<link href="css/graphs-config.css?v=2.3.1" rel="stylesheet"/>
-
+<link href="css/create-similarity-index.css?v=2.4.0-TR1" rel="stylesheet">
 
 <div class="container-fluid">
 
     <h1>
-        {{editSearchQuery ? (viewType === 'text' ? 'edit.search.query':(page === 2 ? 'edit.search.query' : 'edit.analogical.query')) : title | translate}}
+        {{isEditViewMode() ? (similarityIndexInfo.isSearchQueryTypeSelected() ? 'edit.search.query' : (similarityIndexInfo.isAnalogicalQueryTypeSelected() ? 'edit.analogical.query' : 'edit.select.query')) : title | translate}}
         <span ng-hide="editSearchQuery" class="btn btn-link"
               uib-popover-template="'js/angular/templates/titlePopoverTemplate.html'"
               popover-trigger="mouseenter"
@@ -19,193 +12,273 @@
     </h1>
     <div core-errors></div>
     <div system-repo-warning></div>
-    <div class="alert alert-danger" ng-show="repositoryError">
+    <div class="alert alert-danger" ng-if="repositoryError">
         <p>{{'current.repo.error' | translate}}</p>
 
         <p>{{repositoryError}}</p>
     </div>
 
-    <ul ng-hide="editSearchQuery" class="nav nav-tabs mb-2">
-        <li class="nav-item" id="create-text-index"><a class="nav-link" ng-class="viewType == 'text' ? 'active' : ''" href ng-click="viewType = 'text'"
-                data-toggle="tab">{{'text.similarity.index' | translate}}</a></li>
-        <li class="nav-item" id="create-predication-index"><a class="nav-link" ng-class="viewType == 'predication' ? 'active' : ''" href ng-click="viewType = 'predication'" data-toggle="tab">
-            {{'predication.index' | translate}}</a></li>
-    </ul>
-    <div class="card mb-2">
-      <div class="card-block pt-1">
-        <p class="lead">{{'index.name' | translate}}</p>
-        <div class="input-group input-group-lg">
-          <input ng-disabled="editSearchQuery" required class="form-control similarity-index-name" type="text" placeholder="{{'my.index.name.required' | translate}}" ng-model="newIndex.name">
-        </div>
-        <div style="margin-top: 5px" ng-show="invalidIndexName" class="idError alert alert-danger">{{invalidIndexName}}</div>
+    <div ng-if="similarityIndexInfo">
+        <ul ng-if="!isEditViewMode()" class="nav nav-tabs mb-2">
+            <li class="nav-item" id="create-text-index">
+                <a class="nav-link" ng-class="similarityIndexInfo.isTextType() || similarityIndexInfo.isTextLiteralType() ? 'active' : ''" href ng-click="changeSimilarityIndexType(SimilarityIndexType.TEXT)" data-toggle="tab">
+                    {{'text.similarity.index' | translate}}
+                </a>
+            </li>
+            <li class="nav-item" id="create-predication-index">
+                <a class="nav-link" ng-class="similarityIndexInfo.isPredicationType() ? 'active' : ''" href ng-click="changeSimilarityIndexType(SimilarityIndexType.PREDICATION)"
+                   data-toggle="tab">
+                    {{'predication.index' | translate}}
+                </a>
+            </li>
+        </ul>
+        <div class="card mb-2">
+            <div class="card-block pt-1">
+                <p class="lead">{{'index.name' | translate}}</p>
+                <div class="input-group input-group-lg">
+                    <input required
+                           class="form-control similarity-index-name"
+                           type="text"
+                           placeholder="{{'my.index.name.required' | translate}}"
+                           ng-model="similarityIndexInfo.similarityIndex.name"
+                           ng-disabled="isEditViewMode()"
+                           ng-change="similarityIndexNameChanged()">
+                </div>
 
-        <button ng-hide="editSearchQuery" class="btn btn-link btn-sm mt-1 px-0 collapsed more-options-btn" data-toggle="collapse" data-target="#more-options">{{'more.options.label' | translate}} <span class="icon-caret-up"></span></button>
+                <div ng-if="saveOrUpdateExecuted">
+                    <div ng-if="!similarityIndexInfo.hasName()" class="idError alert alert-danger mt-1">
+                        {{'similarity.empty.index.name.error' | translate}}
+                    </div>
+                    <div ng-if="similarityIndexInfo.hasName() && !similarityIndexInfo.isNameValid()" class="idError alert alert-danger mt-1">
+                        {{'similarity.index.name.constraint' | translate}}
+                    </div>
+                    <div ng-if="similarityIndexInfo.isNameExist" class="idError alert alert-danger mt-1">
+                        {{'similarity.existing.index.name.error' | translate}}
+                    </div>
+                </div>
 
-        <div class="collapse mt-1" id="more-options" >
+                <button ng-if="!isEditViewMode()"
+                        class="btn btn-link btn-sm mt-1 px-0 collapsed more-options-btn"
+                        data-toggle="collapse"
+                        data-target="#more-options">
+                    {{'more.options.label' | translate}} <span class="icon-caret-up"></span>
+                </button>
 
-          <div class="form-group row">
-                <label for="indexParameters" class="col-md-4 col-form-label">{{'semantic.vectors.index.params' | translate}}</label>
-                <div class="col-md-8">
-      <input class="form-control" type="text" ng-model="newIndex.options" id="indexParameters" placeholder="-vectortype binary">
-                    <div class="small text-muted" style="margin-top: 0.5rem">{{'see.full.label' | translate}} <a href="http://graphdb.ontotext.com/documentation/{{info.productShortVersion}}/semantic-similarity-searches.html#create-index-parameters" rel="noopener" target="_blank">{{'list.of.supported.params' | translate}}</a></div>
-                </div>
-            </div>
+                <div id="more-options" class="collapse mt-1">
+                    <div class="form-group row">
+                        <label for="indexParameters" class="col-md-4 col-form-label">{{'semantic.vectors.index.params' | translate}}</label>
+                        <div class="col-md-8">
+                            <input class="form-control"
+                                   type="text"
+                                   ng-model="similarityIndexInfo.similarityIndex.options"
+                                   id="indexParameters"
+                                   ng-change="setDirty()"
+                                   placeholder="-vectortype binary">
+                            <div class="small text-muted mt-1">
+                                {{'see.full.label' | translate}}
+                                <a href="http://graphdb.ontotext.com/documentation/{{productInfo.productShortVersion}}/semantic-similarity-searches.html#create-index-parameters"
+                                   rel="noopener" target="_blank">
+                                    {{'list.of.supported.params' | translate}}
+                                </a>
+                            </div>
+                        </div>
+                    </div>
 
-          <div class="form-group row" ng-show="viewType == 'text'">
-            <label class="col-md-4 col-form-label">{{'stop.words' | translate}}</label>
-            <div class="col-md-8">
-              <input class="form-control stop-words" type="text" placeholder="{{'default.lucene.stop.list' | translate}}" ng-model="newIndex.stopList">
-            </div>
-          </div>
-          <div class="form-group row" ng-show="viewType == 'text'">
-              <label class="col-md-4 col-form-label">{{'analyzer.class' | translate}}</label>
-              <div class="col-md-8">
-                  <input class="form-control analyzer-class" type="text" ng-model="newIndex.analyzer">
-              </div>
-          </div>
-            <div class="checkbox offset-xs-3 offset-md-4" ng-show="viewType == 'text'">
-                <label class="col-xs-6 col-md-6"
-                       gdb-tooltip="{{'literal.index.input' | translate}}"
-                       tooltip-placement="bottom">
-                    <input type="checkbox" class="literal-index" ng-true-value="'true'" ng-false-value="'false'" ng-model="newIndex.isLiteralIndex"/>
-                    {{'literal.index.label' | translate}}
-                </label>
-            </div>
-            <div class="form-group row" ng-show="viewType == 'predication'">
-                <label class="col-md-4 col-form-label">{{'input.literal.index.label' | translate}}</label>
-                <div class="col-md-8">
-                    <select class="form-control" ng-options="idx for idx in literalIndexes" ng-model="newIndex.inputIndex"></select>
+                    <div class="form-group row" ng-if="similarityIndexInfo.isTextType() || similarityIndexInfo.isTextLiteralType()">
+                        <label class="col-md-4 col-form-label">{{'stop.words' | translate}}</label>
+                        <div class="col-md-8">
+                            <input class="form-control stop-words"
+                                   type="text"
+                                   placeholder="{{'default.lucene.stop.list' | translate}}"
+                                   ng-model="similarityIndexInfo.similarityIndex.stopList"
+                                   ng-change="setDirty()">
+                        </div>
+                    </div>
+                    <div class="form-group row" ng-if="similarityIndexInfo.isTextType() || similarityIndexInfo.isTextLiteralType()">
+                        <label class="col-md-4 col-form-label">{{'analyzer.class' | translate}}</label>
+                        <div class="col-md-8">
+                            <input class="form-control analyzer-class"
+                                   type="text"
+                                   ng-model="similarityIndexInfo.similarityIndex.analyzer"
+                                   ng-change="setDirty()">
+                        </div>
+                    </div>
+                    <div class="checkbox offset-xs-3 offset-md-4" ng-show="similarityIndexInfo.isTextType() || similarityIndexInfo.isTextLiteralType()">
+                        <label class="col-xs-6 col-md-6" gdb-tooltip="{{'literal.index.input' | translate}}" tooltip-placement="bottom">
+                            <input type="checkbox"
+                                   class="literal-index"
+                                   ng-true-value="'true'"
+                                   ng-false-value="'false'"
+                                   ng-model="similarityIndexInfo.similarityIndex.isLiteralIndex"
+                                   ng-change="setDirty()"/>
+                            {{'literal.index.label' | translate}}
+                        </label>
+                    </div>
+                    <div class="form-group row" ng-show="similarityIndexInfo.isPredicationType()">
+                        <label class="col-md-4 col-form-label">{{'input.literal.index.label' | translate}}</label>
+                        <div class="col-md-8">
+                            <select class="form-control"
+                                    ng-options="idx for idx in literalIndexes"
+                                    ng-model="similarityIndexInfo.similarityIndex.inputIndex"
+                                    ng-change="setDirty()"></select>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
-      </div>
-    </div>
 
+        <div class="card">
+            <div class="card-block">
+                <button type="button" class="btn btn-link pull-right" ng-click="toggleHelp()">
+                <span class="icon-help" uib-popover="{{'toggle.help' | translate}}" popover-placement="top"
+                      popover-trigger="mouseenter"></span>
+                    <span class="hidden-lg-down">{{'menu.help.label' | translate}}</span>
+                </button>
 
-    <div class="card">
-        <div class="card-block">
-
-            <button type="button" class="btn btn-link pull-right" ng-click="toggleHelp()">
-              <span class="icon-help" uib-popover="{{'toggle.help' | translate}}" popover-placement="top" popover-trigger="mouseenter"></span>
-              <span class="hidden-lg-down">{{'menu.help.label' | translate}}</span>
-            </button>
-
-            <ul class="nav nav-tabs">
-                <li ng-hide="editSearchQuery" class="nav-item">
-                    <a ng-class="page == 1 ? 'active' : ''" ng-click="goToPage(1)" class="nav-link" href>
-                        {{'data.query.label' | translate}}
-                    </a>
-                </li>
-                <li class="nav-item search-query-tab">
-                    <a ng-class="page == 2 ? 'active' : ''" ng-click="goToPage(2)" class="nav-link" href>
-                        {{'search.query.label' | translate}}
-                    </a>
-                </li>
-                <li class="nav-item analogical-query-tab" ng-show="viewType == 'predication'">
-                    <a ng-class="page == 3 ? 'active' : ''" ng-click="goToPage(3)" class="nav-link" href>
-                        {{'analogical.query.label' | translate}}
-                    </a>
-                </li>
-            </ul>
-
-            <div>
-                <div class="alert alert-help mb-2" id="query-help" uib-collapse="helpHidden" ng-show="page == 1">
-                    <button class="close absolute" ng-click="toggleHelp(0)"></button>
-                    <p class="lead">
-                        {{'this.sentence.start' | translate}} <span class="small-caps">SELECT</span> {{'query.determines.data.index' | translate}}
-                    </p>
-
-                    <p>{{'query.must' | translate}} <span class="small-caps">SELECT</span> {{'the.following.bindings' | translate}}</p>
-                    <ul ng-show="viewType == 'text'">
-                        <li><code>?documentID</code> {{'determines.id.indexed.doc' | translate}}</li>
-                        <li><code>?documentText</code> {{'determines.doc.content' | translate}}</li>
-                    </ul>
-                    <ul ng-show="viewType == 'predication'">
-                        <li><code>?subject</code></li>
-                        <li><code>?predicate</code></li>
-                        <li><code>?object</code></li>
-                    </ul>
-
-                    {{'query.execution.info' | translate}}
-                </div>
+                <ul class="nav nav-tabs">
+                    <li ng-if="!isEditViewMode()" class="nav-item select-query-tab">
+                        <a ng-class="similarityIndexInfo.isDataQueryTypeSelected() ? 'active' : ''" ng-click="changeQueryTab(SimilarityQueryType.DATA)" class="nav-link" href>
+                            <div>{{'data.query.label' | translate}}
+                                <sup ng-if="saveOrUpdateExecuted && hasSelectQueryError()"
+                                     class="tab-error text-danger"
+                                     uib-popover="{{getQueryErrorMessage()}}"
+                                     popover-placement="top"
+                                     popover-trigger="mouseenter">
+                                </sup>
+                            </div>
+                        </a>
+                    </li>
+                    <li class="nav-item search-query-tab">
+                        <a ng-class="similarityIndexInfo.isSearchQueryTypeSelected() ? 'active' : ''" ng-click="changeQueryTab(SimilarityQueryType.SEARCH)" class="nav-link" href>
+                            {{'search.query.label' | translate}}
+                            <sup ng-if="saveOrUpdateExecuted && hasSearchQueryError()"
+                                 class="tab-error text-danger"
+                                 uib-popover="{{getQueryErrorMessage()}}"
+                                 popover-placement="top"
+                                 popover-trigger="mouseenter">
+                            </sup>
+                        </a>
+                    </li>
+                    <li class="nav-item analogical-query-tab" ng-if="similarityIndexInfo.isPredicationType()">
+                        <a ng-class="similarityIndexInfo.isAnalogicalQueryTypeSelected() ? 'active' : ''" ng-click="changeQueryTab(SimilarityQueryType.ANALOGICAL)" class="nav-link" href>
+                            {{'analogical.query.label' | translate}}
+                            <sup ng-if="saveOrUpdateExecuted && hasAnalogicalQueryError()"
+                                 class="tab-error text-danger"
+                                 uib-popover="{{getQueryErrorMessage()}}"
+                                 popover-placement="top"
+                                 popover-trigger="mouseenter">
+                            </sup>
+                        </a>
+                    </li>
+                </ul>
 
-                <div class="alert alert-help mb-2" id="query-help" uib-collapse="helpHidden" ng-show="page == 2">
-                    <button class="close absolute" ng-click="toggleHelp(0)"></button>
-                    <p class="lead">
-                        {{'this.sentence.start' | translate}} <span class="small-caps">SELECT</span> {{'query.fetch.on.search' | translate}}
-                    </p>
+                <div>
+                    <div class="alert alert-help mb-2" id="query-help" uib-collapse="helpHidden">
+                        <button class="close absolute" ng-click="toggleHelp(0)"></button>
 
-                    {{'query.execution.on.search' | translate}}
-                </div>
+                        <div ng-if="similarityIndexInfo.isDataQueryTypeSelected()">
+                            <p class="lead">
+                                {{'this.sentence.start' | translate}} <span class="small-caps">SELECT</span>
+                                {{'query.determines.data.index' | translate}}
+                            </p>
 
-                <div class="alert alert-help mb-2" id="query-help" uib-collapse="helpHidden" ng-show="page == 3">
-                    <button class="close absolute" ng-click="toggleHelp(0)"></button>
-                    <p class="lead">
-                        {{'this.sentence.start' | translate}} <span class="small-caps">SELECT</span> {{'query.fetch.analogical.search' | translate}}
-                    </p>
+                            <p>{{'query.must' | translate}} <span class="small-caps">SELECT</span> {{'the.following.bindings' | translate}}</p>
+                            <ul ng-show="similarityIndexInfo.isTextType() || similarityIndexInfo.isTextLiteralType()">
+                                <li><code>?documentID</code> {{'determines.id.indexed.doc' | translate}}</li>
+                                <li><code>?documentText</code> {{'determines.doc.content' | translate}}</li>
+                            </ul>
+                            <ul ng-show="similarityIndexInfo.isPredicationType()">
+                                <li><code>?subject</code></li>
+                                <li><code>?predicate</code></li>
+                                <li><code>?object</code></li>
+                            </ul>
 
-                    {{'analogical.search.info' | translate}}
-                </div>
+                            {{'query.execution.info' | translate}}
+                        </div>
 
-                <div class="row">
-                    <div class="col-md-9">
-                        <query-editor nostorage notabs notoolbar-saved notoolbar-copy nostatus nocount norun callback-on-change="updateDirty">
-                        </query-editor>
-                    </div>
-                    <div class="col-md-3" ng-show="page == 1">
-                        <p>{{'sample.queries' | translate}} </p>
-
-                        <div class="list-group">
-                            <div ng-repeat="(sampleKey, sampleValue) in samples">
-                                <a href="#" ng-click="setQuery(sampleValue)" class="list-group-item list-group-item-action">
-                                    <strong ng-bind="sampleKey"></strong>
-                                    <samp class="text-muted small">{{sampleValue}}</samp>
-                                </a>
-                            </div>
+                        <div ng-if="similarityIndexInfo.isSearchQueryTypeSelected()">
+                            <p class="lead">
+                                {{'this.sentence.start' | translate}} <span class="small-caps">SELECT</span> {{'query.fetch.on.search' | translate}}
+                            </p>
+
+                            {{'query.execution.on.search' | translate}}
+                        </div>
+
+                        <div ng-if="similarityIndexInfo.isAnalogicalQueryTypeSelected()">
+                            <p class="lead">
+                                {{'this.sentence.start' | translate}} <span class="small-caps">SELECT</span>
+                                {{'query.fetch.analogical.search' | translate}}
+                            </p>
+
+                            {{'analogical.search.info' | translate}}
                         </div>
                     </div>
-                </div>
-            </div>
 
+                    <div class="row">
+                        <div class="col-md-9">
+                            <yasgui-component id="query-editor" yasgui-config="yasguiConfig" query-changed="queryChanged()"></yasgui-component>
+
+                            <div ng-if="saveOrUpdateExecuted && hasQueryError()"
+                                 class="idError alert alert-danger mt-1">
+                                    {{ getQueryErrorMessage() }}
+                            </div>
 
+                        </div>
+                        <div class="col-md-3" ng-if="similarityIndexInfo.isDataQueryTypeSelected()">
+                            <p>{{'sample.queries' | translate}} </p>
 
-            <div class="clearfix">
-                <div class="pull-right">
-                    <a ng-href="similarity" class="btn btn-lg btn-secondary"
-                       uib-popover="{{getCloseBtnMsg()}}"
-                       popover-placement="top"
-                       popover-trigger="mouseenter">
-                        {{'common.cancel.btn' | translate}}
-                    </a>
-                    <button ng-if="!editSearchQuery" class="btn btn-lg btn-primary create-similarity-index-btn" ng-click="createIndex()"
-                            uib-popover="{{'create.index.label' | translate}}"
-                            popover-placement="top"
-                            popover-trigger="mouseenter">
-                        {{'common.create.btn' | translate}}
-                    </button>
-                    <button ng-if="editSearchQuery" class="btn btn-lg btn-primary save-query-btn" ng-click="saveSearchQuery()"
-                            uib-popover="{{'core.edit.query' | translate}}"
-                            popover-placement="top"
-                            popover-trigger="mouseenter">
-                        {{'common.save.btn' | translate}}
-                    </button>
+                            <div class="list-group">
+                                <div ng-repeat="(sampleKey, sampleValue) in samples">
+                                    <a href="#" ng-click="setEditorQuery(sampleValue)" class="list-group-item list-group-item-action">
+                                        <strong ng-bind="sampleKey"></strong>
+                                        <samp class="text-muted small">{{sampleValue}}</samp>
+                                    </a>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
-                <div class="pull-left">
-                  <button ng-if="!editSearchQuery" type="button" class="btn btn-link pull-left" ng-click="viewQuery()">{{'view.index.query' | translate}}</button>
-                  <button class="btn btn-link test-query-btn" ng-click="showPreview()" ng-hide="viewMode == 'editor' || page != 1"
-                          uib-popover="{{'preview.results' | translate}}"
-                          popover-placement="top"
-                          popover-trigger="mouseenter">
-                      {{'test.query.btn' | translate}}
-                  </button>
-                  <button class="btn btn-link" ng-click="showEditor()" ng-show="viewMode == 'editor' && page == 1"
-                          uib-popover="{{'closes.preview' | translate}}"
-                          popover-placement="top"
-                          popover-trigger="mouseenter">
-                      {{'core.edit.query' | translate}}
-                  </button>
+
+                <div class="clearfix">
+                    <div class="pull-right">
+                        <a ng-href="similarity" class="btn btn-lg btn-secondary cancel-similarity-index-btn"
+                           uib-popover="{{getCloseBtnMsg()}}"
+                           popover-placement="top"
+                           popover-trigger="mouseenter">
+                            {{'common.cancel.btn' | translate}}
+                        </a>
+                        <button ng-if="!isEditViewMode()" class="btn btn-lg btn-primary create-similarity-index-btn" ng-click="createSimilarityIndex()"
+                                uib-popover="{{'create.index.label' | translate}}"
+                                popover-placement="top"
+                                popover-trigger="mouseenter">
+                            {{'common.create.btn' | translate}}
+                        </button>
+                        <button ng-if="isEditViewMode()" class="btn btn-lg btn-primary save-query-btn" ng-click="saveSearchQuery()"
+                                uib-popover="{{'core.edit.query' | translate}}"
+                                popover-placement="top"
+                                popover-trigger="mouseenter">
+                            {{'common.save.btn' | translate}}
+                        </button>
+                    </div>
+                    <div class="pull-left">
+                        <button ng-if="!isEditViewMode()" type="button" class="btn btn-link pull-left" ng-click="viewQuery()">
+                            {{'view.index.query' | translate}}
+                        </button>
+                        <button class="btn btn-link test-query-btn" ng-click="preview()" ng-if="similarityIndexInfo.isDataQueryTypeSelected() && !isEditViewMode() && isYasqeShown()"
+                                uib-popover="{{'preview.results' | translate}}"
+                                popover-placement="top"
+                                popover-trigger="mouseenter">
+                            {{'test.query.btn' | translate}}
+                        </button>
+                        <button class="btn btn-link" ng-click="showEditor()" ng-if="isYasrShown() && similarityIndexInfo.isDataQueryTypeSelected()"
+                                uib-popover="{{'closes.preview' | translate}}"
+                                popover-placement="top"
+                                popover-trigger="mouseenter">
+                            {{'core.edit.query' | translate}}
+                        </button>
+                    </div>
                 </div>
             </div>
+        </div>
     </div>
 </div>
-</div>