Merge branch 'dev' into feature/CNF/OGUI-1701/session-service

Author: Deaponn

QualityControl/package-lock.json

@@ -47,10 +47,10 @@
     "umzug": "^3.8.2"
   },
   "devDependencies": {
-    "@eslint/js": "^9.36.0",
+    "@eslint/js": "^9.37.0",
     "@stylistic/eslint-plugin-js": "^4.4.0",
-    "eslint": "^9.36.0",
-    "eslint-plugin-jsdoc": "^60.7.1",
+    "eslint": "^9.37.0",
+    "eslint-plugin-jsdoc": "^60.8.3",
     "globals": "^16.4.0",
     "nock": "^15.0.0",
     "puppeteer": "^24.23.0",

QualityControl/package.json

@@ -189,8 +189,7 @@ export default class FilterModel extends Observable {
    */
   async deactivateRunsMode(baseViewModel) {
     this.resetRunsMode();
-    await baseViewModel.triggerFilter();
-    this.notify();
+    this.clearFilter(baseViewModel);
   }
 
   /**

QualityControl/public/common/filters/model/FilterModel.js

@@ -258,6 +258,7 @@ export default class Layout extends BaseViewModel {
     }
     const result = await this.model.services.layout.saveLayout(this.item);
     if (result.isSuccess()) {
+      await this.model.services.layout.getLayoutsByUserId(this.model.session.personid);
       this.model.notification.show(`Layout "${this.item.name}" has been saved successfully.`, 'success');
     } else {
       this.item = this.editOriginalClone;

QualityControl/public/layout/Layout.js

@@ -142,7 +142,16 @@ export const runModeTests = async (url, page, timeout = 5000, testParent) => {
     isRunModeActive = await page.evaluate(() => window.model.filterModel.isRunModeActivated);
     ok(!isRunModeActive, 'Run mode should be deactivated after clicking checkbox');
 
-    //check the filters element is back again
+    //check the filters element is back again and run number and URL are cleared
     await page.locator('#filterElement');
+    const currentUrl = await page.evaluate(() => window.location.href);
+    ok(!currentUrl.includes('RunNumber=500001'), 'URL should not contain RunNumber parameter after disabling run mode');
+
+    //filterElement to be empty
+    const filterElementContent = await page.evaluate(() => {
+      const filterElement = document.querySelector('#runNumberFilter');
+      return filterElement.textContent.trim();
+    });
+    strictEqual(filterElementContent, '', 'Filter element should be empty after disabling run mode');
   });
 };

QualityControl/test/public/features/runMode.test.js

@@ -435,6 +435,49 @@ export const layoutShowTests = async (url, page, timeout = 5000, testParent) =>
     const location2 = await page.evaluate(() => window.location);
     strictEqual(location2.search, `?page=layoutShow&layoutId=${LAYOUT_ID}&tab=test`);
   });
+
+  await testParent.test(
+    'should update layout name in sidebar when name is changed and saved via JSON editor',
+    { timeout },
+    async () => {
+      const originalSidebarName = await page.evaluate(() => {
+        const sidebarLayoutLink = document.querySelector('nav a.menu-item.w-wrapped.selected span:nth-child(2)');
+        return sidebarLayoutLink ? sidebarLayoutLink.textContent.trim() : null;
+      });
+
+      const editDropdownButtonPath = '.btn-group > div > button';
+      await page.locator(editDropdownButtonPath).click();
+      await delay(100);
+
+      const editViaJSONButtonPath = '#editByJson';
+      await page.locator(editViaJSONButtonPath).click();
+      await delay(100);
+
+      const currentJSON = await page.evaluate(() => {
+        const textareaPath = 'body > div > div > div > div > textarea';
+        return document.querySelector(textareaPath).value;
+      });
+
+      const layoutData = JSON.parse(currentJSON);
+      const newLayoutName = 'Updated Layout Name Test';
+      layoutData.name = newLayoutName;
+
+      const textareaPath = '#layout-json-editor';
+      await page.locator(textareaPath).fill(JSON.stringify(layoutData));
+
+      const updateButtonPath = '#updateLayoutButton';
+      await page.locator(updateButtonPath).click();
+      await delay(200);
+
+      const updatedSidebarName = await page.evaluate(() => {
+        const sidebarLayoutLink = document.querySelector('nav a.menu-item.w-wrapped.selected span:nth-child(2)');
+        return sidebarLayoutLink ? sidebarLayoutLink.textContent.trim() : null;
+      });
+
+      strictEqual(updatedSidebarName, newLayoutName);
+      ok(originalSidebarName !== updatedSidebarName, 'Sidebar name should have changed from original');
+    },
+  );
 };
 
 const checkInvalidJSON = async (page, mockedJSON, errorMessage) => {