Merge pull request 'lock mih-ai to ollama 0.30.6' (#52) from v.1.3.0 into main

Reviewed-on: #52

mih_ui/.dockerignore

@@ -1,4 +0,0 @@
-.dart_tool/
-.build/
-build/
-.pub-cache/

mih_ui/.gitignore

@@ -48,8 +48,3 @@ app.*.map.json
 
 # Flutter config file
 /config/
-
-#Flatpak build files
-flatpak/build-dir/
-flatpak/.flatpak-builder/
-

mih_ui/Dockerfile

@@ -16,7 +16,7 @@ WORKDIR /app
 COPY pubspec.yaml pubspec.lock ./
 RUN flutter pub get
 COPY . .
-RUN flutter build web --release -t ./lib/main_prod.dart -v
+RUN flutter build web --release -t ./lib/main_prod.dart
 
 # --- STAGE 2: The Final Production Image ---
 FROM nginx:alpine

mih_ui/flatpak/za.co.mzansiinnovationhub.mih.yml

@@ -1,43 +0,0 @@
-id: za.co.mzansiinnovationhub.mih
-runtime: org.gnome.Platform
-runtime-version: "49"
-sdk: org.gnome.Sdk
-command: mzansi_innovation_hub
-
-finish-args:
-  - --share=ipc
-  - --share=network
-  - --socket=fallback-x11
-  - --socket=wayland
-  - --device=dri
-  - --env=__EGL_VENDOR_LIBRARY_FILENAMES=/usr/lib/x86_64-linux-gnu/GL/glvnd/egl_vendor.d/50_mesa.json
-
-modules:
-  - name: mzansi-innovation-hub
-    buildsystem: simple
-    sources:
-      - type: archive
-        url: https://git.mzansi-innovation-hub.co.za/yaso_meth/mih-project/releases/download/v.1.3.0/mzansi_innovation_hub.tar.gz
-        archive-type: tar-gzip
-        strip-components: 0
-        sha256: 8efff8baf8d9be44b70f3af500d985e80f2eb5a25cc421ce5c4f88b83f44ebe0
-      - type: file
-        path: za.co.mzansiinnovationhub.mih.desktop
-      - type: file
-        path: za.co.mzansiinnovationhub.mih.metainfo.xml
-      - type: file
-        path: za.co.mzansiinnovationhub.mih.png
-
-    build-commands:
-      - mkdir -p /app/bin
-      - mkdir -p /app/share/applications
-      - mkdir -p /app/share/metainfo
-      - mkdir -p /app/share/icons/hicolor/256x256/apps
-
-      - cp mzansi_innovation_hub /app/bin/
-      - cp -r lib/ /app/bin/
-      - cp -r data/ /app/bin/
-
-      - install -Dm644 za.co.mzansiinnovationhub.mih.desktop /app/share/applications/za.co.mzansiinnovationhub.mih.desktop
-      - install -Dm644 za.co.mzansiinnovationhub.mih.png /app/share/icons/hicolor/256x256/apps/za.co.mzansiinnovationhub.mih.png
-      - install -Dm644 za.co.mzansiinnovationhub.mih.metainfo.xml /app/share/metainfo/za.co.mzansiinnovationhub.mih.metainfo.xml

mih_ui/mih_app_flatpak/za.co.mzansiinnovationhub.mih.yml

@@ -0,0 +1,55 @@
+id: za.co.mzansiinnovationhub.mih
+runtime: org.freedesktop.Platform
+runtime-version: '24.08'
+sdk: org.freedesktop.Sdk
+command: mzansi_innovation_hub
+
+finish-args:
+  - --share=ipc
+  - --share=network        # Added for Internet access
+  - --socket=fallback-x11
+  - --socket=wayland
+  - --device=dri
+  # Removed --filesystem=home for better security; add back only if strictly needed.
+
+modules:
+  - name: mzansi-innovation-hub
+    buildsystem: simple
+    sources:
+      - type: archive
+        url: https://git.mzansi-innovation-hub.co.za/yaso_meth/mih-project/releases/download/linux/mzansi_innovation_hub.tar.gz
+        sha256: b8c383f4d43e2de36b4e6520c9745e3f8e8618bdb9ef6024ad0bf260061137a9
+        # If the tarball contains a top-level folder (like 'bundle'), 
+        # flatpak-builder enters it automatically. 
+        # If it doesn't, we use the commands below to find them.
+
+      - type: file
+        path: za.co.mzansiinnovationhub.mih.desktop
+      - type: file
+        path: za.co.mzansiinnovationhub.mih.metainfo.xml
+      - type: file
+        path: za.co.mzansiinnovationhub.mih.png
+
+    build-commands:
+      # 1. Create the necessary directories
+      - mkdir -p /app/bin /app/share/applications /app/share/icons/hicolor/256x256/apps /app/share/metainfo
+
+      # 2. Move EVERYTHING from your archive into /app/bin/
+      # We use 'find' to move only the app-related files and avoid the metadata files
+      - |
+        find . -mindepth 1 -maxdepth 2 \
+          ! -name "*.desktop" \
+          ! -name "*.xml" \
+          ! -name "*.png" \
+          ! -name "*.yml" \
+          -exec cp -R -t /app/bin/ {} +
+
+      # 3. Ensure the binary is in the right place and executable
+      # If the binary ended up in a subfolder, this moves it to the top of /app/bin
+      - find /app/bin -name "mzansi_innovation_hub" -type f -exec mv {} /app/bin/ \;
+      - chmod +x /app/bin/mzansi_innovation_hub
+
+      # 4. Install Metadata (using the exact local files)
+      - install -Dm644 za.co.mzansiinnovationhub.mih.desktop /app/share/applications/za.co.mzansiinnovationhub.mih.desktop
+      - install -Dm644 za.co.mzansiinnovationhub.mih.png /app/share/icons/hicolor/256x256/apps/za.co.mzansiinnovationhub.mih.png
+      - install -Dm644 za.co.mzansiinnovationhub.mih.metainfo.xml /app/share/metainfo/za.co.mzansiinnovationhub.mih.metainfo.xml

mih_ui/pubspec.lock

@@ -1212,10 +1212,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
+      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.17.0"
   mih_package_toolkit:
     dependency: "direct main"
     description:
@@ -1977,10 +1977,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e"
+      sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.11"
+    version: "0.7.10"
   timing:
     dependency: transitive
     description:
@@ -2294,5 +2294,5 @@ packages:
     source: hosted
     version: "3.1.1"
 sdks:
-  dart: ">=3.10.0-0 <3.13.0-z"
+  dart: ">=3.9.0 <3.13.0-z"
   flutter: ">=3.29.0"