graphdb-workbench-tests 3.2.0-TR5 → 3.2.0-TR6

package/e2e-legacy/import/initial-state/import-page-without-selected-repository.spec.js

@@ -23,6 +23,6 @@ describe('Initial state of the import view without a selected repository', () =>
 
     const verifyInitialStateWhenNoRepositoryIsSelected = () => {
         RepositoryErrorsWidgetSteps.getWidget().should('be.visible');
-        ImportUserDataSteps.getResourcesTable().should('be.hidden');
+        ImportUserDataSteps.getResourcesTable().should('not.exist');
     };
 });

package/e2e-legacy/ttyg/create-agent.spec.js

@@ -2,11 +2,11 @@ import {TTYGViewSteps} from "../../steps/ttyg/ttyg-view-steps";
 import {TTYGStubs} from "../../stubs/ttyg/ttyg-stubs";
 import {RepositoriesStubs} from "../../stubs/repositories/repositories-stubs";
 import {TtygAgentSettingsModalSteps} from "../../steps/ttyg/ttyg-agent-settings-modal.steps";
-import {SimilarityIndexStubs} from "../../stubs/similarity-index-stubs";
 import {ConnectorStubs} from "../../stubs/connector-stubs";
 import {ModalDialogSteps} from "../../steps/modal-dialog-steps";
 import {RepositoriesStub} from "../../stubs/repositories-stub";
 import {AlertDialogSteps} from "../../steps/alert-dialog-steps";
