graphdb-workbench 2.6.4-RC1 → 2.7.0-RC1

package/dist/plugins.js

@@ -359,17 +359,14 @@ PluginRegistry.add('main.menu', {
     ]
 });
 
-const reloadAndOpenInfoPanel = (services, clasInstanceSelector, resolve, reject) => {
-    services.$location.url('/hierarchy');
-    services.$route.reload();
-    services.GuideUtils.waitFor(clasInstanceSelector, 3)
+const reloadAndOpenInfoPanel = (services, clasInstanceSelector) => {
+    services.$location.path('/hierarchy').search({});
+    return services.GuideUtils.waitFor(clasInstanceSelector, 3)
         .then(() => {
             services.GuideUtils.classHierarchyFocus(clasInstanceSelector);
             // Wait a little time animation to complete.
-            services.GuideUtils.deferredShow(500)()
-                .then(() => resolve());
-        })
-        .catch((error) => reject(error));
+            return services.GuideUtils.deferredShow(500)();
+        });
 };
 
 PluginRegistry.add('guide.step', [
@@ -470,13 +467,13 @@ PluginRegistry.add('guide.step', [
                             GuideUtils.classHierarchyFocus(clasInstanceSelector);
                             guide.next();
                         },
-                        initPreviousStep: () => new Promise((resolve, reject) => {
+                        initPreviousStep: () => {
                             if (!GuideUtils.isVisible(closeButtonSelector)) {
-                                reloadAndOpenInfoPanel({$location, $route, GuideUtils}, clasInstanceSelector, resolve, reject);
-                            } else {
-                                resolve();
+                                return reloadAndOpenInfoPanel({$location, $route, GuideUtils}, clasInstanceSelector);
                             }
-                        })
+
+                            return Promise.resolve();
+                        }
                     }, options)
                 },
                 {
@@ -589,29 +586,21 @@ PluginRegistry.add('guide.step', [
                     },
                     onNextClick: () => GuideUtils.waitFor(closeButtonSelector, 3)
                         .then(() => $(closeButtonSelector).trigger('click')),
-                    initPreviousStep: (services, stepId) => new Promise((resolve, reject) => {
+                    initPreviousStep: (services, stepId) => {
 
                         const currentStepId = services.ShepherdService.getCurrentStepId();
                         // If method is called from same step just click count link
                         if (currentStepId === stepId && options.followCountLink) {
-                            GuideUtils.waitFor(instanceCountSelector, 3)
+                            return GuideUtils.waitFor(instanceCountSelector, 3)
                                 .then(() => {
                                     $(instanceCountSelector).trigger('click');
-                                    GuideUtils.waitFor(GuideUtils.CSS_SELECTORS.SPARQL_RESULTS_SELECTOR, 3)
-                                        .then(() => {
-                                            GuideUtils.deferredShow(50)()
-                                                .then(() => resolve())
-                                                .catch((error) => reject(error));
-                                        })
-                                        .catch((error) => reject(error));
-                                    resolve();
-                                })
-                                .catch((error) => reject(error));
-                        } else {
-                            // If is called from other step we have to reload and open the info panel.
-                            reloadAndOpenInfoPanel({$location, $route, GuideUtils}, clasInstanceSelector, resolve, reject);
+                                    return GuideUtils.waitFor(GuideUtils.CSS_SELECTORS.SPARQL_RESULTS_SELECTOR, 3)
+                                        .then(() => GuideUtils.deferredShow(50)());
+                                });
                         }
-                    })
+                        // If is called from other step we have to reload and open the info panel.
+                        return reloadAndOpenInfoPanel({$location, $route, GuideUtils}, clasInstanceSelector);
+                    }
                 }, options)
             });
 
