Mnes 468 create an automatic testing strategy

.eslintrc.js

@@ -22,6 +22,12 @@ module.exports = {
         'object-curly-spacing': [1, 'always'],
         'formatjs/no-id': 1,
         'react-hooks/exhaustive-deps': 'off',
+        '@typescript-eslint/no-unused-vars': [
+            'error',
+            {
+                argsIgnorePattern: '^_',
+            },
+        ],
     },
     settings: {
         react: {

.gitignore

@@ -8,5 +8,5 @@ cypress-artifacts
 .env
 /cypress/videos/
 /cypress/screenshots/
-/cypress/results/*
 /prisma/mnestix-database.db
+/cypress/results/*

compose.yml

@@ -2,27 +2,27 @@ networks:
   mnestix-network:
     driver: bridge
     name: mnestix-network
-    
+
 volumes:
   mnestix-database:
 
 services:
   mnestix-browser:
     container_name: mnestix-browser
     image: mnestix/mnestix-browser:latest
-    profiles: ["", "frontend", "tests"]
+    profiles: [ "", "frontend", "tests" ]
     build:
       dockerfile: Dockerfile
       target: production
     ports:
       - '3000:3000'
     environment:
-      REGISTRY_API_URL: 'https://localhost:8083/' # 'https://registry.dpp40-2-v2.industrialdigitaltwin.org/'
-      SUBMODEL_REGISTRY_API_URL: 'http://localhost:8084'
-      DISCOVERY_API_URL: 'http://localhost:5064/discovery'
-      AAS_REPO_API_URL: 'http://localhost:5064/repo'
-      SUBMODEL_REPO_API_URL: 'http://localhost:5064/repo'
-      MNESTIX_BACKEND_API_URL: 'http://localhost:5064'
+      REGISTRY_API_URL: 'https://aas-registry:8083/' # 'https://registry.dpp40-2-v2.industrialdigitaltwin.org/'
+      SUBMODEL_REGISTRY_API_URL: 'http://submodel-registry:8084'
+      DISCOVERY_API_URL: 'http://mnestix-api:5064/discovery'
+      AAS_REPO_API_URL: 'http://mnestix-api:5064/repo'
+      SUBMODEL_REPO_API_URL: 'http://mnestix-api:5064/repo'
+      MNESTIX_BACKEND_API_URL: 'http://mnestix-api:5064'
       AAS_LIST_FEATURE_FLAG: "true"
       COMPARISON_FEATURE_FLAG: "true"
       AUTHENTICATION_FEATURE_FLAG: "false"
@@ -39,7 +39,7 @@ services:
   mnestix-api:
     image: mnestix/mnestix-api:1.2.0
     container_name: mnestix-api
-    profiles: ["", "backend", "tests"]
+    profiles: [ "", "backend", "tests" ]
     ports:
       - '5064:5064'
     environment:
@@ -79,7 +79,7 @@ services:
   mongodb:
     image: mongo:5
     container_name: mongodb
-    profiles: ["", "basyx", "tests"]
+    profiles: [ "", "basyx", "tests" ]
     environment:
       MONGO_INITDB_ROOT_USERNAME: mongoAdmin
       MONGO_INITDB_ROOT_PASSWORD: mongoPassword
@@ -100,7 +100,7 @@ services:
   aas-environment:
     image: eclipsebasyx/aas-environment:2.0.0-milestone-03.1
     container_name: aas-environment
-    profiles: ["", "basyx", "tests"]
+    profiles: [ "", "basyx", "tests" ]
     depends_on:
       - mongodb
     environment:
@@ -132,7 +132,7 @@ services:
   aas-discovery:
     image: eclipsebasyx/aas-discovery:2.0.0-milestone-03.1
     container_name: aas-discovery
-    profiles: ["", "basyx", "tests"]
+    profiles: [ "", "basyx", "tests" ]
     depends_on:
       - mongodb
     environment:
@@ -160,7 +160,7 @@ services:
   aas-registry:
     image: eclipsebasyx/aas-registry-log-mongodb:2.0.0-milestone-03.1
     container_name: aas-registry
-    profiles: ["", "basyx"]
+    profiles: [ "", "basyx" ]
     ports:
       - '8083:8080'
     depends_on:
@@ -180,7 +180,7 @@ services:
   submodel-registry:
     image: eclipsebasyx/submodel-registry-log-mongodb:2.0.0-milestone-03.1
     container_name: submodel-registry
-    profiles: ["", "basyx"]
+    profiles: [ "", "basyx" ]
     ports:
       - '8084:8080'
     depends_on:

cypress.config.ts

@@ -1,6 +1,10 @@
 import { defineConfig } from 'cypress';
 
 export default defineConfig({
+    defaultCommandTimeout: 150000, // 150
+    pageLoadTimeout: 600000, // 600
+    requestTimeout: 150000, // 150
+    responseTimeout: 200000, // 200
     video: true,
     videoCompression: true,
     retries: 2,
@@ -13,6 +17,7 @@ export default defineConfig({
         baseUrl: 'http://localhost:3000/',
         excludeSpecPattern: '**/ignoredTestFiles/*.js',
         specPattern: 'cypress/e2e/**/*.spec.{js,jsx,ts,tsx}',
+        experimentalRunAllSpecs: true,
     },
     env: {
         AAS_REPO_API_URL: 'http://localhost:5064/repo',

cypress/e2e/compareViewTest.spec.js

@@ -18,14 +18,15 @@ describe('Test compare feature view', function () {
 
         it('In the viewer detail page clicking Compare redirects to compare feature and loads first data to compare', function () {
             cy.getByTestId('detail-compare-button').click();
-            cy.getByTestId('compare-Data-0').click();
             cy.url().should('contain', '/compare');
             cy.getByTestId('compare-aas-0').should('be.visible');
+            cy.getByTestId('compare-Data-0').click();
             cy.getByTestId('compare-Record').eq(0).should('be.visible');
         });
 
         it('In the compare view clicks on the add another AAS and adds correct data to compare', function () {
             cy.getByTestId('detail-compare-button').click();
+            cy.getByTestId('compare-aas-0').should('be.visible');
             // open popup dialog and insert second aas to compare
             cy.getByTestId('add-aas-to-compare-button').click();
             cy.getByTestId('compare-aas-aad-dialog').should('be.visible');
@@ -49,6 +50,7 @@ describe('Test compare feature view', function () {
 
         it('In the compare view three aas are added with correct data and no possibility to add more aas', function () {
             cy.getByTestId('detail-compare-button').click();
+            cy.getByTestId('compare-aas-0').should('be.visible');
             // open popup dialog and insert second aas to compare
             cy.getByTestId('add-aas-to-compare-button').click();
             cy.get('@IDInput').click().type(compareAAS[1].assetInformation.globalAssetId);
@@ -74,6 +76,7 @@ describe('Test compare feature view', function () {
 
         it('In the compare view check if different values are being marked when different', function () {
             cy.getByTestId('detail-compare-button').click();
+            cy.getByTestId('compare-aas-0').should('be.visible');
             // open popup dialog and insert second aas to compare
             cy.getByTestId('add-aas-to-compare-button').click();
             cy.get('@IDInput').click().type(compareAAS[1].assetInformation.globalAssetId);
@@ -104,11 +107,13 @@ describe('Test compare feature view', function () {
             cy.get('@IDInput').click().type(compareAAS[0].id);
             cy.getByTestId('aasId-submit-button').click();
             cy.getByTestId('detail-compare-button').click();
+            cy.getByTestId('compare-aas-0').should('be.visible');
             // //insert mock data
             for (let i = 1; i < 3; i++) {
                 cy.getByTestId('add-aas-to-compare-button').click();
                 cy.get('@IDInput').click().type(compareAAS[i].assetInformation.globalAssetId);
                 cy.getByTestId('aasId-submit-button').click();
+                cy.getByTestId(`compare-aas-${i}`).should('be.visible');
             }
         });
 

cypress/e2e/dnsRedirectTest.spec.js

@@ -1,4 +1,5 @@
 import testAas from '../fixtures/testAAS.json';
+
 const testAasId = testAas.aasId;
 const testAssetId = testAas.assetId;
 
@@ -7,9 +8,7 @@ describe('Test the DNS Redirect', function () {
         cy.postTestAas();
     });
     it('Visits the "/asset/URLEncodedAssetID" page and gets redirected to the corresponding viewer page', function () {
-        cy.intercept({ method: 'GET', url: `${Cypress.env('AAS_DISCOVERY_API_URL')}/lookup/shells*` }).as(
-            'redirectedViewer',
-        );
+        cy.intercept({ method: 'POST', url: `/en/viewer/*` }).as('redirectedViewer');
         let encodedUrl = encodeURIComponent(testAssetId);
 
         cy.visit('/asset?assetId=' + encodedUrl);

cypress/e2e/listAasPageComparisonTest.spec.js

@@ -4,8 +4,8 @@ describe('Test that the list works together with the comparison view (Resolution
     before(function () {
         cy.postCompareMockData();
 
-        cy.setResolution(resolutions[0]);
         cy.visit('/list');
+        cy.setResolution(resolutions[0]);
     });
     it('should redirect to the comparison page and display the submodel data correctly', function () {
         cy.get('[data-testid="list-row-https://i40.xitaso.com/aas/testElement_1"]')
@@ -14,13 +14,13 @@ describe('Test that the list works together with the comparison view (Resolution
         cy.get('[data-testid="list-row-https://i40.xitaso.com/aas/testElement_2"]')
             .findByTestId('list-checkbox')
             .click();
-
         cy.getByTestId('compare-button').click();
-        cy.wait(100);
         cy.url().should('contain', '/compare');
+        cy.wait(60000);
+        cy.getByTestId('compare-aas-0').should('be.visible');
+        cy.getByTestId('compare-aas-1').should('be.visible');
 
         // assert that second aas is displayed correctly
-        cy.getByTestId('compare-aas-1').should('be.visible');
         cy.getByTestId('compare-Data-0').click();
         cy.getByTestId('compare-value-1').eq(1).contains('TEST_DATA2');
         cy.getByTestId('compare-value-0').eq(10).should('be.empty');

cypress/support/commands.ts

@@ -21,8 +21,6 @@ Cypress.Commands.add('setResolution', (res) => {
 
 Cypress.Commands.add('visitViewer', (aasId) => {
     cy.visit('/viewer/' + btoa(aasId).replace(/=+$/g, ''));
-    cy.intercept('GET', '**/submodels/*').as('getSubmodels');
-    cy.wait('@getSubmodels');
 });
 
 Cypress.Commands.add('getByTestId', (dataTestId) => {

jest.config.ts

@@ -0,0 +1,10 @@
+export {};
+module.exports = {
+    moduleDirectories: ['node_modules', 'src'],
+    transform: {
+        '^.+\\.(t|j)sx?$': '@swc/jest',
+    },
+    preset: 'ts-jest',
+    testEnvironment: 'node',
+    testMatch: ['**/__tests__/**/*.ts', '**/?(*.)+(spec|test).ts'],
+};

jest.setup.ts

@@ -0,0 +1 @@
+import '@testing-library/jest-dom'

package.json

@@ -7,10 +7,16 @@
         "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
         "@eslint/js": "^9.2.0",
         "@next/eslint-plugin-next": "^14.2.3",
+        "@swc/core": "^1.7.23",
+        "@swc/jest": "^0.2.36",
+        "@testing-library/dom": "^10.4.0",
+        "@testing-library/jest-dom": "^6.5.0",
+        "@testing-library/react": "^16.0.1",
+        "@testing-library/user-event": "^14.5.2",
         "@types/flat": "^5.0.5",
         "@types/jest": "^29.5.12",
         "@types/lodash": "^4.17.0",
-        "@types/node": "^22.4.2",
+        "@types/node": "^22.5.4",
         "@types/react": "^18.2.79",
         "@types/react-dom": "^18.2.25",
         "@typescript-eslint/eslint-plugin": "^7.7.1",
@@ -24,9 +30,14 @@
         "eslint-plugin-react": "^7.34.1",
         "eslint-plugin-react-hooks": "^4.6.0",
         "globals": "^15.1.0",
+        "jest": "^29.7.0",
+        "jest-environment-jsdom": "^29.7.0",
         "lodash": "^4.17.21",
         "prettier": "^3.2.5",
         "prisma": "^5.18.0",
+        "ts-jest": "^29.2.5",
+        "ts-mockito": "^2.6.1",
+        "ts-node": "^10.9.2",
         "typescript-eslint": "^7.8.0"
     },
     "dependencies": {

src/app/[locale]/_components/DashboardInput.tsx

@@ -4,21 +4,19 @@ import { messages } from 'lib/i18n/localization';
 import { FormattedMessage } from 'react-intl';
 import { ManualAasInput } from 'app/[locale]/_components/ManualAasInput';
 import { QrScanner } from 'app/[locale]/_components/QrScanner';
-import { handleSearchForAas } from 'lib/searchUtilActions/searchClient';
 import { useRouter } from 'next/navigation';
 import { useAasState, useRegistryAasState } from 'components/contexts/CurrentAasContext';
 import { LocalizedError } from 'lib/util/LocalizedError';
-import { useApis } from 'components/azureAuthentication/ApiProvider';
+import { performFullAasSearch } from 'lib/services/searchUtilActions/searchActions';
 
 export const DashboardInput = () => {
     const [, setAas] = useAasState();
     const [, setRegistryAasData] = useRegistryAasState();
     const navigate = useRouter();
-    const { repositoryClient } = useApis();
 
     const browseAasUrl = async (val: string) => {
         try {
-            const aasSearch = await handleSearchForAas(val, repositoryClient);
+            const aasSearch = await performFullAasSearch(val);
 
             if (aasSearch.aas) {
                 setAas(aasSearch.aas);

src/app/[locale]/compare/_components/CompareView.tsx

@@ -11,9 +11,9 @@ import { useEffect, useState } from 'react';
 import { useNotificationSpawner } from 'lib/hooks/UseNotificationSpawner';
 import { useSearchParams } from 'next/navigation';
 import { showError } from 'lib/util/ErrorHandlerUtil';
-import { AasSearchResult, handleSearchForAas } from 'lib/searchUtilActions/searchClient';
 import { LocalizedError } from 'lib/util/LocalizedError';
-import { useApis } from 'components/azureAuthentication/ApiProvider';
+import { performFullAasSearch } from 'lib/services/searchUtilActions/searchActions';
+import { AasSearchResult } from 'lib/services/searchUtilActions/AasSearcher';
 
 export function CompareView() {
     const { compareAas, addSeveralAas, deleteAas, addAas } = useCompareAasContext();
@@ -25,8 +25,6 @@ export function CompareView() {
     });
     const [addModalOpen, setAddModalOpen] = useState(false);
 
-    const { repositoryClient } = useApis();
-
     useEffect(() => {
         async function _fetchAas() {
             try {
@@ -61,7 +59,7 @@ export function CompareView() {
     const handleAddAas = async (aasId: string) => {
         let aasSearch: AasSearchResult;
         try {
-            aasSearch = await handleSearchForAas(aasId, repositoryClient);
+            aasSearch = await performFullAasSearch(aasId);
         } catch (e) {
             throw new LocalizedError(messages.mnestix.aasUrlNotFound);
         }

src/app/[locale]/settings/_components/mnestix-connections/MnestixConnectionsCard.tsx

@@ -6,7 +6,7 @@ import { useNotificationSpawner } from 'lib/hooks/UseNotificationSpawner';
 import {
     getConnectionDataAction,
     upsertConnectionDataAction,
-} from 'app/[locale]/settings/_components/mnestix-connections/MnestixConnectionServerActions';
+} from 'lib/services/MultipleRepositorySearch/MnestixConnectionServerActions';
 import { useForm } from 'react-hook-form';
 import { useEnv } from 'app/env/provider';
 import { SettingsCardHeader } from 'app/[locale]/settings/_components/SettingsCardHeader';