+import {ApplicationSteps} from '../../steps/application-steps.js';
 
 describe('TTYG create new agent', () => {
     const repositoryId = 'starwars';
@@ -68,10 +68,12 @@ describe('TTYG create new agent', () => {
         // enable SPARQL extraction method and disable it again to check the error message for the extraction methods
         TtygAgentSettingsModalSteps.enableSparqlExtractionMethod();
         // The component here is the bootstrap collapse component, so we need to wait for the animation to finish, otherwise the test might fail randomly
+        // eslint-disable-next-line cypress/no-unnecessary-waiting
         cy.wait(1000);
         TtygAgentSettingsModalSteps.getSparqlExtractionMethodPanel().should('be.visible');
         TtygAgentSettingsModalSteps.disableSparqlExtractionMethod();
         // The component here is the bootstrap collapse component, so we need to wait for the animation to finish, otherwise the test might fail randomly
+        // eslint-disable-next-line cypress/no-unnecessary-waiting
         cy.wait(1000);
         TtygAgentSettingsModalSteps.getSparqlExtractionMethodPanel().should('not.exist');
         TtygAgentSettingsModalSteps.getSaveAgentButton().should('be.disabled');
@@ -143,6 +145,7 @@ describe('TTYG create new agent', () => {
         TtygAgentSettingsModalSteps.saveAgent();
         TtygAgentSettingsModalSteps.getCreatingAgentLoader().should('be.visible');
         cy.wait('@create-agent').then((interception) => {
+            // eslint-disable-next-line no-undef
             assert.deepEqual(interception.request.body, {
                 "id": "id",
                 "name": "Test Agent",
@@ -251,7 +254,7 @@ describe('TTYG create new agent', () => {
     }, () => {
         TTYGStubs.stubChatsListGetNoResults();
         TTYGStubs.stubAgentListGet('/ttyg/agent/get-agent-list-0.json');
-        SimilarityIndexStubs.stubGetSimilarityIndexes('/similarity/get-similarity-indexes-0.json');
+        TTYGStubs.getSimilarityIndexesForRepo();
         // Given I have opened the ttyg page
         TTYGViewSteps.visit();
         cy.wait('@get-all-repositories');
@@ -274,7 +277,7 @@ describe('TTYG create new agent', () => {
     }, () => {
         TTYGStubs.stubChatsListGetNoResults();
         TTYGStubs.stubAgentListGet('/ttyg/agent/get-agent-list-0.json');
-        SimilarityIndexStubs.stubGetSimilarityIndexes();
+        TTYGStubs.getSimilarityIndexesForRepo(repositoryId);
         // Given I have opened the ttyg page
         TTYGViewSteps.visit();
         cy.wait('@get-all-repositories');
@@ -286,8 +289,10 @@ describe('TTYG create new agent', () => {
         TtygAgentSettingsModalSteps.selectRepository(repositoryId);
         // And I enable the similarity search extraction method
         TtygAgentSettingsModalSteps.enableSimilaritySearchMethodPanel();
-        // Then I expect similarity index to be selected
-        TtygAgentSettingsModalSteps.getSimilarityIndexField().should('have.value', '0');
+        // Then I expect the first similarity search index instance to be selected
+        TtygAgentSettingsModalSteps.getSimilarityIndexSelectedOption().should('have.text', 'otkg-vector-new');
+        // And I expect that all vector fields from that instance should be selected
+        TtygAgentSettingsModalSteps.getSimilarityIndexSelectedVectorFieldsFieldsCount().should('contain', '1 selected');
         // Then agent save button should be enabled
         TtygAgentSettingsModalSteps.getSaveAgentButton().should('be.enabled');
         // When I set the similarity index threshold
@@ -297,6 +302,7 @@ describe('TTYG create new agent', () => {
         TtygAgentSettingsModalSteps.getSimilarityIndexMaxTriplesField().should('have.value', '');
         TtygAgentSettingsModalSteps.setSimilarityIndexMaxTriples('100');
         // When I save the agent
+        // !!! This stub is not for agent with similarity search method, but it's ok for this test !!!
         TTYGStubs.stubAgentCreate();
         TTYGStubs.stubAgentListGet('/ttyg/agent/get-agent-list-new-agent.json');
         TtygAgentSettingsModalSteps.saveAgent();
@@ -432,7 +438,7 @@ describe('TTYG create new agent', () => {
         TTYGStubs.stubChatsListGetNoResults();
         TTYGStubs.stubAgentListGet('/ttyg/agent/get-agent-list-0.json');
         ConnectorStubs.stubGetConnectors();
-        SimilarityIndexStubs.stubTTYGSimilarityIndexes();
+        TTYGStubs.getSimilarityIndexesForRepo(repositoryId );
         // Given I have opened the ttyg page
         TTYGViewSteps.visit();
         cy.wait('@get-all-repositories');
@@ -444,16 +450,21 @@ describe('TTYG create new agent', () => {
 
         // When I open Similarity index name panel
         TtygAgentSettingsModalSteps.enableSimilaritySearchMethodPanel();
+        cy.wait('@get-similarity-indexes');
         // Then I expect to see the first index selected.
-        TtygAgentSettingsModalSteps.verifySimilarityIndexSelected('similarity_index_starwars_one');
+        TtygAgentSettingsModalSteps.verifySimilarityIndexSelected('otkg-vector-new');
 
         // When I select another repository that have similarity connectors
+        TTYGStubs.getSimilarityIndexesForRepo('biomarkers', '/ttyg/agent/get-similarity-indexes-for-another-repo.json');
         TtygAgentSettingsModalSteps.selectRepository('biomarkers');
+        cy.wait('@get-similarity-indexes');
         // Then I expect to see the first similarity index from new repository selected.
-        TtygAgentSettingsModalSteps.verifySimilarityIndexSelected('similarity_index_biomarkers_one');
+        TtygAgentSettingsModalSteps.verifySimilarityIndexSelected('biomarkers-vector');
 
         // When I select a repository that not have similarity indexes
         TtygAgentSettingsModalSteps.selectRepository('ttyg-repo-1725518186812');
+        // Then I expect an error message to be open for similarity search index missing
+        ApplicationSteps.getErrorNotifications().should('be.visible');
         // Then I expect help message to be open
         TtygAgentSettingsModalSteps.getSimilaritySearchIndexMissingHelp().should('be.visible');
 
@@ -522,7 +533,7 @@ describe('TTYG create new agent', () => {
         // When I open agent settings dialog and make all steps so the create button became enabled.
         TTYGStubs.stubChatsListGetNoResults();
         TTYGStubs.stubAgentListGet('/ttyg/agent/get-agent-list-0.json');
-        SimilarityIndexStubs.stubGetSimilarityIndexes('/similarity/get-similarity-indexes-0.json');
+        TTYGStubs.getSimilarityIndexesForRepo();
         TTYGViewSteps.visit();
         cy.wait('@get-all-repositories');
         TTYGViewSteps.createFirstAgent();

package/e2e-legacy/ttyg/ttyg-initial-state-with-selected-repository.spec.js

@@ -10,7 +10,7 @@ function verifyStateWithSelectedRepository() {
     TTYGViewSteps.getApiKeyMessage().should('be.visible');
     TTYGViewSteps.getMissingApiKeyToastMessage()
         .should('be.visible')
-        .and('contain', 'Set the config property \'graphdb.llm.api-key\' to your LLM API key.');
+        .and('contain', 'Set the config property \'graphdb.llm.api-key\' to your LLM API key');
 }
 
 // TODO: skipped until BE releases an updated version with the new API key.

package/fixtures/ttyg/agent/get-agent-defaults.json

@@ -25,9 +25,10 @@
         },
         {
             "method": "similarity_search",
-            "similarityIndex": "similarity-index",
+            "similarityIndex": null,
             "similarityIndexThreshold": 0.6,
-            "maxNumberOfTriplesPerCall": 0
+            "maxNumberOfTriplesPerCall": 0,
+            "connectorType": "similarity"
         },
         {
             "method": "retrieval_search",
@@ -39,6 +40,10 @@
     "additionalExtractionMethods": [
         {
             "method": "iri_discovery_search"
+        },
+        {
+            "method": "autocomplete_iri_discovery_search",
+            "limit": 0
         }
     ]
 }

package/fixtures/ttyg/agent/get-similarity-indexes-for-another-repo.json

@@ -0,0 +1,6 @@
+{
+    "opensearch:biomarkers-vector": [
+        "docText1",
+        "docText2"
+    ]
+}

package/fixtures/ttyg/agent/get-similarity-indexes.json

@@ -0,0 +1,13 @@
+{
+    "opensearch:otkg-vector-new": [
+        "docText1"
+    ],
+    "similarity": [
+        "test",
+        "test-copy"
+    ],
+    "elasticsearch:otkg-vector": [
+        "docText1",
+        "docText2"
+    ]
+}

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "graphdb-workbench-tests",
-  "version": "3.2.0-TR5",
+  "version": "3.2.0-TR6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "graphdb-workbench-tests",
-      "version": "3.2.0-TR5",
+      "version": "3.2.0-TR6",
       "license": "Apache-2.0",
       "devDependencies": {
         "@bahmutov/cypress-code-coverage": "^2.7.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphdb-workbench-tests",
-  "version": "3.2.0-TR5",
+  "version": "3.2.0-TR6",
   "description": "Cypress tests for GraphDB workbench",
   "type": "module",
   "scripts": {

package/steps/setup/user-and-access-steps.js

@@ -7,7 +7,7 @@ export class UserAndAccessSteps {
 
     static visitInProdMode() {
         cy.visit('/users', {
-            onBeforeLoad: (win) => {
+            onBeforeLoad: () => {
                 EnvironmentStubs.stubWbProdMode();
             }
         });
@@ -186,7 +186,7 @@ export class UserAndAccessSteps {
     }
 
     static getPermissionError() {
-        return cy.get('.permission-banner');
+        return cy.getByTestId('restricted-access-banner');
     }
 
     static getModal() {

package/steps/ttyg/ttyg-agent-settings-modal.steps.js

@@ -227,7 +227,7 @@ export class TtygAgentSettingsModalSteps extends ModalDialogSteps {
     }
 
     static clickOnSimilaritySearchIndexMissingHelp() {
-        this.getSimilaritySearchIndexMissingHelp().find('a').click();
+        this.getSimilaritySearchIndexMissingHelp().find('a').eq(0).click();
     }
 
     static getSimilarityIndexFormGroup() {
@@ -235,7 +235,11 @@ export class TtygAgentSettingsModalSteps extends ModalDialogSteps {
     }
 
     static getSimilarityIndexField() {
-        return this.getSimilarityIndexFormGroup().find('select');
+        return this.getSimilarityIndexFormGroup().find('#connectorInstances');
+    }
+
+    static getSimilarityIndexSelectedOption() {
+        return this.getSimilarityIndexField().find('option:selected');
     }
 
     static selectSimilarityIndex(index) {
@@ -246,6 +250,14 @@ export class TtygAgentSettingsModalSteps extends ModalDialogSteps {
         this.getSimilarityIndexField().find('option:selected').should('have.text', similarityIndex);
     }
 
+    static getSimilarityIndexVectorFieldsField() {
+        return this.getSimilarityIndexFormGroup().find('#vectorFieldsSelect .multiselect-button');
+    }
+
+    static getSimilarityIndexSelectedVectorFieldsFieldsCount() {
+        return this.getSimilarityIndexVectorFieldsField().find('.multiselect-count');
+    }
+
     static getSimilarityIndexThresholdFormGroup() {
         return this.getExtractionMethodPanel('similarity_search').find('.similarity-index-threshold');
     }

package/stubs/ttyg/ttyg-stubs.js

@@ -86,8 +86,16 @@ export class TTYGStubs extends Stubs {
         }).as('get-agent-list');
     }
 
+    static getSimilarityIndexesForRepo(repositoryId, fixture = '/ttyg/agent/get-similarity-indexes.json', delay = 0) {
+        cy.intercept('GET', `rest/similarity/${repositoryId}/indexes`, {
+            fixture: fixture,
+            statusCode: 200,
+            delay: delay
+        }).as('get-similarity-indexes');
+    }
+
     static stubAgentListWithIncompatibleGet(delay = 0) {
-        this.stubAgentListGet('/ttyg/agent/get-agent-list-with-incompatible-agents.json');
+        this.stubAgentListGet('/ttyg/agent/get-agent-list-with-incompatible-agents.json', delay);
     }
 
     static stubAgentGet(fixture = '/ttyg/agent/get-agent.json', delay = 0) {