@@ -743,6 +732,7 @@ PluginRegistry.add('guide.step', [
                         class: 'enable-autocomplete-checkbox-guide-dialog',
                         // Disable default behavior of service when element is clicked.
                         advanceOn: undefined,
+                        beforeShowPromise: () => GuideUtils.deferredShow(500)(),
                         show: (guide) => () => {
                             // Added listener to the element.
                             $(autocompleteCheckboxSelector)
@@ -794,7 +784,6 @@ PluginRegistry.add('guide.step', [
             const $translate = services.$translate;
             const $interpolate = services.$interpolate;
             const $location = services.$location;
-            const $route = services.$route;
             options.mainAction = 'execute-sparql-query';
 
             const code = document.createElement('code');
@@ -838,47 +827,37 @@ PluginRegistry.add('guide.step', [
                                 services.toastr.error(services.$translate.instant('guide.unexpected.error.message'));
                                 throw error;
                             }),
-                        onNextValidate: () => {
-                            return YasguiComponentDirectiveUtil.getOntotextYasguiElementAsync(SPARQL_DIRECTIVE_SELECTOR)
-                                .then((yasgui) => yasgui.getQuery().then((query) => ({yasgui, queryFromEditor: query})))
-                                .then(({yasgui, queryFromEditor}) => {
-                                    const editorQuery = GuideUtils.removeWhiteSpaces(queryFromEditor);
-                                    const stepQuery = GuideUtils.removeWhiteSpaces(query);
-                                    if (editorQuery !== stepQuery) {
-                                        if (editorQuery === 'select*where{?s?p?o.}limit100' || overwriteQuery) {
-                                            // The query is the default query OR we previously overwrote it => we can overwrite it
-                                            yasgui.setQuery(query);
-                                        } else {
-                                            GuideUtils.noNextErrorToast(toastr, $translate, $interpolate,
-                                                'guide.step_plugin.execute-sparql-query.query-not-same.error', options);
-                                            return false;
-                                        }
+                        onNextValidate: () => YasguiComponentDirectiveUtil.getOntotextYasguiElementAsync(SPARQL_DIRECTIVE_SELECTOR)
+                            .then((yasgui) => yasgui.getQuery().then((query) => ({yasgui, queryFromEditor: query})))
+                            .then(({yasgui, queryFromEditor}) => {
+                                const editorQuery = GuideUtils.removeWhiteSpaces(queryFromEditor);
+                                const stepQuery = GuideUtils.removeWhiteSpaces(query);
+                                if (editorQuery !== stepQuery) {
+                                    if (editorQuery === 'select*where{?s?p?o.}limit100' || overwriteQuery) {
+                                        // The query is the default query OR we previously overwrote it => we can overwrite it
+                                        yasgui.setQuery(query);
+                                    } else {
+                                        GuideUtils.noNextErrorToast(toastr, $translate, $interpolate,
+                                            'guide.step_plugin.execute-sparql-query.query-not-same.error', options);
+                                        return false;
                                     }
-                                    overwriteQuery = true;
-                                    return true;
-                                });
-                        },
-                        initPreviousStep: () => new Promise((resolve, reject) => {
-                            if (index === 0) {
-                                YasguiComponentDirectiveUtil.setQuery(SPARQL_DIRECTIVE_SELECTOR, defaultQuery)
-                                    .then(() => resolve());
-                            } else {
-                                const haveToReload = '/sparql' !== $location.url();
-
-                                if (haveToReload) {
-                                    $location.url('/sparql');
-                                    $route.reload();
                                 }
-                                GuideUtils.waitFor(GuideUtils.CSS_SELECTORS.SPARQL_EDITOR_SELECTOR)
-                                    .then(() => {
-                                        YasguiComponentDirectiveUtil.executeSparqlQuery("#query-editor", query)
-                                            .then(() => {
-                                                resolve();
-                                            })
-                                            .catch((error) => reject(error));
-                                    });
+                                overwriteQuery = true;
+                                return true;
+                                }),
+                        initPreviousStep: () => {
+                            if (index === 0) {
+                                return YasguiComponentDirectiveUtil.setQuery(SPARQL_DIRECTIVE_SELECTOR, defaultQuery);
                             }
-                        }),
+
+                            const haveToReload = '/sparql' !== $location.url();
+                            if (haveToReload) {
+                                $location.path('/sparql').search({});
+                            }
+
+                            return GuideUtils.waitFor(GuideUtils.CSS_SELECTORS.SPARQL_EDITOR_SELECTOR)
+                                .then(() => YasguiComponentDirectiveUtil.executeSparqlQuery("#query-editor", query));
+                        },
                         scrollToHandler: GuideUtils.scrollToTop,
                         extraContent: queryDef.queryExtraContent,
                         onScope: (scope) => {
@@ -900,22 +879,19 @@ PluginRegistry.add('guide.step', [
                                 }),
                         scrollToHandler: GuideUtils.scrollToTop,
                         canBePaused: false,
-                        initPreviousStep: (services, stepId) => new Promise((resolve, reject) => {
+                        initPreviousStep: (services, stepId) => {
                             const previousStep = services.ShepherdService.getPreviousStepFromHistory(stepId);
-                            previousStep.options.initPreviousStep(services, previousStep.options.id)
+                            return previousStep.options.initPreviousStep(services, previousStep.options.id)
                                 .then(() => {
                                     const currentStepId = services.ShepherdService.getCurrentStepId();
                                     // Skip expanding of node if last step is "visual-graph-expand"
                                     if (currentStepId === stepId) {
-                                        resolve();
-                                    } else {
-                                        YasguiComponentDirectiveUtil.executeSparqlQuery("#query-editor", query)
-                                            .then(() => resolve())
-                                            .catch((error) => reject(error));
+                                        return Promise.resolve();
                                     }
-                                })
-                                .catch((error) => reject(error));
-                        })
+
+                                    return YasguiComponentDirectiveUtil.executeSparqlQuery("#query-editor", query);
+                                });
+                        }
                     }, options)
                 });
                 steps.push({
@@ -932,16 +908,15 @@ PluginRegistry.add('guide.step', [
                         canBePaused: false,
                         initPreviousStep: (services, stepId) => {
                             if ('/sparql' !== $location.url()) {
-                                $location.url('/sparql');
-                                $route.reload();
+                                $location.path('/sparql').search({});
                                 return GuideUtils.waitFor(GuideUtils.CSS_SELECTORS.SPARQL_EDITOR_SELECTOR)
                                     .then(() => GuideUtils.deferredShow(500)())
                                     .then(() => YasguiComponentDirectiveUtil.executeSparqlQuery("#query-editor", query));
-                            } else {
-                                const previousStep = services.ShepherdService.getPreviousStepFromHistory(stepId);
-                                return previousStep.options.initPreviousStep(services, previousStep.options.id)
-                                    .then(() => YasguiComponentDirectiveUtil.setQuery(SPARQL_DIRECTIVE_SELECTOR, query));
                             }
+
+                            const previousStep = services.ShepherdService.getPreviousStepFromHistory(stepId);
+                            return previousStep.options.initPreviousStep(services, previousStep.options.id)
+                                .then(() => YasguiComponentDirectiveUtil.setQuery(SPARQL_DIRECTIVE_SELECTOR, query));
                         }
                     }, options)
                 });
@@ -960,6 +935,7 @@ PluginRegistry.add('guide.step', [
             const toastr = services.toastr;
             const $translate = services.$translate;
             const $interpolate = services.$interpolate;
+            const EventEmitterService = services.EventEmitterService;
             options.mainAction = 'import-file';
 
             const steps = [
@@ -984,6 +960,7 @@ PluginRegistry.add('guide.step', [
             }
 
             const importSettingsButtonSelector = GuideUtils.getGuideElementSelector('import-settings-import-button');
+            let filesForUploadSelectedSubscription;
             steps.push(...[
                 {
                     guideBlockName: 'clickable-element',
@@ -995,38 +972,80 @@ PluginRegistry.add('guide.step', [
                         // 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());
-                                });
+                            // Subscribes to event "filesForUploadSelected", when the step is showing, this will give opportunity
+                            // to canceling uploading if user not choose correct file.
+                            filesForUploadSelectedSubscription = EventEmitterService.subscribe('filesForUploadSelected', ((eventData) => {
+                                const uploadedFiles = eventData.files || [];
+                                if (uploadedFiles.some((uploadedFile) => uploadedFile.name === options.resourceFile)) {
+                                    // When tha correct file is selected, the guide can continue.
+
+                                    // Check for duplicated name, if import button for guide rdf data exist.
+                                    if (GuideUtils.isVisible(GuideUtils.getGuideElementSelector('import-file-' + options.resourceFile))) {
+                                        GuideUtils.getOrWaiteFor('.confirm-duplicate-files-dialog')
+                                            .then(() => guide.next());
+                                    } else {
+                                        GuideUtils.getOrWaiteFor(importSettingsButtonSelector)
+                                            .then(() => guide.next());
+                                    }
+                                } else {
+                                    // Canceling the automatically uploading of files because the guide rdf file is not selected.
+                                    eventData.cancel = true;
+                                }
+                            }));
                         },
                         hide: () => () => {
-                            // Remove ths listener from element. It is important when step is hided.
-                            $('#ngf-wb-import-uploadFile').off('change.importRdfFile');
+                            if (filesForUploadSelectedSubscription) {
+                                filesForUploadSelectedSubscription();
+                            }
                         },
                         onNextValidate: () => {
-                            if (!$(GuideUtils.getGuideElementSelector('import-file-' + options.resourceFile)).length) {
-                                GuideUtils.noNextErrorToast(toastr, $translate, $interpolate,
-                                    'guide.step_plugin.import_rdf_file.file-must-be-uploaded', options);
-                                return Promise.resolve(false);
-                            } else {
-                                return Promise.resolve(true);
-                            }
+                            return Promise.allSettled([GuideUtils.getOrWaiteFor('.confirm-duplicate-files-dialog'), GuideUtils.getOrWaiteFor(GuideUtils.getGuideElementSelector('import-file-' + options.resourceFile))])
+                                .then(([confirmDialogPromise, importButtonPromise]) => {
+                                    // There are two ways to exit this step: if the duplication dialog is opened or if the import button for the guide file is displayed.
+                                    // The first scenario indicates that the user is trying to upload the same file,
+                                    // while the second scenario suggests that the guide has been started more than once.
+                                    if ('rejected' === confirmDialogPromise.status && 'rejected' === importButtonPromise.status) {
+                                        GuideUtils.noNextErrorToast(toastr, $translate, $interpolate, 'guide.step_plugin.import_rdf_file.file-must-be-uploaded', options);
+                                        return false;
+                                    }
+                                    return true;
+                                });
+                        },
+                        onNextClick: (guide) => {
+                            GuideUtils.getOrWaiteFor(GuideUtils.getGuideElementSelector('import-file-' + options.resourceFile))
+                                .then((element) => {
+                                    // if we have file import button for the guide rdf file, this indicates that we go through this step for second time.
+                                    // This can happen if user start guide for second time.
+                                    element.click();
+                                })
+                                .catch((error) => {
+                                    // This shouldn't be happening.
+                                    console.log(error);
+                                })
+                                .finally(() => guide.next());
                         }
                     }, options)
                 },
+                // This step is optional and will only appear if the file we want to upload has already been uploaded.
+                // If the file is already uploaded, a confirmation dialog will be opened, and this step will display the confirm button of the dialog.
                 {
                     guideBlockName: 'clickable-element',
                     options: angular.extend({}, {
-                        content: 'guide.step_plugin.import_rdf_file.import-file.button.content',
-                        elementSelector: GuideUtils.getGuideElementSelector('import-file-' + options.resourceFile),
+                        content: 'guide.step_plugin.import_rdf_file.confirm_duplicate_files_dialog.content',
+                        elementSelector: GuideUtils.getElementSelector('.confirm-duplicate-files-dialog .confirm-overwrite-btn'),
                         url: '/import',
-                        placement: 'left',
+                        placement: 'bottom',
                         class: 'import-file-button-guide-dialog',
-                        onNextClick: () => GuideUtils.clickOnGuideElement('import-file-' + options.resourceFile)()
+                        skipFromHistory: true,
+                        // Checks whether the confirm dialog is currently open.
+                        showOn: () => GuideUtils.isVisible(GuideUtils.getElementSelector('.confirm-duplicate-files-dialog')),
+                        onNextClick: () => GuideUtils.clickOnElement('.confirm-duplicate-files-dialog .confirm-overwrite-btn')(),
+                        onPreviousClick: () => {
+                            if (GuideUtils.isVisible(GuideUtils.getElementSelector('.confirm-duplicate-files-dialog'))) {
+                                return GuideUtils.clickOnElement('.confirm-duplicate-files-dialog .cancel-btn');
+                            }
+                            return Promise.resolve();
+                        }
                     }, options)
                 },
                 {
@@ -1040,19 +1059,13 @@ PluginRegistry.add('guide.step', [
                             GuideUtils.clickOnGuideElement('import-settings-cancel-button')()
                                 .then(() => resolve());
                         }),
-                        beforeShowPromise: () => new Promise(function (resolve, reject) {
-                            services.GuideUtils.deferredShow(300)()
-                                .then(() => {
-                                    services.GuideUtils.waitFor(importSettingsButtonSelector, 3)
-                                        .then(() => {
-                                            resolve();
-                                        })
-                                        .catch((error) => {
-                                            services.toastr.error(services.$translate.instant('guide.unexpected.error.message'));
-                                            reject(error);
-                                        });
-                                });
-                        }),
+                        beforeShowPromise: () => services.GuideUtils.deferredShow(300)()
+                            .then(() => GuideUtils.getOrWaiteFor(importSettingsButtonSelector, 3)
+                                    .catch((error) => {
+                                        services.toastr.error(services.$translate.instant('guide.unexpected.error.message'));
+                                        return Promise.reject(error);
+                                    })
+                            ),
                         onNextClick: () => GuideUtils.clickOnGuideElement('import-settings-import-button')(),
                         canBePaused: false
                     }, options)
@@ -1062,12 +1075,16 @@ PluginRegistry.add('guide.step', [
                     options: angular.extend({}, {
                         content: 'guide.step_plugin.import_status_info.content',
                         url: '/import',
-                        elementSelector: GuideUtils.getGuideElementSelector('import-status-info'),
+                        elementSelector: '.import-resource-message',
                         class: 'import-status-info-guide-dialog',
-                        onPreviousClick: () => new Promise(function (resolve) {
-                            GuideUtils.clickOnGuideElement('import-file-' + options.resourceFile)()
-                                .then(() => resolve());
-                        })
+                        beforeShowPromise: () => {
+                            if (GuideUtils.isVisible('.import-resource-message')) {
+                                return Promise.resolve();
+                            }
+                            return GuideUtils.waitFor('.import-resource-message', 10);
+                        },
+                        onPreviousClick: () => GuideUtils.getOrWaiteFor(GuideUtils.getGuideElementSelector('import-file-' + options.resourceFile), 10)
+                                .then((element) => { element.click() })
                     }, options)
                 }
             ]);
@@ -1139,8 +1156,8 @@ PluginRegistry.add('guide.step', [
                     menuSelector = 'menu-sparql';
                     menuTitle = 'menu.sparql.label';
                     menuDialogClass = 'menu-sparql-guide-dialog';
-                    viewName = 'view.sparql.title';
-                    helpInfo = 'view.sparql.helpInfo';
+                    viewName = 'view.sparql-editor.title';
+                    helpInfo = 'view.sparql-editor.helpInfo';
 
                     break;
                 case "class-hierarchy":
@@ -1194,16 +1211,14 @@ PluginRegistry.add('guide.step', [
                                     guide.next();
                                 }
                             }),
-                    initPreviousStep: (services, stepId) => new Promise((resolve, reject) => {
+                    initPreviousStep: (services, stepId) => {
                         const previousStep = services.ShepherdService.getPreviousStepFromHistory(stepId);
                         if (previousStep) {
-                            previousStep.options.initPreviousStep(services, previousStep.options.id)
-                                .then(() => resolve())
-                                .catch((error) => reject(error));
-                        } else {
-                            resolve();
+                            return previousStep.options.initPreviousStep(services, previousStep.options.id);
                         }
-                    })
+
+                        return Promise.resolve();
+                    }
                 }, options)
             });
 
@@ -1225,16 +1240,14 @@ PluginRegistry.add('guide.step', [
                             return true;
                         },
                         onNextClick: (guide) => GuideUtils.clickOnGuideElement(submenuSelector, ' a')().then(() => guide.next()),
-                        initPreviousStep: (services, stepId) => new Promise((resolve, reject) => {
+                        initPreviousStep: (services, stepId) => {
                             const previousStep = services.ShepherdService.getPreviousStepFromHistory(stepId);
                             if (previousStep) {
-                                previousStep.options.initPreviousStep(services, previousStep.options.id)
-                                    .then(() => resolve())
-                                    .catch((error) => reject(error));
-                            } else {
-                                resolve();
+                                return previousStep.options.initPreviousStep(services, previousStep.options.id);
                             }
-                        })
+
+                            return Promise.resolve();
+                        }
                     }, options)
                 });
             }
