Module library web app integration

.devcontainer/Dockerfile

@@ -0,0 +1,65 @@
+FROM mcr.microsoft.com/devcontainers/cpp:ubuntu-24.04
+
+ARG DEBIAN_FRONTEND=noninteractive
+ARG QT_VERSION=6.8.3
+ARG QT_MODULES="qtpositioning qtwebchannel qtwebengine qtwebsockets qtwebview debug_info qt5compat qtshadertools qtwaylandcompositor"
+
+# 1) Base OS packages per Docs/development/jasp-build-guide-linux.md
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    ca-certificates curl git gnupg software-properties-common \
+    build-essential cmake ninja-build \
+    autoconf bison flex \
+    g++ gfortran \
+    zlib1g zlib1g-dev \
+    libssl-dev \
+    libgl1-mesa-dev \
+    libsqlite3-dev \
+    libarchive13 libarchive-dev \
+    libxkbcommon-dev libxkbcommon-x11-dev libxcb-xkb-dev libxcb-xinerama0 libxcb-cursor0 \
+    libglpk-dev \
+    libminizip-dev \
+    libfreexl-dev \
+    libboost-dev libboost-filesystem-dev libboost-system-dev libboost-date-time-dev libboost-timer-dev libboost-chrono-dev \
+    librdata-dev jags \
+    libnss3-dev libnspr4-dev libxcomposite-dev libxdamage-dev libxrandr-dev libxtst-dev libxi-dev libasound2-dev libxkbfile-dev libxcb-icccm4-dev libxcb-shape0-dev libxcb-keysyms1-dev \
+    libjsoncpp25 libjsoncpp-dev libxcb-xkb1 \
+    r-base \
+    libfontconfig1-dev libharfbuzz-dev libfribidi-dev libfreetype6-dev libpng-dev libtiff5-dev libjpeg-dev libwebp-dev \
+    libcairo2-dev libgsl-dev \
+    fonts-noto-cjk fonts-arphic-ukai fonts-arphic-uming fonts-wqy-zenhei fonts-wqy-microhei \
+    patchelf \
+    pkg-config \
+    && rm -rf /var/lib/apt/lists/*
+
+# 2) Install R from CRAN Ubuntu repo for a recent R (or use distro one if sufficient)
+RUN set -eux; \
+    . /etc/os-release; \
+    echo "deb https://cloud.r-project.org/bin/linux/ubuntu ${UBUNTU_CODENAME}-cran40/" | tee /etc/apt/sources.list.d/cran-r.list; \
+    curl -fsSL https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | gpg --dearmor -o /etc/apt/trusted.gpg.d/cran.gpg; \
+    apt-get update && apt-get install -y --no-install-recommends r-base r-base-dev && rm -rf /var/lib/apt/lists/*
+
+# 3) JAGS (use distro for convenience; can be replaced by source build later)
+RUN apt-get update && apt-get install -y --no-install-recommends jags \
+    && rm -rf /var/lib/apt/lists/*
+
+# 4) Python + pip tooling for aqtinstall (Qt online installer alternative)
+RUN apt-get update && apt-get install -y --no-install-recommends python3 python3-pip python3-venv && rm -rf /var/lib/apt/lists/*
+
+# 5) Create venv for aqtinstall and install aqtinstall there
+RUN python3 -m venv /opt/aqt-venv \
+    && /opt/aqt-venv/bin/pip install --no-cache-dir aqtinstall
+
+# 6) Install Qt 6.7.x with required modules via aqt from venv
+RUN set -eux; \
+    /opt/aqt-venv/bin/aqt install-qt -O /opt/Qt linux desktop ${QT_VERSION} linux_gcc_64 -m ${QT_MODULES}; \
+    ln -s /opt/Qt/${QT_VERSION}/linux_gcc_64/bin/qmake /usr/local/bin/qmake || true
+
+# 7) Install Qt Creator and other tools
+RUN /opt/aqt-venv/bin/aqt install-tool -O /opt/Qt linux desktop tools_qtcreator qt.tools.qtcreator && \
+    /opt/aqt-venv/bin/aqt install-tool -O /opt/Qt linux desktop tools_cmake && \
+    /opt/aqt-venv/bin/aqt install-tool -O /opt/Qt linux desktop tools_ninja
+
+# 8) Install readstat
+RUN wget https://github.com/WizardMac/ReadStat/releases/download/v1.1.9/readstat-1.1.9.tar.gz && \
+            tar -xzf readstat-*.tar.gz && cd readstat-*/ && \
+            ./configure && make CFLAGS='-Wno-error=use-after-free' CXXFLAGS='-Wno-error=use-after-free' && make install

