graphdb-workbench-tests 3.5.0 → 3.5.1-TR1

package/e2e-legacy/setup/settings/my-settings-initial-state.spec.js

@@ -2,7 +2,7 @@ import {MainMenuSteps} from "../../../steps/main-menu-steps";
 import HomeSteps from "../../../steps/home-steps";
 import {SettingsSteps} from "../../../steps/setup/settings-steps";
 
-function verifyInitialState(repositoryId) {
+function verifyInitialState() {
   // Password change field is for admin.
   // explicitly state that the fields must be of type password
   SettingsSteps.getPasswordField().should('be.visible')
@@ -43,14 +43,8 @@ function verifyInitialState(repositoryId) {
   // Repository rights
   // - Admin has read and write access to all repositories."
   SettingsSteps.getUserRepositoryTable().should('be.visible');
-  SettingsSteps.getReadRightsCheckbox(repositoryId)
-    .should('be.visible')
-    .and('be.checked')
-    .and('be.disabled');
-  SettingsSteps.getWriteRightsCheckbox(repositoryId)
-    .should('be.visible')
-    .and('be.checked')
-    .and('be.disabled');
+  // And Admin doesn't see the list of the repositories
+  SettingsSteps.getRepositoryRightsRows().should('not.exist');
 }
 
 describe('My Settings initial state', () => {
@@ -69,7 +63,7 @@ describe('My Settings initial state', () => {
     // Given, I visit the My Settings page via URL
     SettingsSteps.visit();
     // Then,
-    verifyInitialState(repositoryId);
+    verifyInitialState();
   });
 
   it('Should display the correct initial state when navigating via the navigation bar', () => {
@@ -77,6 +71,6 @@ describe('My Settings initial state', () => {
     HomeSteps.visit();
     MainMenuSteps.clickOnMySettings();
     // Then,
-    verifyInitialState(repositoryId);
+    verifyInitialState();
   });
 });

package/e2e-legacy/setup/users-and-access/user-and-access.spec.js

@@ -318,6 +318,8 @@ describe('User and Access', () => {
             verifyDisabledUserAuth('*', {read: false, write: false, maintain: true, graphql: true});
             verifyCheckedUserAuth(repoName, {read: false, write: false, maintain: false, graphql: false});
             verifyDisabledUserAuth(repoName, {read: false, write: false, maintain: false, graphql: true});
+            // The GraphQL checkbox is disabled for the lack of read/write rights, not because of the role
+            UserAndAccessSteps.getGraphqlAnyRoleTooltip().should('not.exist');
         });
 
         context('for non user roles', () => {
@@ -327,8 +329,7 @@ describe('User and Access', () => {
                 verifyCheckedUserAuth('*', {read: true, write: true, maintain: true, graphql: false});
                 verifyDisabledUserAuth('*', {read: true, write: true, maintain: true, graphql: true});
 
-                verifyCheckedUserAuth(repoName, {read: true, write: true, maintain: true, graphql: false});
-                verifyDisabledUserAuth(repoName, {read: true, write: true, maintain: true, graphql: true});
+                UserAndAccessSteps.getRepositoryRightsRows().should('not.exist');
             });
 
             it('repository manager', () => {
@@ -338,8 +339,7 @@ describe('User and Access', () => {
                 verifyCheckedUserAuth('*', {read: true, write: true, maintain: true, graphql: false});
                 verifyDisabledUserAuth('*', {read: true, write: true, maintain: true, graphql: true});
 
-                verifyCheckedUserAuth(repoName, {read: true, write: true, maintain: true, graphql: false});
-                verifyDisabledUserAuth(repoName, {read: true, write: true, maintain: true, graphql: true});
+                UserAndAccessSteps.getRepositoryRightsRows().should('not.exist');
             });
         });
 
@@ -464,6 +464,27 @@ describe('User and Access', () => {
                 createUser(graphqlUser, PASSWORD, ROLE_USER, {read: true, graphql: true, repoName: repositoryId2});
             });
 
+            it('Should not allow GraphQL access for Ontop and FedX repositories', () => {
+                // GIVEN Ontop and FedX repositories alongside a GraphDB one
+                RepositoriesStubs.stubRepositories(0, '/repositories/get-repositories-with-unsupported-graphql-types.json');
+                UserAndAccessSteps.visit();
+                UserAndAccessSteps.clickCreateNewUserButton();
+                // WHEN the user is granted read access to all of them
+                UserAndAccessSteps.toggleReadAccessAny();
+
+                // THEN GraphQL should be available only for the GraphDB repository
+                UserAndAccessSteps.validateGraphqlAccessForRepo('graphdb-repo', {disabled: false});
+                UserAndAccessSteps.getGraphqlRepositoryTypeTooltipForRepo('graphdb-repo').should('not.exist');
+
+                // AND it should be permanently disabled for the Ontop and the FedX ones
+                ['ontop-repo', 'fedx-repo'].forEach((repository) => {
+                    UserAndAccessSteps.validateGraphqlAccessForRepo(repository, {checked: false, disabled: true});
+                    UserAndAccessSteps.hoverGraphQlRightsCheckbox(repository)
+                    UserAndAccessSteps.getAngularTooltip().should('have.text', 'Not available for this repository type');
+                    UserAndAccessSteps.blurGraphQlRightsCheckbox(repository)
+                });
+            });
+
             // Fails for unknown reason only in CI
             it('Can create user with different auth combinations', () => {
                 cy.wait('@getRepositories');

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

@@ -172,6 +172,60 @@ describe('TTYG create new agent', () => {
         TTYGViewSteps.getAgent(0).should('contain', 'Test Agent').and('contain', 'starwars');
     });
 
+    it('should create an agent without temperature or topP parameters', () => {
+        // GIVEN: I have opened the Create Agent dialog and filled in the minimum required fields.
+        openCreateAgentDialog(repositoryId)
+        TtygAgentSettingsModalSteps.getDialog().should('be.visible');
+
+        fillAgentName('Test Agent');
+        TtygAgentSettingsModalSteps.enableSparqlExtractionMethod();
+        TtygAgentSettingsModalSteps.selectSparqlMethodSparqlQuery();
+
+        // WHEN: I disable the temperature setting.
+        TtygAgentSettingsModalSteps.toggleTemperature();
+
+        // AND: I disable the topP setting.
+        TtygAgentSettingsModalSteps.toggleTop();
+
+        // AND: I save the agent.
+        TTYGStubs.stubAgentCreate(1000);
+        TTYGStubs.stubAgentListGet(
+            '/ttyg/agent/get-agent-list-new-agent.json',
+            1000,
+        );
+
+        TtygAgentSettingsModalSteps.saveAgent();
+        TtygAgentSettingsModalSteps.getCreatingAgentLoader().should('be.visible');
+
+        // THEN: I expect the create-agent request not to contain the temperature and topP parameters.
+        cy.wait('@create-agent').then((interception) => {
+            // eslint-disable-next-line no-undef
+            assert.deepEqual(interception.request.body, {
+                id: 'id',
+                name: 'Test Agent',
+                repositoryId: 'starwars',
+                model: 'gpt-4o',
+                contextSize: 128000,
+                seed: 0,
+                assistantsInstructions: {
+                    systemInstruction: '',
+                    userInstruction: 'If you need to write a SPARQL query, use only the classes and properties provided in the schema and don\'t invent or guess any. Always try to return human-readable names or labels and not only the IRIs. If SPARQL fails to provide the necessary information you can try another tool too.',
+                },
+                assistantExtractionMethods: [
+                    {
+                        method: 'sparql_search',
+                        sparqlQuery: 'CONSTRUCT {?s ?p ?o} WHERE {GRAPH <http://example.org/ontology> {?s ?p ?o .}}',
+                        addMissingNamespaces: false,
+                    },
+                ],
+                additionalExtractionMethods: [],
+            });
+        });
+
+        // AND: I expect the modal to be closed.
+        TtygAgentSettingsModalSteps.getDialog().should('not.exist');
+    });
+
     it('Should require FTS to be enabled for selected repository when creating agent with FTS extraction method', () => {
         RepositoriesStubs.stubGetRepositoryConfig(repositoryId, '/repositories/get-repository-config-starwars-disabled-fts.json');
         TTYGStubs.stubChatsListGetNoResults();
@@ -461,6 +515,51 @@ describe('TTYG create new agent', () => {
         TtygAgentSettingsModalSteps.getTemperatureField().should('not.have.class', 'has-warning');
     });
 
+    it('should toggle the temperature setting', () => {
+        // GIVEN: I have opened the Create Agent dialog.
+        openCreateAgentDialog(repositoryId);
+
+        // WHEN: I set a high temperature value.
+        TtygAgentSettingsModalSteps.setTemperature('1.2');
+        // THEN: I expect a warning message to be displayed.
+        TtygAgentSettingsModalSteps.getTemperatureField().should('have.class', 'has-warning');
+        TtygAgentSettingsModalSteps.getTemperatureSliderField().should('have.value', '1.2');
+
+        // WHEN: I disable the temperature setting.
+        TtygAgentSettingsModalSteps.toggleTemperature();
+        // THEN: I expect the high-temperature warning to be hidden.
+        TtygAgentSettingsModalSteps.getTemperatureWarning().should('not.exist');
+        TtygAgentSettingsModalSteps.getTemperatureField().should('not.have.class', 'has-warning');
+        // AND: I expect the temperature controls to be disabled.
+        TtygAgentSettingsModalSteps.getTemperatureField().should('be.disabled');
+        TtygAgentSettingsModalSteps.getTemperatureSliderField().should('be.disabled');
+
+        // WHEN: I enable the temperature setting.
+        TtygAgentSettingsModalSteps.toggleTemperature();
+        // THEN: I expect the default temperature value to be restored.
+        TtygAgentSettingsModalSteps.getTemperatureSliderField().should('have.value', '0.7');
+    });
+
+    it('should toggle the topP setting', () => {
+        // GIVEN: I have opened the Create Agent dialog.
+        openCreateAgentDialog(repositoryId);
+
+        // WHEN: I set a custom topP value.
+        TtygAgentSettingsModalSteps.setTopP('0.3');
+        // THEN: I expect the topP value to be updated.
+        TtygAgentSettingsModalSteps.getTopPField().should('have.value', '0.3');
+
+        // WHEN: I disable the topP setting.
+        TtygAgentSettingsModalSteps.toggleTop();
+        // THEN: I expect the topP control to be disabled.
+        TtygAgentSettingsModalSteps.getTopPField().should('be.disabled');
+
+        // WHEN: I enable the topP setting.
+        TtygAgentSettingsModalSteps.toggleTop();
+        // THEN: I expect the default topP value to be restored.
+        TtygAgentSettingsModalSteps.getTopPField().should('have.value', '1');
+    });
+
     it('Should warn the user when he changes the default value of the base instruction', () => {
         RepositoriesStubs.stubGetRepositoryConfig(repositoryId, '/repositories/get-repository-config-starwars-enabled-fts.json');
         TTYGStubs.stubChatsListGetNoResults();
@@ -541,3 +640,13 @@ function fillAgentName(name) {
     TtygAgentSettingsModalSteps.getAgentNameError().should('be.visible').and('contain', 'This field is required');
     TtygAgentSettingsModalSteps.typeAgentName(name);
 }
+
+const openCreateAgentDialog = (repositoryId) => {
+    TTYGStubs.stubChatsListGetNoResults();
+    TTYGStubs.stubAgentListGet('/ttyg/agent/get-agent-list-0.json');
+    ConnectorStubs.stubGetConnectors();
+    TTYGStubs.getSimilarityIndexesForRepo(repositoryId );
+    TTYGViewSteps.visit();
+    cy.wait('@get-all-repositories');
+    TTYGViewSteps.createFirstAgent();
+}

package/fixtures/repositories/get-repositories-with-unsupported-graphql-types.json

@@ -0,0 +1,46 @@
+{
+    "": [
+        {
+            "id": "graphdb-repo",
+            "title": "",
+            "uri": "http://localhost:8080/graphdb/repositories/graphdb-repo",
+            "externalUrl": "http://localhost:8080/graphdb/repositories/graphdb-repo",
+            "local": true,
+            "type": "graphdb",
+            "sesameType": "graphdb:SailRepository",
+            "location": "",
+            "readable": true,
+            "writable": true,
+            "unsupported": false,
+            "state": "RUNNING"
+        },
+        {
+            "id": "ontop-repo",
+            "title": "",
+            "uri": "http://localhost:8080/graphdb/repositories/ontop-repo",
+            "externalUrl": "http://localhost:8080/graphdb/repositories/ontop-repo",
+            "local": true,
+            "type": "ontop",
+            "sesameType": "graphdb:OntopRepository",
+            "location": "",
+            "readable": true,
+            "writable": true,
+            "unsupported": false,
+            "state": "RUNNING"
+        },
+        {
+            "id": "fedx-repo",
+            "title": "",
+            "uri": "http://localhost:8080/graphdb/repositories/fedx-repo",
+            "externalUrl": "http://localhost:8080/graphdb/repositories/fedx-repo",
+            "local": true,
+            "type": "fedx",
+            "sesameType": "graphdb:FedXRepository",
+            "location": "",
+            "readable": true,
+            "writable": true,
+            "unsupported": false,
+            "state": "RUNNING"
+        }
+    ]
+}

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "graphdb-workbench-tests",
-  "version": "3.5.0",
+  "version": "3.5.1-TR1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "graphdb-workbench-tests",
-      "version": "3.5.0",
+      "version": "3.5.1-TR1",
       "license": "Apache-2.0",
       "devDependencies": {
         "@bahmutov/cypress-code-coverage": "^2.7.2",
@@ -2082,9 +2082,9 @@
       }
     },
     "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.0.tgz",
-      "integrity": "sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.1.tgz",
+      "integrity": "sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ==",
       "dev": true,
       "funding": [
         {
@@ -5407,9 +5407,9 @@
       "license": "MIT"
     },
     "node_modules/fast-uri": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.4.tgz",
-      "integrity": "sha512-8JnbkQ4juDyvYs4mgFGQqg4yCYtFDtUtmp2QIQq11ZZe5CFQ5wcqm1rqDgAh/QdMySuBnPzMUiJUNZG5N/AiQw==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.5.tgz",
+      "integrity": "sha512-gHwA1O9LDIcKunMKhObS/HimwtehO1nPUECKAu5TpKgaO19fcWEl4bliWe1jWxVFvIXztJjjQ4L8XQ1EU9f7Jw==",
       "dev": true,
       "funding": [
         {
@@ -7776,9 +7776,9 @@
       }
     },
     "node_modules/mocha/node_modules/js-yaml": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.0.tgz",
-      "integrity": "sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.1.tgz",
+      "integrity": "sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ==",
       "dev": true,
       "funding": [
         {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphdb-workbench-tests",
-  "version": "3.5.0",
+  "version": "3.5.1-TR1",
   "description": "Cypress tests for GraphDB workbench",
   "type": "module",
   "scripts": {

package/steps/setup/settings-steps.js

@@ -94,6 +94,10 @@ export class SettingsSteps {
         return this.getSettingsPage().find('.user-repositories .table');
     }
 
+    static getRepositoryRightsRows() {
+        return this.getUserRepositoryTable().getByTestId('repository-rights-rows');
+    }
+
     static getUserRepository(name) {
         return this.getUserRepositoryTable().find(`.repository-name:contains('${name}')`).closest('tr');
     }

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

@@ -405,11 +405,8 @@ export class UserAndAccessSteps {
     // ============= GraphQL Access Toggles and Validations =============
 
     static getGraphqlAccessForRepo(repoName) {
-        const matchText = (repoName === '*') ? 'Global (any data repository)' : repoName;
-        return cy.get('#user-repos')
-            .contains(matchText)
-            .parent('tr')
-            .find('.graphql')
+        const testId = (repoName === '*') ? 'graphql-any-checkbox' : 'graphql-repository-checkbox';
+        return this.getRepositoryRightsLine(repoName).getByTestId(testId);
     }
 
     static toggleGraphqlAccessForRepo(repoName) {
@@ -421,6 +418,30 @@ export class UserAndAccessSteps {
         this.validateRightsForRepo(repoName, graphqlAccessCheckbox, expectedState);
     }
 
+    static getRepositoryRightsRows() {
+        return cy.getByTestId('repository-rights-rows');
+    }
+
+    static getGraphqlAnyRoleTooltip() {
+        return cy.getByTestId('graphql-any-role-tooltip');
+    }
+
+    static getGraphqlRepositoryTypeTooltipForRepo(repoName) {
+        return this.getRepositoryRightsLine(repoName).getByTestId('graphql-repository-type-tooltip');
+    }
+
+    static hoverGraphQlRightsCheckbox(repoName) {
+        this.getGraphqlRepositoryTypeTooltipForRepo(repoName).trigger('mouseover');
+    }
+
+    static blurGraphQlRightsCheckbox(repoName) {
+        this.getGraphqlRepositoryTypeTooltipForRepo(repoName).trigger('mouseout');
+    }
+
+    static getAngularTooltip() {
+        return cy.get('.angular-tooltip');
+    }
+
     static clickMenuItem(label) {
         return cy.get('.main-menu').contains(label).click({force: true});
     }

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

@@ -451,6 +451,14 @@ export class TtygAgentSettingsModalSteps extends ModalDialogSteps {
         return this.getDialog().find('.temperature');
     }
 
+    static getTemperatureToggle() {
+        return TtygAgentSettingsModalSteps.getTemperatureFormGroup().find('.temperature-toggle label');
+    }
+
+    static toggleTemperature() {
+        TtygAgentSettingsModalSteps.getTemperatureToggle().click();
+    }
+
     static getTemperatureField() {
         return this.getTemperatureFormGroup().find('#temperature');
     }
@@ -477,6 +485,14 @@ export class TtygAgentSettingsModalSteps extends ModalDialogSteps {
         return this.getDialog().find('.top-p');
     }
 
+    static getTopPToggle() {
+        return TtygAgentSettingsModalSteps.getTopPFormGroup().find('.top-p-toggle label');
+    }
+
+    static toggleTop() {
+        TtygAgentSettingsModalSteps.getTopPToggle().click();
+    }
+
     static getTopPField() {
         return this.getTopPFormGroup().find('#topP');
     }