@@ -1277,14 +1290,11 @@ PluginRegistry.add('guide.step', [
                     },
                     class: 'repository-select-button-guide-dialog',
                     advanceOn: undefined,
-                    beforeShowPromise: () => new Promise(function (resolve, reject) {
-                        services.GuideUtils.waitFor(getRepositoryElementSelector(services, options), 1)
-                            .then(() => resolve())
-                            .catch((error) => {
-                                services.toastr.error(services.$translate.instant('guide.unexpected.error.message'));
-                                reject(error);
-                            });
-                    }),
+                    beforeShowPromise: () => services.GuideUtils.waitFor(getRepositoryElementSelector(services, options), 1)
+                        .catch((error) => {
+                            services.toastr.error(services.$translate.instant('guide.unexpected.error.message'));
+                            throw (error);
+                        }),
                     show: (guide) => () => {
                         $('#repositorySelectDropdown').addClass('autoCloseOff');
                         // Added listener to the element.
@@ -1349,21 +1359,14 @@ PluginRegistry.add('guide.step', [
                                 .then(() => $(step.elementSelector).trigger('click'))
                                 .then(() => guide.next());
                         },
-                        initPreviousStep: (services, stepId) => new Promise((resolve, reject) => {
+                        initPreviousStep: (services, stepId) => {
                             const currentStepId = services.ShepherdService.getCurrentStepId();
                             if (currentStepId === stepId) {
-                                resolve();
-                            } else {
-                                const previousStep = services.ShepherdService.getPreviousStepFromHistory(stepId);
-                                previousStep.options.initPreviousStep(services, previousStep.options.id)
-                                    .then(() => {
-                                        resolve();
-                                    })
-                                    .catch((error) => {
-                                        reject(error);
-                                    });
+                                return Promise.resolve();
                             }
-                        })
+                            const previousStep = services.ShepherdService.getPreviousStepFromHistory(stepId);
+                            return previousStep.options.initPreviousStep(services, previousStep.options.id);
+                        }
                     }, options)
                 }, {
                     guideBlockName: 'read-only-element',
@@ -1373,23 +1376,20 @@ PluginRegistry.add('guide.step', [
                         elementSelector: GuideUtils.CSS_SELECTORS.SPARQL_RESULTS_ROWS_SELECTOR,
                         class: 'table-graph-overview-guide-dialog',
                         placement: 'top',
-                        initPreviousStep: (services, stepId) => new Promise((resolve, reject) => {
+                        beforeShowPromise: () => GuideUtils.waitFor(`.resource-info a.source-link[href="${options.iri}"]`, 3)
+                            .then(() => GuideUtils.waitFor(GuideUtils.CSS_SELECTORS.SPARQL_RESULTS_ROWS_SELECTOR, 3)),
+                        initPreviousStep: (services, stepId) => {
                             const currentStepId = services.ShepherdService.getCurrentStepId();
                             if (currentStepId === stepId) {
-                                GuideUtils.defaultInitPreviousStep(services, stepId).then(() => resolve()).catch((error) => reject(error));
-                            } else {
-                                const url = `/resource?uri=${options.iri}&role=subject`;
-                                if (url !== decodeURIComponent($location.url())) {
-                                    $location.url(url);
-                                    $route.reload();
-                                    GuideUtils.waitFor(GuideUtils.CSS_SELECTORS.SPARQL_RESULTS_ROWS_SELECTOR)
-                                        .then(() => resolve())
-                                        .catch((error) => reject(error));
-                                } else {
-                                    resolve();
-                                }
+                                return GuideUtils.defaultInitPreviousStep(services, stepId);
                             }
-                        })
+                            const url = `/resource?uri=${options.iri}&role=subject`;
+                            if (url !== decodeURIComponent($location.url())) {
+                                $location.path('/resource').search({uri: options.iri, role: 'subject'});
+                                return GuideUtils.waitFor(`.resource-info a.source-link[href="${options.iri}"]`, 3);
+                            }
+                            return Promise.resolve();
+                        }
                     }, options)
                 }
             ];
