glib-web 4.44.3 → 4.44.6

package/cypress/e2e/glib-web/fieldsCaptcha.cy.ts

@@ -2,12 +2,12 @@ import { testPageUrl } from "../../helper"
 
 const url = testPageUrl('fields_captcha')
 
-const visitWithCaptcha = (executeResult: () => Promise<string>) => {
+const visitWithCaptcha = (executeResult) => {
   cy.visit(url, {
-    onBeforeLoad(win: Cypress.AUTWindow) {
-      (win as unknown as Record<string, unknown>).grecaptcha = {
+    onBeforeLoad(win) {
+      win.grecaptcha = {
         enterprise: {
-          ready: function(cb: () => void) { cb(); },
+          ready: function(cb) { cb(); },
           execute: function() { return executeResult(); }
         }
       }

package/cypress/e2e/glib-web/panelsBulkEdit2.cy.ts

@@ -2,7 +2,11 @@ import { testPageUrl } from "../../helper"
 
 const url = testPageUrl('panels_bulkEdit2')
 
-const csvFixturePath = 'cypress/fixtures/bulk_edit.csv'
+const csvFixtureContents = [
+  'month,electricity_usage,gas_usage,sources,compliant',
+  'January,120,10,Generators,yes',
+  'February,150,12,Solar Panels,no'
+].join('\n')
 
 describe('panels_bulkEdit2', () => {
   it('loads csv rows and toggles column variants', () => {
@@ -10,7 +14,14 @@ describe('panels_bulkEdit2', () => {
 
     cy.contains('Drag your CSV file here').should('exist')
 
-    cy.get('input[type="file"]').selectFile(csvFixturePath, { force: true })
+    cy.get('input[type="file"]').selectFile(
+      {
+        contents: Cypress.Buffer.from(csvFixtureContents),
+        fileName: 'bulk_edit.csv',
+        mimeType: 'text/csv'
+      },
+      { force: true }
+    )
 
     cy.get('tbody tr').should('have.length', 2)
     cy.contains('Submit (top)').should('be.visible')

package/cypress/helper.ts

@@ -1,4 +1,4 @@
-function testPageUrl(testPage: string) {
+function testPageUrl(testPage) {
   const port = Cypress.env('BACKEND_PORT') || '3000';
   const baseUrl = `http://localhost:${port}/glib/json_ui_garage?path=test_page%2F${testPage}`;
   return baseUrl;

package/cypress/support/e2e.ts

@@ -17,5 +17,14 @@
 import './commands'
 import '@cypress/code-coverage/support'
 
+// Ignore retry failures from backend error pages so specs can assert UI state.
+Cypress.on('uncaught:exception', (err) => {
+  const message = `${err}`;
+  if (message.includes('Retry failed')) {
+    return false;
+  }
+  return true;
+});
+
 // Alternatively you can use CommonJS syntax:
 // require('./commands')

package/cypress.config.ts

@@ -51,6 +51,10 @@ export default defineConfig({
     },
   },
   e2e: {
+    defaultCommandTimeout: 10000,
+    pageLoadTimeout: 60000,
+    requestTimeout: 15000,
+    responseTimeout: 15000,
     setupNodeEvents(on, config) {
       codeCoverageTask(on, config);
       return config;

package/cypress.yml.example

@@ -43,14 +43,13 @@ jobs:
       - run: cp config/database.yml.github-actions config/database.yml
       - run: bundle exec rake db:test:prepare
       - run: bundle exec rails server -d
-      - name: Cypress run
-        uses: cypress-io/github-action@v6
-        with:
-          browser: chrome
+      - name: Cypress run (e2e)
+        run: env -u ELECTRON_RUN_AS_NODE yarn cypress run --browser chrome
+      - name: Cypress run (component)
+        run: env -u ELECTRON_RUN_AS_NODE yarn cypress run --component
       - name: Upload screenshots
         uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots
           path: cypress/screenshots
-      - run: yarn run cypress run

package/index.js

@@ -61,6 +61,7 @@ import CommonResponsive from "./components/responsive.vue";
 import CommonTemplateMenu from "./templates/_menu.vue";
 import BigProgressCircle from "./templates/bigProgressCircle.vue";
 import RichButton from "./components/button.vue";
+import Dom from "./utils/dom";
 Vue.component("panels-vertical", VerticalPanel);
 Vue.component("panels-responsive", ResponsivePanel);
 Vue.component("common-avatar", CommonAvatar);
@@ -123,6 +124,7 @@ const vPhoneInput = createVPhoneInput({
 
 Vue.use(vPhoneInput);
 
+Dom.ensureCsrfElement();
 
 document.addEventListener("DOMContentLoaded", () => {
   Vue.mount(`#${APP_ID}`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "glib-web",
-  "version": "4.44.3",
+  "version": "4.44.6",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -68,4 +68,4 @@
     "vite-plugin-istanbul": "^7.2.1",
     "vite-plugin-ruby": "^5.1.1"
   }
-}
+}

package/utils/dom.js

@@ -1,6 +1,24 @@
+import * as TypeUtils from "./type";
+
 export default class {
+  static ensureCsrfElement() {
+    let element = document.querySelector('meta[name="csrf-token"]');
+    if (!TypeUtils.isObject(element)) {
+      const meta = document.createElement("meta");
+      meta.setAttribute("name", "csrf-token");
+      meta.setAttribute("content", "");
+      if (TypeUtils.isObject(document.head)) {
+        document.head.appendChild(meta);
+      } else {
+        document.documentElement.appendChild(meta);
+      }
+      element = meta;
+    }
+    return element;
+  }
+
   static get csrfElement() {
-    return document.querySelector(`meta[name="csrf-token"]`);
+    return this.ensureCsrfElement();
   }
 
   static getCsrf() {

package/.claude/settings.local.json

@@ -1,34 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Read(//home/hgani/workspace/glib-web/app/views/json_ui/garage/**)",
-      "Read(//home/hgani/workspace/glib-web-npm/doc/garage/**)",
-      "Read(//home/hgani/workspace/glib-web-npm/doc/common/**)",
-      "Bash(find:*)",
-      "Bash(npx cypress run:*)",
-      "Read(//home/hgani/workspace/glib-web/**)",
-      "Bash(curl:*)",
-      "Bash(pkill:*)",
-      "Bash(gh pr list:*)",
-      "WebSearch",
-      "WebFetch(domain:vuetifyjs.com)",
-      "Bash(lsof:*)",
-      "Bash(readlink:*)",
-      "WebFetch(domain:github.com)",
-      "Bash(npm run dev)",
-      "Bash(npm run)",
-      "Bash(npx eslint:*)",
-      "Bash(npm install:*)",
-      "Bash(yarn lint:*)",
-      "Bash(bin/rails db:migrate:*)",
-      "Bash(bin/rails server:*)",
-      "Bash(dpkg -S:*)",
-      "Bash(source:*)",
-      "Bash(node --version:*)",
-      "Bash(nvm ls:*)",
-      "Bash(nvm use:*)"
-    ],
-    "deny": [],
-    "ask": []
-  }
-}