.devcontainer/devcontainer.json

@@ -0,0 +1,16 @@
+{
+  "name": "JASP Desktop Dev",
+  "build": {
+    "dockerfile": "Dockerfile"
+  },
+  "runArgs": [
+    "--shm-size=2g"
+  ],
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "TheQtCompany.qt-cpp-pack"
+      ]
+    }
+  }
+}

.github/workflows/ubuntu.yml

@@ -6,7 +6,12 @@ on:
    workflow_dispatch:
 
 jobs:
-
+   # to run locally install https://github.com/nektos/act and run `act --reuse -j build-jasp --env DISPLAY=$DISPLAY `
+   # docker commit 484f3a622a13 my-jasp-image:latest
+   # run desktop with
+   # xhost +local:docker
+   # docker exec -it -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --entrypoint bash my-jasp-image:latest
+   # ./jasp-build/Desktop/JASP
    build-jasp:
 
     runs-on: ubuntu-latest
@@ -33,22 +38,31 @@ jobs:
             cache: 'true'
             modules: 'qtpositioning qtwebchannel qtwebengine qtwebsockets qtwebview debug_info qt5compat qtshadertools qtwaylandcompositor'
             tools: 'tools_qtcreator,qt.tools.qtcreator tools_cmake tools_ninja'
+            # act can not use ../ (the default) as dir, so be explicit
+            dir: '${{ github.workspace }}/qtinstall'
 
       - name: Install dependencies of build system
-        run: |     
-            sudo apt install libboost-dev libjsoncpp25 libjsoncpp-dev libarchive13 libarchive-dev
-            sudo apt install libxcb-xkb-dev libxcb-xkb1 libxcb-xinerama0 libxkbcommon-dev libxkbcommon-x11-dev autoconf zlib1g zlib1g-dev cmake
-            sudo apt install gfortran build-essential flex libssl-dev libgl1-mesa-dev libsqlite3-dev
-            sudo apt install libharfbuzz-dev libfribidi-dev libfreetype6-dev libpng-dev libtiff5-dev libjpeg-dev #required by some r packgaes
-            sudo apt install libglpk-dev libcurl4-openssl-dev libmpfr-dev libfontconfig1-dev libcairo2-dev netcdf-bin #required by some r packages
-            sudo apt install jags
-            sudo apt install libminizip-dev # required by freexl
-            sudo apt install librdata-dev
+        run: |
+            # act -j build-jasp was stuck on typing y to continue
+            sudo apt install -y libboost-dev libjsoncpp25 libjsoncpp-dev libarchive13 libarchive-dev
+            sudo apt install -y libxcb-xkb-dev libxcb-xkb1 libxcb-xinerama0 libxkbcommon-dev libxkbcommon-x11-dev autoconf zlib1g zlib1g-dev cmake
+            sudo apt install -y gfortran build-essential flex libssl-dev libgl1-mesa-dev libsqlite3-dev
+            sudo apt install -y libharfbuzz-dev libfribidi-dev libfreetype6-dev libpng-dev libtiff5-dev libjpeg-dev #required by some r packgaes
+            sudo apt install -y libglpk-dev libcurl4-openssl-dev libmpfr-dev libfontconfig1-dev libcairo2-dev netcdf-bin #required by some r packages
+            sudo apt install -y jags
+            sudo apt install -y libminizip-dev # required by freexl
+            sudo apt install -y librdata-dev
+            # to solve qt missing so files.
+            sudo apt install -y libnss3-dev libnspr4-dev
+            sudo apt install -y libxcomposite-dev libxdamage-dev libxrandr-dev libxtst-dev libxi-dev
+            sudo apt install -y libasound2-dev libxkbfile-dev
             git clone https://github.com/jasp-stats/freexl.git
             cd freexl && ./configure && make && sudo make install