@@ -1410,28 +1410,27 @@ PluginRegistry.add('guide.step', [
                                             .then(() => $(step.elementSelector).trigger('click'))
                                             .then(() => guide.next());
                                     },
-                                    initPreviousStep: (services, stepId) => new Promise((resolve, reject) => {
+                                    initPreviousStep: (services, stepId) => {
                                         const linkUrl = `/resource?uri=${subStep.iri}&role=subject`;
                                         const tableGraphLinkUrl = `/resource?uri=${options.iri}&role=subject`;
                                         const url = decodeURIComponent($location.url());
 
                                         const currentStepId = services.ShepherdService.getCurrentStepId();
-
                                         if (currentStepId === stepId && tableGraphLinkUrl === url) {
                                             // this case is first link in the sequence before click the link, so we have to resolve it.
-                                            resolve();
-                                        } else if (currentStepId !== stepId && linkUrl === url) {
+                                            return Promise.resolve();
+                                        }
+
+                                        if (linkUrl === url) {
                                             // this case is first link in the sequence after click the link, so we have to call previous step.
-                                            GuideUtils.defaultInitPreviousStep(services, stepId).then(() => resolve()).catch((error) => reject(error));
-                                        } else {
-                                            // this case is from second link we have to reload
-                                            $location.url(linkUrl);
-                                            $route.reload();
-                                            GuideUtils.waitFor(GuideUtils.CSS_SELECTORS.SPARQL_RESULTS_ROWS_SELECTOR)
-                                                .then(() => resolve())
-                                                .catch((error) => reject(error));
+                                            return GuideUtils.defaultInitPreviousStep(services, stepId);
                                         }
-                                    })
+
+                                        // this case is from second link we have to reload
+                                        $location.url(linkUrl);
+                                        $route.reload();
+                                        return GuideUtils.waitFor(GuideUtils.CSS_SELECTORS.SPARQL_RESULTS_ROWS_SELECTOR);
+                                    }
                                 }, angular.extend({}, options, subStep))
                             });
                             break;
