graphdb-workbench 2.1.0-RC2 → 2.1.0-RC4

package/dist/plugins.js

@@ -299,8 +299,8 @@ PluginRegistry.add('guide.step', [
                         content: '',
                         extraContent: options.introExtraContent,
                         url: '/hierarchy',
-                        elementSelector: '#classChart',
-                        placement: 'top'
+                        elementSelector: '#classChart #main-group',
+                        placement: 'left'
                     }, options)
                 });
             }
@@ -313,6 +313,7 @@ PluginRegistry.add('guide.step', [
                         options: angular.extend({}, {
                             content: 'guide.step_plugin.class_hierarchy_zoom.content',
                             url: '/hierarchy',
+                            placement: 'left',
                             elementSelector: selector,
                             onNextClick: (guide, step) => {
                                 GuideUtils.classHierarchyZoom(step.elementSelector);
@@ -327,6 +328,8 @@ PluginRegistry.add('guide.step', [
                                 content: '',
                                 extraContent: zoomIri.postExtraContent,
                                 url: '/hierarchy',
+                                placement: 'left',
+                                beforeShowPromise: GuideUtils.deferredShow(800),
                                 elementSelector: selector
                             }, options)
                         });
@@ -467,6 +470,8 @@ PluginRegistry.add('guide.step', [
             const GuideUtils = services.GuideUtils;
             options.mainAction = 'create-repository';
 
+            const repositoryIdInputSelector = GuideUtils.getGuideElementSelector('graphDBRepositoryIdInput');
+            const repositoryId = options.repositoryId;
             const steps = [
                 {
                     guideBlockName: 'click-main-menu',
@@ -496,19 +501,20 @@ PluginRegistry.add('guide.step', [
                     options: angular.extend({}, {
                         content: 'guide.step_plugin.create_repository.repository_id.content',
                         url: '/repository/create/graphdb',
-                        elementSelector: GuideUtils.getGuideElementSelector('graphDBRepositoryIdInput'),
-                        onNextValidate: (step) => GuideUtils.validateTextInput(step.elementSelector, step.repositoryId)
+                        elementSelector: repositoryIdInputSelector,
+                        onNextValidate: () => GuideUtils.validateTextInput(repositoryIdInputSelector, repositoryId)
                     }, options)
                 }
             ];
 
-            if (!!options.rulesetName) {
+            if (options.rulesetName) {
                 steps.push({
                     guideBlockName: 'clickable-element',
                     options: angular.extend({}, {
                         content: 'guide.step_plugin.create_repository.ruleset_dropdown.content',
                         url: '/repository/create/graphdb',
                         elementSelector: GuideUtils.getGuideElementSelector('graphDBRepositoryRulesetSelect'),
+                        show: () => GuideUtils.validateTextInput(repositoryIdInputSelector, repositoryId),
                         rulesetName: options.rulesetName
                     }, options)
                 });
@@ -519,6 +525,7 @@ PluginRegistry.add('guide.step', [
                     content: 'guide.step_plugin.create_repository.save_button.content',
                     url: '/repository/create/graphdb',
                     elementSelector: GuideUtils.getGuideElementSelector('graphDBRepositoryCrateButton'),
+                    show: () => GuideUtils.validateTextInput(repositoryIdInputSelector, repositoryId),
                     onNextClick: GuideUtils.clickOnGuideElement('graphDBRepositoryCrateButton')
                 }, options)
             });
@@ -556,6 +563,7 @@ PluginRegistry.add('guide.step', [
             const $interpolate = services.$interpolate;
             options.mainAction = 'enable-autocomplete';
 
+            const autocompleteCheckboxSelector = GuideUtils.getGuideElementSelector('autocompleteCheckbox');
             return [
                 {
                     guideBlockName: 'click-main-menu',
@@ -564,22 +572,36 @@ PluginRegistry.add('guide.step', [
                         showIntro: true
                     }, options)
                 }, {
-                guideBlockName: 'clickable-element',
-                options: angular.extend({}, {
-                    content: 'guide.step_plugin.enable-autocomplete.content',
-                    url: '/autocomplete',
-                    elementSelector: GuideUtils.getGuideElementSelector('autocompleteCheckbox'),
-                    onNextValidate: (step) => {
-
-                        if (!GuideUtils.isVisible()) {
-                            GuideUtils.noNextErrorToast(toastr, $translate, $interpolate,
-                                'guide.step_plugin.enable-autocomplete.error', options);
-                            return false;
+                    guideBlockName: 'clickable-element',
+                    options: angular.extend({}, {
+                        content: 'guide.step_plugin.enable-autocomplete.content',
+                        url: '/autocomplete',
+                        elementSelector: autocompleteCheckboxSelector,
+                        // Disable default behavior of service when element is clicked.
+                        advanceOn: undefined,
+                        show: (guide) => () => {
+                            // Added listener to the element.
+                            $(autocompleteCheckboxSelector)
+                                .on('mouseup.autocompleteCheckboxClick', function () {
+                                    // If autocomplete is enabled go to the next step.
+                                    if (!GuideUtils.isGuideElementChecked('autocompleteCheckbox', ' input')) {
+                                        guide.next();
+                                    }
+                                });
+                        },
+                        hide: () => () => {
+                            // Remove ths listener from element. It is important when step is hided.
+                            $(autocompleteCheckboxSelector).off('mouseup.autocompleteCheckboxClick');
+                        },
+                        onNextValidate: () => {
+                            if (!GuideUtils.isGuideElementChecked('autocompleteCheckbox', ' input')) {
+                                GuideUtils.noNextErrorToast(toastr, $translate, $interpolate, 'guide.step_plugin.enable-autocomplete.error', options);
+                                return false;
+                            }
+                            return true;
                         }
-                        return true;
-                    }
-                }, options)
-            },
+                    }, options)
+                },
                 {
                     guideBlockName: 'read-only-element',
                     options: angular.extend({}, {
@@ -589,7 +611,7 @@ PluginRegistry.add('guide.step', [
                         canBePaused: false
                     }, options)
                 }
-            ]
+            ];
         }
     }
 ]);
@@ -772,6 +794,21 @@ PluginRegistry.add('guide.step', [
                         content: 'guide.step_plugin.import_rdf_file.content',
                         url: '/import',
                         elementSelector: GuideUtils.getGuideElementSelector('uploadRdfFileButton'),
+                        // Disable default behavior of service when element is clicked.
+                        advanceOn: undefined,
+                        show: (guide) => () => {
+                            // Add "change" listener to the file upload input, it will be triggered when a file is selected.
+                            $('#ngf-wb-import-uploadFile')
+                                .on('change.importRdfFile', function () {
+                                    // Check if expected file is selected, then process to the next step.
+                                    GuideUtils.waitFor(GuideUtils.getGuideElementSelector('import-file-' + options.resourceFile), 2)
+                                        .then(() => guide.next());
+                                });
+                        },
+                        hide: () => () => {
+                            // Remove ths listener from element. It is important when step is hided.
+                            $('#ngf-wb-import-uploadFile').off('change.importRdfFile');
+                        },
                         onNextValidate: () => {
                             if (!$(GuideUtils.getGuideElementSelector('import-file-' + options.resourceFile)).length) {
                                 GuideUtils.noNextErrorToast(toastr, $translate, $interpolate,
@@ -1049,7 +1086,7 @@ PluginRegistry.add('guide.step', [
                     options: angular.extend({}, {
                         content: 'guide.step_plugin.table-graph-overview',
                         scrollToHandler: GuideUtils.scrollToTop,
-                        elementSelector: GuideUtils.getSparqlResultsSelector(),
+                        elementSelector: GuideUtils.getSparqlResultsSelector() + ' tbody',
                         placement: 'top'
                     }, options)
                 }
@@ -1122,7 +1159,7 @@ PluginRegistry.add('guide.step', [
                         steps.push({
                             guideBlockName: 'read-only-element',
                             options: angular.extend({}, {
-                                elementSelector: GuideUtils.getSparqlResultsSelector()
+                                elementSelector: GuideUtils.getSparqlResultsSelector() + ' tbody'
                             }, angular.extend({}, options, subStep))
                         });
                     }
@@ -1134,13 +1171,13 @@ PluginRegistry.add('guide.step', [
     }
 ]);
 
-const disableAllNodes = () => () =>{
+const disableAllNodes = () => () => {
     $('.node-wrapper').addClass('disable-visual-graph-node');
-}
+};
 
 const enableAllNodes = () => () => {
     $('.node-wrapper').removeClass('disable-visual-graph-node');
-}
+};
 
 PluginRegistry.add('guide.step', [
     {
@@ -1187,13 +1224,13 @@ PluginRegistry.add('guide.step', [
                         onPreviousClick: () => new Promise(function (resolve, reject) {
                             $location.url('/graphs-visualizations');
                             $route.reload();
-                            let searchInputSelector = GuideUtils.getGuideElementSelector('graphVisualisationSearchInputNotConfigured', ' input');
+                            const searchInputSelector = GuideUtils.getGuideElementSelector('graphVisualisationSearchInputNotConfigured', ' input');
                             GuideUtils.waitFor(searchInputSelector, 3)
                                 .then(() => {
                                     GuideUtils.validateTextInput(searchInputSelector, options.easyGraphInputText);
                                     resolve();
                                 })
-                                .catch(() => reject());
+                                .catch((error) => reject(error));
                         }),
                         canBePaused: false,
                         forceReload: true
@@ -1209,6 +1246,17 @@ PluginRegistry.add('guide.step', [
             const $rootScope = services.$rootScope;
             const $route = services.$route;
             const elementSelector = `.node-wrapper[id^="${options.iri}"] circle`;
+
+            // Expands visual graph when a node is double-clicked.
+            const dblClickFunction = (guide) => () => {
+                GuideUtils.graphVizExpandNode(elementSelector);
+                guide.getCurrentStep().hide();
+                GuideUtils.awaitAlphaDropD3(null, $rootScope)()
+                    .then(() => {
+                        guide.next();
+                    });
+            };
+
             return [
                 {
                     guideBlockName: 'clickable-element',
@@ -1218,10 +1266,8 @@ PluginRegistry.add('guide.step', [
                         url: '/graphs-visualizations',
                         canBePaused: false,
                         elementSelector,
-                        advanceOn: {
-                            selector: `.node-wrapper[id^="${options.iri}"] circle`,
-                            event: 'dblclick'
-                        },
+                        // Disable default behavior of service when element is clicked.
+                        advanceOn: undefined,
                         onNextClick: (guide, stepDescription) => {
                             GuideUtils.graphVizExpandNode(stepDescription.elementSelector);
                             guide.getCurrentStep().hide();
@@ -1230,15 +1276,24 @@ PluginRegistry.add('guide.step', [
                                     guide.next();
                                 });
                         },
+                        show: (guide) => () => {
+                            // Add "dblclick" listener to the element. Processing of double-click event is disabled for the visual graph when guide is started.
+                            // So we have expanded the graph manually when a selected node is double-clicked.
+                            $(elementSelector).on('dblclick.onNodeDbClicked', dblClickFunction(guide));
+                        },
+                        hide: () => () => {
+                            // Remove the "dblclick" listener of element. It is important when step is hided.
+                            $(elementSelector).off('dblclick.onNodeDbClicked');
+                        },
                         beforeShowPromise: () => new Promise(function (resolve, reject) {
                             $route.reload();
                             GuideUtils.deferredShow(50)()
                                 .then(() => {
                                     GuideUtils.awaitAlphaDropD3(elementSelector, $rootScope)()
                                         .then(() => resolve())
-                                        .catch(() => reject());
+                                        .catch((error) => reject(error));
                                 });
-                        }),
+                        })
                     }, options)
                 }
             ];
@@ -1250,6 +1305,28 @@ PluginRegistry.add('guide.step', [
             const GuideUtils = services.GuideUtils;
             const $rootScope = services.$rootScope;
             const elementSelector = `.node-wrapper[id^="${options.iri}"] circle`;
+
+            let mouseClickTimeStamp;
+            let mouseEventTimer;
+
+            // Expands Node info sidebar panel when a node is clicked.
+            const onClick = (services, guide) => (event) => {
+                if (mouseEventTimer) {
+                    // Cancels expansion of the sidebar panel if user double-clicked.
+                    if (event.timeStamp - mouseClickTimeStamp < 400) {
+                        services.$timeout.cancel(mouseEventTimer);
+                        mouseEventTimer = null;
+                    }
+                } else {
+                    mouseClickTimeStamp = event.timeStamp;
+                    mouseEventTimer = services.$timeout(function () {
+                        GuideUtils.graphVizShowNodeInfo(elementSelector);
+                        mouseEventTimer = null;
+                        guide.next();
+                    }, 500);
+                }
+            };
+
             const steps = [
                 {
                     guideBlockName: 'clickable-element',
@@ -1259,9 +1336,16 @@ PluginRegistry.add('guide.step', [
                         url: '/graphs-visualizations',
                         elementSelector,
                         canBePaused: false,
-                        advanceOn: {
-                            selector: `.node-wrapper[id^="${options.iri}"] circle`,
-                            event: 'click'
+                        // Disable default behavior of service when element is clicked.
+                        advanceOn: undefined,
+                        show: (guide) => () => {
+                            // Add "click" listener to the element. Processing of click event is disabled for the visual graph when guide is started.
+                            // So we have to open side panel info manually when a selected node is clicked.
+                            $(elementSelector).on('click.onNodeClicked', onClick(services, guide));
+                        },
+                        hide: () => () => {
+                            // Remove the "click" listener of element. It is important when step is hided.
+                            $(elementSelector).off('click.onNodeClicked');
                         },
                         onNextClick: (guide, step) => {
                             GuideUtils.graphVizShowNodeInfo(step.elementSelector);
@@ -1283,7 +1367,7 @@ PluginRegistry.add('guide.step', [
                         onPreviousClick: () => new Promise(function (resolve) {
                             GuideUtils.waitFor(closeButtonSelector, 3)
                                 .then(() => {
-                                    $(closeButtonSelector).trigger('click')
+                                    $(closeButtonSelector).trigger('click');
                                     resolve();
                                 }).catch(() => resolve());
                         })
@@ -1292,7 +1376,7 @@ PluginRegistry.add('guide.step', [
             ];
 
             if (angular.isArray(options.focusProperties)) {
-                options.focusProperties.forEach(focusProperty => {
+                options.focusProperties.forEach((focusProperty) => {
                     if (!angular.isObject(focusProperty)) {
                         focusProperty = {
                             property: focusProperty
@@ -1409,11 +1493,11 @@ const BASIC_STEP = {
 };
 
 /**
- * This function will be call before show a step. Step will shown after promise is resolve. It waits element of step to be visible on the page.
- * @param maxWaitTime
- * @param services
- * @param elementSelector
- * @returns {function(): *}
+ * This function will be called before show a step. Step will be shown after promise is resolve. It waits element of step to be visible on the page.
+ * @param {*} services
+ * @param {string} elementSelector
+ * @param {number} maxWaitTime
+ * @return {function(): *}
  */
 const beforeShowPromise = (services, elementSelector, maxWaitTime) => {
     return () => {
@@ -1424,22 +1508,22 @@ const beforeShowPromise = (services, elementSelector, maxWaitTime) => {
                 // throw the error, otherwise guide will continue with the next step.
                 throw error;
             });
-    }
-}
+    };
+};
 
 PluginRegistry.add('guide.step', [
     {
         guideBlockName: 'clickable-element',
         getStep: (options, services) => {
             const notOverridable = {
-                type: 'clickable',
+                type: 'clickable'
             };
 
             const stepDescription = angular.extend({}, BASIC_STEP, {
                 advanceOn: {
                     selector: options.elementSelector,
                     event: 'click'
-                },
+                }
             }, options, notOverridable);
 
             if (!stepDescription.beforeShowPromise) {
@@ -1452,7 +1536,7 @@ PluginRegistry.add('guide.step', [
         guideBlockName: 'read-only-element',
         getStep: (options, services) => {
             const notOverridable = {
-                type: 'readonly',
+                type: 'readonly'
             };
             const stepDescription = angular.extend({}, BASIC_STEP, options, notOverridable);
             if (!stepDescription.beforeShowPromise) {
@@ -1465,7 +1549,7 @@ PluginRegistry.add('guide.step', [
         guideBlockName: 'input-element',
         getStep: (options, services) => {
             const notOverridable = {
-                type: 'input',
+                type: 'input'
             };
             const stepDescription = angular.extend({}, BASIC_STEP, options, notOverridable);
             if (!stepDescription.beforeShowPromise) {
@@ -1478,7 +1562,7 @@ PluginRegistry.add('guide.step', [
         guideBlockName: 'info-message',
         getStep: (options) => {
             const notOverridable = {
-                type: 'readonly',
+                type: 'readonly'
             };
             return angular.extend({}, BASIC_STEP, options, notOverridable);
         }

package/dist/res/swagger/index.html

@@ -3,37 +3,37 @@
 <head>
     <meta charset="UTF-8">
     <title>Swagger UI</title>
-    <link rel="icon" type="image/png" href="images/favicon-32x32.png?v=2.1.0-RC2" sizes="32x32"/>
-    <link rel="icon" type="image/png" href="images/favicon-16x16.png?v=2.1.0-RC2" sizes="16x16"/>
-    <link href='../../css/common.css?v=2.1.0-RC2' media='screen' rel='stylesheet' type='text/css'/>
-    <link href='css/reset.css?v=2.1.0-RC2' media='screen' rel='stylesheet' type='text/css'/>
-    <link href='css/screen.css?v=2.1.0-RC2' media='screen' rel='stylesheet' type='text/css'/>
-    <link href='css/onto-theme.css?v=2.1.0-RC2' media='screen' rel='stylesheet' type='text/css'/>
-    <link href='css/reset.css?v=2.1.0-RC2' media='print' rel='stylesheet' type='text/css'/>
-    <link href='css/print.css?v=2.1.0-RC2' media='print' rel='stylesheet' type='text/css'/>
-    <link href='css/onto-theme.css?v=2.1.0-RC2' media='print' rel='stylesheet' type='text/css'/>
+    <link rel="icon" type="image/png" href="images/favicon-32x32.png?v=2.1.0-RC4" sizes="32x32"/>
+    <link rel="icon" type="image/png" href="images/favicon-16x16.png?v=2.1.0-RC4" sizes="16x16"/>
+    <link href='../../css/common.css?v=2.1.0-RC4' media='screen' rel='stylesheet' type='text/css'/>
+    <link href='css/reset.css?v=2.1.0-RC4' media='screen' rel='stylesheet' type='text/css'/>
+    <link href='css/screen.css?v=2.1.0-RC4' media='screen' rel='stylesheet' type='text/css'/>
+    <link href='css/onto-theme.css?v=2.1.0-RC4' media='screen' rel='stylesheet' type='text/css'/>
+    <link href='css/reset.css?v=2.1.0-RC4' media='print' rel='stylesheet' type='text/css'/>
+    <link href='css/print.css?v=2.1.0-RC4' media='print' rel='stylesheet' type='text/css'/>
+    <link href='css/onto-theme.css?v=2.1.0-RC4' media='print' rel='stylesheet' type='text/css'/>
 
-    <script src='lib/object-assign-pollyfill.js?v=2.1.0-RC2' type='text/javascript'></script>
-    <script src='lib/jquery-3.4.1.min.js?v=2.1.0-RC2' type='text/javascript'></script>
-    <script src='lib/jquery.slideto.min.js?v=2.1.0-RC2' type='text/javascript'></script>
-    <script src='lib/jquery.wiggle.min.js?v=2.1.0-RC2' type='text/javascript'></script>
+    <script src='lib/object-assign-pollyfill.js?v=2.1.0-RC4' type='text/javascript'></script>
+    <script src='lib/jquery-3.4.1.min.js?v=2.1.0-RC4' type='text/javascript'></script>
+    <script src='lib/jquery.slideto.min.js?v=2.1.0-RC4' type='text/javascript'></script>
+    <script src='lib/jquery.wiggle.min.js?v=2.1.0-RC4' type='text/javascript'></script>
 
-    <script src="lib/jquery-migrate-1.4.1.min.js?v=2.1.0-RC2"></script>
-    <script src='lib/jquery.ba-bbq.min.js?v=2.1.0-RC2' type='text/javascript'></script>
-    <script src='lib/handlebars.min-v4.7.3.js?v=2.1.0-RC2' type='text/javascript'></script>
-    <script src='lib/lodash.min.js?v=2.1.0-RC2' type='text/javascript'></script>
-    <script src='lib/backbone-min.js?v=2.1.0-RC2' type='text/javascript'></script>
-    <script src='swagger-ui.js?v=2.1.0-RC2' type='text/javascript'></script>
-    <script src='lib/highlight.9.1.0.pack.js?v=2.1.0-RC2' type='text/javascript'></script>
-    <script src='lib/highlight.9.1.0.pack_extended.js?v=2.1.0-RC2' type='text/javascript'></script>
-    <script src='lib/jsoneditor.min.js?v=2.1.0-RC2' type='text/javascript'></script>
-    <script src='lib/marked.js?v=2.1.0-RC2' type='text/javascript'></script>
-    <script src='lib/swagger-oauth.js?v=2.1.0-RC2' type='text/javascript'></script>
+    <script src="lib/jquery-migrate-1.4.1.min.js?v=2.1.0-RC4"></script>
+    <script src='lib/jquery.ba-bbq.min.js?v=2.1.0-RC4' type='text/javascript'></script>
+    <script src='lib/handlebars.min-v4.7.3.js?v=2.1.0-RC4' type='text/javascript'></script>
+    <script src='lib/lodash.min.js?v=2.1.0-RC4' type='text/javascript'></script>
+    <script src='lib/backbone-min.js?v=2.1.0-RC4' type='text/javascript'></script>
+    <script src='swagger-ui.js?v=2.1.0-RC4' type='text/javascript'></script>
+    <script src='lib/highlight.9.1.0.pack.js?v=2.1.0-RC4' type='text/javascript'></script>
+    <script src='lib/highlight.9.1.0.pack_extended.js?v=2.1.0-RC4' type='text/javascript'></script>
+    <script src='lib/jsoneditor.min.js?v=2.1.0-RC4' type='text/javascript'></script>
+    <script src='lib/marked.js?v=2.1.0-RC4' type='text/javascript'></script>
+    <script src='lib/swagger-oauth.js?v=2.1.0-RC4' type='text/javascript'></script>
 
     <!-- Some basic translations -->
-    <!-- <script src='lang/translator.js?v=2.1.0-RC2' type='text/javascript'></script> -->
-    <!-- <script src='lang/ru.js?v=2.1.0-RC2' type='text/javascript'></script> -->
-    <!-- <script src='lang/en.js?v=2.1.0-RC2' type='text/javascript'></script> -->
+    <!-- <script src='lang/translator.js?v=2.1.0-RC4' type='text/javascript'></script> -->
+    <!-- <script src='lang/ru.js?v=2.1.0-RC4' type='text/javascript'></script> -->
+    <!-- <script src='lang/en.js?v=2.1.0-RC4' type='text/javascript'></script> -->
 
     <script type="text/javascript">
         $(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "graphdb-workbench",
-    "version": "2.1.0-RC2",
+    "version": "2.1.0-RC4",
     "description": "The web application for GraphDB APIs",
     "scripts": {
         "build": "webpack --config=webpack.config.prod.js",