lino-react 26.7.2__tar.gz → 26.7.3__tar.gz

{lino_react-26.7.2 → lino_react-26.7.3}/.gitlab-ci.yml

@@ -84,20 +84,14 @@ publish_apps:
   needs:
     - job: detect_version_change
       artifacts: true
-  cache:
-    key: wine-packages-cache
-    paths:
-      - .apt-cache/
   variables:
     LANG: C.UTF-8
     LC_ALL: C.UTF-8
   before_script:
     - echo "Setting up architecture layers and underlying compiler support packages..."
-    - export APT_CACHE_DIR="${CI_PROJECT_DIR}/.apt-cache"
-    - mkdir -p "${APT_CACHE_DIR}/partial"
     - dpkg --add-architecture i386
     - apt-get update -y
-    - apt-get -o dir::cache::archives="${APT_CACHE_DIR}" install -y wine wine32 wine64 libwine texlive libxtst6
+    - apt-get install -y wine wine32 wine64 libwine texlive libxtst6
     - npm ci
   rules:
     - if: '$CI_COMMIT_BRANCH == "master"'
@@ -118,30 +112,24 @@ publish_apps:
     - export BUILD_URL="https://pronto.bd"
 
     # === 1. BUILD LINUX VERSION SEQUELETIALLY ===
-    # - echo "Compiling Linux Assets..."
-    # - npm run pre
-    # - npx electron-builder --linux --config=electron-builder.js --publish always
-    # - npm run post
+    - echo "Compiling Linux Assets..."
+    - npm run pre
+    - npx electron-builder --linux --config=electron-builder.js --config.directories.output=eldist --publish always
+    - find eldist -maxdepth 2 -type f
+    - echo "===== builder-debug.yml ====="
+    - cat eldist/builder-debug.yml
+    # - cat eldist/prontobd.yml
+    - npm run post
     
     # === 2. BUILD WINDOWS VERSION SEQUELETIALLY (Uses Wine on Linux Host) ===
     - echo "Compiling Windows Assets..."
     - npm run pre
-    - |
-      set +e
-
-      wine cmd /c echo hello
-      dpkg -l | grep -E 'wine|nsis'
-      which wine
-      which makensis
-
-      npx electron-builder --win --config=electron-builder.js --publish always
-      RC=$?
-
-      echo "Exit code: $RC"
-      
-      npm run post
-
-      exit $RC
+    - npx electron-builder --win --config=electron-builder.js --publish always
+    - find edist -maxdepth 2 -type f
+    - echo "===== builder-debug.yml ====="
+    - cat edist/builder-debug.yml
+    # - cat edist/prontobd.yml
+    - npm run post
 
 test:
   stage: test

{lino_react-26.7.2 → lino_react-26.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lino_react
-Version: 26.7.2
+Version: 26.7.3
 Summary: The React front end for Lino
 Project-URL: Homepage, https://react.lino-framework.org
 Project-URL: Repository, https://gitlab.com/lino-framework/react

{lino_react-26.7.2 → lino_react-26.7.3}/electron/main.mjs

@@ -134,10 +134,16 @@ const createWindow = async () => {
     const { width, height } = display.workAreaSize;
     const preloadPath = path.join(__dirname, 'preload.cjs');
     process.stdout.write(`dirname: ${__dirname}\n`);
+    let iconPth;
+    if (app.isPackaged) {
+        iconPth = path.join(process.resourcesPath, "configs", "master_icon.png");
+    } else {
+        iconPth = path.join(path.dirname(__dirname), "electronConfig", "master_icon.png");
+    }
     mainWindow.current = new BrowserWindow({
         width: width > 1280 ? 1280 : width,
         height: height > 800 ? 800 : height,
-        // icon: path.join(__dirname, 'build', 'icon.png'),
+        icon: iconPth,
         webPreferences: {
             preload: preloadPath,
         }

{lino_react-26.7.2 → lino_react-26.7.3}/electron-builder.js

@@ -8,17 +8,17 @@ const isCI = process.env.CI === "true";
 
 const publishConfig = isCI
     ? [
-        //   {
-        //       provider: "gitlab",
-        //       projectId: "lino-framework/react",
-        //       channel: process.env.APP_FLAVOR || "latest"
-        //   }
         {
-            provider: "generic",
-            // Points directly to the 5GB high-capacity package repository endpoint
-            url: `https://gitlab.com/api/v4/projects/${process.env.CI_PROJECT_ID}/packages/generic/lino-electron/latest-release`,
-            channel: process.env.APP_FLAVOR || "latest",
+            provider: "gitlab",
+            projectId: "lino-framework/react",
+            channel: process.env.APP_FLAVOR || "latest"
         }
+        // {
+        //     provider: "generic",
+        //     // Points directly to the 5GB high-capacity package repository endpoint
+        //     url: `https://gitlab.com/api/v4/projects/${process.env.CI_PROJECT_ID}/packages/generic/lino-electron/latest-release`,
+        //     channel: process.env.APP_FLAVOR || "latest",
+        // }
       ]
     : [
         {
@@ -56,6 +56,10 @@ export default {
         {
             from: "electron/build-config.json",
             to: "configs/build-config.json"
+        },
+        {
+            from: "electronConfig/master_icon.png",
+            to: "configs/master_icon.png"
         }
     ],
 

{lino_react-26.7.2 → lino_react-26.7.3}/lino_react/__init__.py

@@ -3,7 +3,7 @@
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 # Source documentation see https://react.lino-framework.org/dev
 
-__version__ = '26.7.2'
+__version__ = '26.7.3'
 
 srcref_url = 'https://gitlab.com/lino-framework/react/blob/master/%s'
 # doc_trees = []

{lino_react-26.7.2 → lino_react-26.7.3}/lino_react/react/renderer.py

@@ -308,7 +308,8 @@ class Renderer(JsCacheRenderer):
         return "window.App.dashboard.reload();"
 
     def get_request_url(self, ar, *args, **kw):
-        """Used to turn requests into urls"""
+        """Convert the given action request to an url that would run the request.
+        """
         if ar.actor.__name__ == "Main":
             return self.front_end.build_plain_url(*args, **kw)
 
@@ -408,6 +409,7 @@ class Renderer(JsCacheRenderer):
             params.update(status)
         params.update(self.get_action_params(ar, ba, obj))
         params.update(status)
+        # print(f"20260717 {ba} {status}")
 
         js_obj = {
             "rp": None if ba.action.action_name in ['detail', 'show', 'grid'] else rp,

{lino_react-26.7.2 → lino_react-26.7.3}/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lino_react",
-  "version": "26.7.3",
+  "version": "26.7.4",
   "description": "A front end for Lino using React",
   "type": "module",
   "main": "electron/main.mjs",