@@ -1447,28 +1446,23 @@ PluginRegistry.add('guide.step', [
                                             .then(() => $(step.elementSelector).trigger('click'))
                                             .then(() => guide.next());
                                     },
-                                    initPreviousStep: (services, stepId) => new Promise((resolve, reject) => {
+                                    initPreviousStep: (services, stepId) => {
                                         const currentStepId = services.ShepherdService.getCurrentStepId();
                                         if (currentStepId === stepId) {
-                                            resolve();
-                                        } else {
-                                            const previousStep = services.ShepherdService.getPreviousStepFromHistory(stepId);
-                                            previousStep.options.initPreviousStep(services, previousStep.options.id)
-                                                .then(() => {
-                                                    let url = $location.url();
-                                                    url = url.substring(0, url.indexOf('role=') + 5);
-                                                    url += subStep.role;
-                                                    $location.url(url);
-                                                    $route.reload();
-                                                    GuideUtils.waitFor(GuideUtils.CSS_SELECTORS.SPARQL_RESULTS_ROWS_SELECTOR)
-                                                        .then(() => resolve())
-                                                        .catch((error) => reject(error));
-                                                })
-                                                .catch((error) => {
-                                                    reject(error);
-                                                });
+                                            return Promise.resolve();
                                         }
-                                    })
+
+                                        const previousStep = services.ShepherdService.getPreviousStepFromHistory(stepId);
+                                        return previousStep.options.initPreviousStep(services, previousStep.options.id)
+                                            .then(() => {
+                                                let url = $location.url();
+                                                url = url.substring(0, url.indexOf('role=') + 5);
+                                                url += subStep.role;
+                                                $location.url(url);
+                                                $route.reload();
+                                                return GuideUtils.waitFor(GuideUtils.CSS_SELECTORS.SPARQL_RESULTS_ROWS_SELECTOR);
+                                            });
+                                    }
                                 }, angular.extend({}, options, subStep))
                             });
                             break;