+        env:
+          DEBIAN_FRONTEND: noninteractive
 
       - name: Install boost
-        uses: MarkusJx/install-boost@v2.4.4
+        uses: MarkusJx/install-boost@v2
         id: install-boost
         with:
             # REQUIRED: Specify the required boost version
@@ -77,4 +91,5 @@ jobs:
 
       - name: Build JASP desktop
         run: |
-            cmake --build jasp-build --target all
+            # speed up build with -j
+            cmake --build jasp-build --target all -j6

.gitignore

@@ -63,6 +63,7 @@ build*/
 bundle/
 bundle*/
 CMakeLists.txt.user
+jasp-build
 
 # CLion Stuff
 cmake-build-*
@@ -89,4 +90,4 @@ Tools/ModuleBundleBuildDir
 Modules/local
 
 # User configurations
-.qmlls.ini
+.qmlls.ini

Common/enginedefinitions.h

@@ -8,10 +8,10 @@
 /// Using enumutilities templates to make sure we can easily and quickly go from enum -> string -> enum for json communication
 ///
 
-DECLARE_ENUM(engineState,			initializing, idle, analysis, filter, filterByName, rCode, computeColumn, moduleInstallRequest, moduleLoadRequest, pauseRequested, paused, resuming, stopRequested, stopped, logCfg, settings, killed, reloadData);
+DECLARE_ENUM(engineState,			initializing, idle, analysis, filter, filterByName, rCode, computeColumn, moduleInstallRequest, moduleUninstallRequest, moduleLoadRequest, pauseRequested, paused, resuming, stopRequested, stopped, logCfg, settings, killed, reloadData);
 DECLARE_ENUM(performType,			run, abort, saveImg, editImg, rewriteImgs);
 DECLARE_ENUM(analysisResultStatus,	validationError, fatalError, imageSaved, imageEdited, imagesRewritten, complete, running, changed, waiting);
-DECLARE_ENUM(moduleStatus,			initializing, installNeeded, loading, readyForUse, error);
+DECLARE_ENUM(moduleStatus,			initializing, installNeeded, uninstallNeeded, loading, readyForUse, error);
 DECLARE_ENUM(engineAnalysisStatus,	empty, toRun, running, changed, complete, error, exception, aborted, stopped, saveImg, editImg, rewriteImgs, synchingData);
 DECLARE_ENUM(enginesListRoles,		channel =  257, module, engineState, analysisStatus, runsWhat, running, idle, idleSoon); //hardcoded Qt::UserRole + 1, sue me.
 

Desktop/components/JASP/Widgets/FileMenu/PrefsAdvanced.qml

@@ -77,7 +77,6 @@ PrefsScrollView
 				}
 			}
 
-
 			CheckBox
 			{
 				id:					githubPatDefault
@@ -152,10 +151,50 @@ PrefsScrollView
 				onCheckedChanged:	preferencesModel.generateMarkdown = checked
 				visible:			preferencesModel.developerMode
 				enabled:			preferencesModel.developerMode
-				KeyNavigation.tab:	cleanModulesFolder
+				KeyNavigation.tab:	moduleLibraryUrl
 
 			}
 
+			Item
+			{
+				id:			moduleLibraryUrlItem
+				width:		parent.width
+				height:		moduleLibraryUrl.height
+				visible:	preferencesModel.developerMode
+				enabled:	preferencesModel.developerMode
+
+				Label
+				{
+					id:			moduleLibraryUrlLabel
+					text:		qsTr("Module library URL: ")
+
+					anchors
+					{
+						left:			parent.left
+						verticalCenter: parent.verticalCenter
+						margins:		jaspTheme.generalAnchorMargin
+					}
+				}
+
+				PrefsTextInput
+				{
+					id:					moduleLibraryUrl
+
+					text:				preferencesModel.moduleLibraryURL
+					onEditingFinished:	preferencesModel.moduleLibraryURL = text
+					nextEl:				cleanModulesFolder
+
+					height:				browseDeveloperFolderButton.height
+					anchors
+					{
+						left:		moduleLibraryUrlLabel.right
+						right:		parent.right
+						margins:	jaspTheme.generalAnchorMargin
+					}
+
+					KeyNavigation.tab:	cleanModulesFolder
+				}
+			}
 
 			RoundedButton
 			{