@@ -1483,15 +1477,14 @@ PluginRegistry.add('guide.step', [
                                         GuideUtils.waitFor(step.elementSelector, 3)
                                             .then(() => $(step.elementSelector).trigger('click'));
                                     },
-                                    initPreviousStep: (services, stepId) => new Promise((resolve, reject) => {
+                                    initPreviousStep: (services, stepId) => {
                                         const currentStepId = services.ShepherdService.getCurrentStepId();
-
                                         if (currentStepId === stepId) {
-                                            resolve();
-                                        } else {
-                                            GuideUtils.defaultInitPreviousStep(services, stepId).then(() => resolve()).catch((error) => reject(error));
+                                            return Promise.resolve();
                                         }
-                                    })
+
+                                        return GuideUtils.defaultInitPreviousStep(services, stepId);
+                                    }
                                 }, angular.extend({}, options, subStep))
                             });
                             steps.push({
@@ -1591,29 +1584,24 @@ PluginRegistry.add('guide.step', [
                         url: '/graphs-visualizations',
                         elementSelector: '.graph-visualization',
                         placement: 'left',
-                        onPreviousClick: () => new Promise(function (resolve, reject) {
+                        onPreviousClick: () => {
                             $location.url('/graphs-visualizations');
+                            // the page have to be reloaded because the "Search RDF resource..." input have to be visible, due to implementation
                             $route.reload();
                             const searchInputSelector = GuideUtils.getGuideElementSelector('graphVisualisationSearchInputNotConfigured', ' input');
-                            GuideUtils.waitFor(searchInputSelector, 3)
+                            return GuideUtils.waitFor(searchInputSelector, 3)
                                 .then(() => {
                                     GuideUtils.validateTextInput(searchInputSelector, options.easyGraphInputText);
-                                    resolve();
-                                })
-                                .catch((error) => reject(error));
-                        }),
-                        initPreviousStep: () => new Promise(function (resolve, reject) {
+                                });
+                        },
+                        initPreviousStep: () => {
                             const url = '/graphs-visualizations?uri=' + options.iri;
                             if (url !== decodeURIComponent($location.url())) {
-                                $location.url(url);
-                                $route.reload();
-                                GuideUtils.waitFor(`.node-wrapper[id^="${options.iri}"] circle`, 3)
-                                    .then(() => resolve())
-                                    .catch((error) => reject(error));
-                            } else {
-                                resolve();
+                                $location.path('/graphs-visualizations').search({uri: options.iri});
+                                return GuideUtils.waitFor(`.node-wrapper[id^="${options.iri}"] circle`, 3);
                             }
-                        }),
+                            return Promise.resolve();
+                        },
                         canBePaused: false,
                         forceReload: true
                     }, options)
@@ -1668,35 +1656,30 @@ PluginRegistry.add('guide.step', [
                             // Remove the "dblclick" listener of element. It is important when step is hided.
                             $(elementSelector).off('dblclick.onNodeDbClicked');
                         },
-                        beforeShowPromise: () => new Promise(function (resolve, reject) {
+                        beforeShowPromise: () => {
                             $route.reload();
-                            GuideUtils.deferredShow(50)()
+                            return GuideUtils.deferredShow(50)()
                                 .then(() => {
-                                    GuideUtils.awaitAlphaDropD3(elementSelector, $rootScope)()
-                                        .then(() => resolve())
-                                        .catch((error) => reject(error));
+                                    GuideUtils.awaitAlphaDropD3(elementSelector, $rootScope)();
                                 });
-                        }),
-                        initPreviousStep: (services, stepId) => new Promise(function (resolve, reject) {
+                        },
+                        initPreviousStep: (services, stepId) => {
                             const previousStep = services.ShepherdService.getPreviousStepFromHistory(stepId);
-                            previousStep.options.initPreviousStep(services, previousStep.id)
+                            return previousStep.options.initPreviousStep(services, previousStep.id)
                                 .then(() => {
                                     const currentStepId = services.ShepherdService.getCurrentStepId();
                                     // Skip expanding of node if last step is "visual-graph-expand"
                                     if (currentStepId === stepId) {
-                                        resolve();
-                                    } else {
-                                        GuideUtils.graphVizExpandNode(elementSelector);
-                                        GuideUtils.deferredShow(50)()
-                                            .then(() => {
-                                                GuideUtils.awaitAlphaDropD3(null, $rootScope)()
-                                                    .then(() => resolve())
-                                                    .catch((error) => reject(error));
-                                            });
+                                        return Promise.resolve;
                                     }
-                                })
-                                .catch((error) => reject(error));
-                        })
+
+                                    GuideUtils.graphVizExpandNode(elementSelector);
+                                    return GuideUtils.deferredShow(50)()
+                                        .then(() => {
+                                            return GuideUtils.awaitAlphaDropD3(null, $rootScope)();
+                                        });
+                                });
+                        }
                     }, options)
                 }
             ];
@@ -1822,13 +1805,12 @@ PluginRegistry.add('guide.step', [
                         selector: closeButtonSelector,
                         event: 'click'
                     },
-                    beforeShowPromise: () => new Promise(function (resolve) {
+                    beforeShowPromise: () => {
                         // We have to be sure that node info sidebar is open. It is needed when this step is loaded when next step "Previous"
                         // button is clicked.
                         GuideUtils.graphVizShowNodeInfo(elementSelector);
-                        GuideUtils.deferredShow(500)()
-                            .then(() => resolve());
-                    }),
+                        return GuideUtils.deferredShow(500)();
+                    },
                     onNextClick: () => GuideUtils.waitFor(closeButtonSelector, 3).then(() => $(closeButtonSelector).trigger('click'))
                 }, options)
             });
@@ -1879,16 +1861,14 @@ PluginRegistry.add('guide.step', [
                         show: disableAllNodes,
                         hide: enableAllNodes,
                         beforeShowPromise: GuideUtils.awaitAlphaDropD3(elementSelector, $rootScope),
-                        initPreviousStep: (services, stepId) => new Promise((resolve, reject) => {
+                        initPreviousStep: (services, stepId) => {
                             if (GuideUtils.isVisible(elementSelector)) {
-                                resolve();
-                            } else {
-                                const previousStep = services.ShepherdService.getPreviousStepFromHistory(stepId);
-                                previousStep.options.initPreviousStep(services, previousStep.id)
-                                    .then(() => resolve())
-                                    .catch((error) => reject(error));
+                                return Promise.resolve();
                             }
-                        })
+
+                            const previousStep = services.ShepherdService.getPreviousStepFromHistory(stepId);
+                            return previousStep.options.initPreviousStep(services, previousStep.id);
+                        }
                     }, options)
                 }
             ];
@@ -2053,7 +2033,7 @@ PluginRegistry.add('route', {
     'module': 'graphdb.framework.impex.import',
     'path': 'import/app',
     'chunk': 'import',
-    'controller': 'CommonCtrl',
+    'controller': 'ImportViewCtrl',
     'templateUrl': 'pages/import.html',
     'title': 'common.import',
     'reloadOnSearch': false,
@@ -2533,8 +2513,8 @@ PluginRegistry.add('route', {
     'chunk': 'sparql',
     'controller': 'SparqlEditorCtrl',
     'templateUrl': 'pages/sparql-editor.html',
-    'title': 'view.sparql.title',
-    'helpInfo': 'view.sparql.helpInfo',
+    'title': 'view.sparql-editor.title',
+    'helpInfo': 'view.sparql-editor.helpInfo',
     'reloadOnSearch': false
 });