.forgejo/workflows/test.yml

@@ -1,8 +1,9 @@
-name: run-test-on-push
+name: run-on-push
 on:
   push:
     branches:
-      - test
+      - main
+      - feature/embed-http-server
 
 jobs:
   run-script:
@@ -20,8 +21,6 @@ jobs:
         run: hostname -I
       - name: Run script 6
         run: hostname
-      - name: Run script 7
-        run: env
       - uses: actions/checkout@v4
-      - name: Run a script of repository
+      - name: Run script 1
         run: ./test.sh

.github/workflows/checkout.yml

@@ -1,21 +0,0 @@
-name: Test checkout
-
-on:
-  push:
-    tags:
-      - 'test*'
-
-jobs:
-  test_checkout_no_actions:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write     # needed to create releases
-    steps:
-      - name: Environment Variables
-        run: pwd; env
-      - name: Checkout
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh repo clone $GITHUB_REPOSITORY . -- --depth 1
-      - name: List files
-        run: find $(pwd)

.github/workflows/release.yml

@@ -1,50 +0,0 @@
-name: Create release from tag
-
-on:
-  push:
-    tags:
-      - 'release-*'
-
-jobs:
-  create_release:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write     # needed to create releases
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Environment Variables
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: env
-
-      - name: Files
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: echo "Estoy en $(pwd)"; find $(pwd)
-
-
-      - name: Flutter
-        uses: https://github.com/subosito/flutter-action@v2
-        with:
-          channel: stable
-          flutter-version: 3.38.9
-      - run: |
-            apt update
-            apt-get update && apt-get install -y             cmake             ninja-build             clang             pkg-config             libgtk-3-dev             liblzma-dev             binutils-dev            build-essential            lld             binutils
-            flutter build linux --release
-            flutter build web --release
-            pushd build/web && zip -r ../../webapp.zip * && popd
-            pushd build/linux/x64/release/bundle && zip -r ../../../../../linux-bin.zip * && popd
-            mkdir -p release-dir
-            mv webapp.zip linux-bin.zip release-dir
-
-      - name: Create release
-        uses: https://code.forgejo.org/actions/forgejo-release@v2
-        with:
-          direction: upload
-          release-dir: ./release-dir
-          release-notes: auto
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Makefile

@@ -32,16 +32,15 @@ build-android-release-container:
 build-linux-debug-container:
 	$(FLUTTERW) build linux --debug
 
-build-linux-release-container:
-	$(FLUTTERW) build linux --release
-
-
 build-web-debug-container:
 	$(FLUTTERW) build web --debug
 
-build-web-release-container:
+# Zip web build for embedding as asset
-	$(FLUTTERW) build web --release
+assets/generated/webapp.zip: build/web
+	mkdir -p assets/generated
+	cd build/web && zip -r ../../assets/generated/webapp.zip .
 
+build-webapp-zip: assets/generated/webapp.zip
 
 run-linux-debug-container:
 	$(FLUTTERW) run -d linux

TODO.md

@@ -91,7 +91,5 @@
   - Add a rule in Makefile to create a zip file  with the contents of ./build/web in the ./assets/generated directory -> ./assets/generated/webapp.zip
   - Add webapp.zip as a flutter asset
   - In the /static path, serve the files contained in webapp.zip
-- [X] Ensure database is loaded if the file exist, and not use default corpus allways.
+- [ ] Ensure database is loaded if the file exist, and not use default corpus allways.
-- [ ] Ensure more room for formula title in FormulaScreen. Maybe a marquee or another row for buttons or both.
-- [ ] In android, images in description are not shown.
 - [ ] Make formulaSolver() asyncronous, and show a CircularProgressIndicator inside the output variable while the formula is being solved. Honor a new optinal parameter "timeout" in formulaSolver, that will throw a TimeoutException.

flutterw

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -e
-set -x
+#set -x
 
 BUILDCACHE=./.build-container-cache
 DOCKERFILE=./docker/Dockerfile
@@ -111,17 +111,8 @@ docker_options(){
     fi
 }
 
-tty_options(){
-  if sh -c ": >/dev/tty" >/dev/null 2>/dev/null; then
-      echo "-it"
-  else
-      echo ""
-  fi
-}
-
 exec_in_container(){
     local SPIOPTIONS=$(spi_options)
-    local TTYOPTIONS=$(tty_options)
     local GRAPHICOPTIONS=$(graphic_options)
     local DOCKEROPTIONS=$(docker_options)
     mkdir -p $BUILDCACHE/root-home/.config
@@ -129,7 +120,7 @@ exec_in_container(){
     mkdir -p $BUILDCACHE/sdks-flutter-bin-cache
 
     $DOCKER run \
-            $TTYOPTIONS \
+            -it \
             --init \
             --rm \
             -v $BUILDCACHE/root-home/.config:/root/.config \
@@ -138,8 +129,8 @@ exec_in_container(){
             $GRAPHICOPTIONS \
             $SPIOPTIONS \
             -p ${WEBPORT:-8081}:8081 \
-            -v $BUILDCACHE/sdks-flutter-bin-cache:/cache:z \
+            -v $BUILDCACHE:/cache:z \
-            -v .:/app:z,rshared \
+            -v .:/app:z \
             -e FLUTTER_FLAVOR=prod \
             d4rt-formulas-builder \
             "$@"

pubspec.yaml

@@ -89,7 +89,8 @@ flutter:
   assets:
     - assets/units/
     - assets/formulas/
-  
+    - assets/generated/webapp.zip
+
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/to/resolution-aware-images
 

release.sh

@@ -1,36 +0,0 @@
-#!/bin/bash -x
-echo "Ejecutando $0 en directorio $(pwd)"
-
-build_release_files(){
-  (
-    docker ps
-    make build-container
-    pwd
-    ls -la
-    ./flutterw --exec pwd
-    ./flutterw --exec ls -la
-  )
-
-  make build-container build-builders test build-android-release-container build-linux-release-container build-web-release-container
-
-  echo " ----> Listando archivos en pwd"
-  find $(pwd)
-  echo " <----"
-
-  pushd build/web && zip -r ../../webapp.zip * && popd
-  pushd build/linux/x64/release/bundle && zip -r ../../../../../linux-bin.zip * && popd
-}
-
-get_release_files(){
-  echo ./build/app/outputs/flutter-apk/app-release.apk linux-bin.zip webapp.zip
-}
-
-main(){
-  TAG=${GITHUB_REF#refs/tags/}
-  VERSION=${TAG#version-}
-  build_release_files
-  FILES="$(get_release_files)"
-  # gh release create $TAG $FILES
-}
-
-main

test.sh

@@ -1,3 +1,4 @@
 #|/bin/bash
-echo "Ejecutando $0 en directorio $(PWD)"
+echo Es un test de CI/CD
-make build-container build-builders test
+echo date
+uname -a

test/app_test.dart

@@ -0,0 +1,279 @@
+import 'dart:async';
+import 'dart:math';
+
+import 'package:d4rt_formulas/defaults/default_corpus.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:d4rt_formulas/main.dart';
+import 'package:d4rt_formulas/corpus.dart';
+import 'package:d4rt_formulas/formula_models.dart';
+import 'package:d4rt_formulas/database/database_service.dart';
+import 'package:d4rt_formulas/service_locator.dart';
+import 'package:get_it/get_it.dart';
+import 'package:d4rt_formulas/set_utils.dart';
+import 'package:d4rt_formulas/database/formulas_database.dart';
+import 'package:d4rt_formulas/ai/import_from_text_screen.dart';
+import 'package:d4rt_formulas/ai/import_preview_screen.dart';
+
+void main() {
+
+  setUpAll(() {
+    // Ensure the database is initialized once for all tests
+    setupLocator();
+  });
+
+  testWidgets('selects first formula and opens editor from AppBar', (WidgetTester tester) async {
+    // Reset GetIt to allow fresh corpus registration
+    if (GetIt.instance.isRegistered<Corpus>()) {
+      GetIt.instance.unregister<Corpus>();
+    }
+    GetIt.instance.unregister<FormulasDatabase>();
+    setupLocator();
+    
+    // Build the app
+    var corpus = await createDefaultCorpus();
+    var corpusCompleter = Completer<Corpus>();
+    corpusCompleter.complete(corpus);
+    var app = MyApp(corpusCompleter.future);
+    await tester.pumpWidget(app);
+    await tester.pump();
+    await tester.pumpAndSettle(const Duration(seconds: 10));
+
+    // Verify FormulaList is shown
+    expect(find.byType(ListView), findsOneWidget);
+
+    // Find and tap the first formula in the list
+    final formulaTile = find.byType(ListTile).first;
+    expect(formulaTile, findsOneWidget);
+    await tester.tap(formulaTile);
+    await tester.pumpAndSettle();
+
+
+    // Find and tap the edit icon in the AppBar
+    final editIcon = find.byIcon(Icons.edit);
+    expect(editIcon, findsOneWidget);
+    await tester.tap(editIcon);
+    await tester.pumpAndSettle();
+
+    // Verify FormulaEditor is shown
+    expect(find.text('Edit Formula'), findsOneWidget);
+  });
+
+  testWidgets('share first formula to clipboard and import it', (WidgetTester tester) async {
+    tester.view.physicalSize = const Size(1200, 800);
+    tester.view.devicePixelRatio = 1.0;
+
+    try {
+      // Reset GetIt to allow fresh corpus registration
+      if (GetIt.instance.isRegistered<Corpus>()) {
+        GetIt.instance.unregister<Corpus>();
+      }
+      GetIt.instance.unregister<FormulasDatabase>();
+      setupLocator();
+      
+      print('DEBUG: Building app...');
+      var corpus = await createDefaultCorpus();
+      var corpusCompleter = Completer<Corpus>();
+      corpusCompleter.complete(corpus);
+      var app = MyApp(corpusCompleter.future);
+      await tester.pumpWidget(app);
+      await tester.pump();
+      await tester.pumpAndSettle(const Duration(seconds: 10));
+      print('DEBUG: App built and settled');
+
+      final firstFormulaTile = find.byType(ListTile).first;
+      expect(firstFormulaTile, findsOneWidget);
+      print('DEBUG: Found first formula tile');
+
+      final shareButton = find.descendant(
+        of: firstFormulaTile,
+        matching: find.byIcon(Icons.share),
+      );
+      await tester.tap(shareButton);
+      await tester.pumpAndSettle();
+      print('DEBUG: Tapped share button');
+
+      await tester.tap(find.text('Copy to clipboard'));
+      await tester.pump(const Duration(seconds: 1));
+      print('DEBUG: Tapped copy to clipboard');
+
+      // Generate the expected export string directly
+      final random = Random();
+      final marker = 'TEST_MARKER_${random.nextInt(999999).toString().padLeft(6, '0')}';
+      final firstFormula = corpus.getFormulas().first;
+      final dependencies = corpus.withDependencies(firstFormula);
+      final dependenciesAsMap = dependencies.map((f) => f.toMap()).toList();
+      for (final f in dependenciesAsMap) {
+        f.remove("uuid");
+      }
+      // Inject marker into first formula's description (append without newline to avoid raw string issues)
+      if (dependenciesAsMap[0].containsKey('description')) {
+        final desc = dependenciesAsMap[0]['description'];
+        if (desc is String && !desc.contains('\n') && !desc.contains('"""')) {
+          // Simple string, can append directly
+          dependenciesAsMap[0]['description'] = '$desc $marker';
+        } else {
+          // Complex string, use a tag instead
+          dependenciesAsMap[0]['tags'] = [...(dependenciesAsMap[0]['tags'] ?? []), marker];
+        }
+      } else {
+        dependenciesAsMap[0]['description'] = marker;
+      }
+      final exportString = SetUtils.prettyPrint(dependenciesAsMap);
+      print('DEBUG: Export string starts with: ${exportString.substring(0, 100)}');
+
+      // Mock the clipboard channel so the app reads our content
+      String? mockedClipboardText = exportString;
+      tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(
+        const MethodChannel('plugins.flutter.io/clipboard'),
+        (MethodCall methodCall) async {
+          if (methodCall.method == 'getData') {
+            return <String, dynamic>{'text': mockedClipboardText};
+          }
+          if (methodCall.method == 'setData') {
+            mockedClipboardText = methodCall.arguments['text'];
+            return null;
+          }
+          return null;
+        },
+      );
+
+      print('DEBUG: Clipboard mocked with marker: $marker');
+
+      await tester.tap(find.byIcon(Icons.library_add));
+      await tester.pumpAndSettle();
+      print('DEBUG: Tapped import button');
+      expect(find.byType(ImportFromTextScreen), findsOneWidget, reason: 'ImportFromTextScreen should be visible');
+
+      // Instead of relying on clipboard paste, find the EditableText inside CodeField and enter text
+      // CodeField contains an EditableText widget that we can interact with
+      final editableText = find.byType(EditableText);
+      expect(editableText, findsOneWidget, reason: 'Should find EditableText in CodeField');
+      
+      // Use enterText to set the content
+      await tester.enterText(editableText, exportString);
+      await tester.pumpAndSettle();
+      print('DEBUG: Text entered into code field');
+
+      // Now tap Import
+      await tester.tap(find.text('Import'));
+      await tester.pumpAndSettle();
+      print('DEBUG: Tapped Import button');
+      
+      expect(find.byType(ImportPreviewScreen), findsOneWidget, reason: 'ImportPreviewScreen should appear');
+      
+      // Verify the preview has the expected number of elements
+      final importPreviewState = tester.state(find.byType(ImportPreviewScreen));
+      final elements = (importPreviewState as dynamic).widget.elements;
+      print('DEBUG: ImportPreviewScreen has ${elements.length} elements to import');
+      
+      // Tap the "Import Selected" button (check icon in AppBar)
+      await tester.tap(find.byIcon(Icons.check));
+      await tester.pumpAndSettle(const Duration(seconds: 2));
+      
+      // Note: The import operation saves to the database which doesn't work reliably in widget tests.
+      // We verify the UI flow up to the import preview screen.
+      // The actual database import is tested in integration tests.
+      print('DEBUG: Import flow completed successfully up to preview screen');
+    } finally {
+      tester.view.resetPhysicalSize();
+    }
+  });
+
+  testWidgets('import formula updates existing element in database', (WidgetTester tester) async {
+    tester.view.physicalSize = const Size(1200, 800);
+    tester.view.devicePixelRatio = 1.0;
+
+    try {
+      // Reset GetIt to allow fresh corpus registration
+      if (GetIt.instance.isRegistered<Corpus>()) {
+        GetIt.instance.unregister<Corpus>();
+      }
+      GetIt.instance.unregister<FormulasDatabase>();
+      setupLocator();
+
+      // Build the app with default corpus
+      var corpus = await createDefaultCorpus();
+      var corpusCompleter = Completer<Corpus>();
+      corpusCompleter.complete(corpus);
+      var app = MyApp(corpusCompleter.future);
+      await tester.pumpWidget(app);
+      await tester.pump();
+      await tester.pumpAndSettle(const Duration(seconds: 10));
+
+      // Get the first formula from the corpus
+      final firstFormula = corpus.getFormulas().first;
+      final originalUuid = firstFormula.uuid;
+      final originalName = firstFormula.name;
+
+      // Export the first formula
+      final firstFormulaTile = find.byType(ListTile).first;
+      expect(firstFormulaTile, findsOneWidget);
+
+      final shareButton = find.descendant(
+        of: firstFormulaTile,
+        matching: find.byIcon(Icons.share),
+      );
+      await tester.tap(shareButton);
+      await tester.pumpAndSettle();
+
+      await tester.tap(find.text('Copy to clipboard'));
+      await tester.pump(const Duration(seconds: 1));
+
+      // Get the export string and modify it
+      final dependencies = corpus.withDependencies(firstFormula);
+      final dependenciesAsMap = dependencies.map((f) => f.toMap()).toList();
+      final exportString = SetUtils.prettyPrint(dependenciesAsMap);
+
+      // Mock the clipboard
+      String? mockedClipboardText = exportString;
+      tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(
+        const MethodChannel('plugins.flutter.io/clipboard'),
+        (MethodCall methodCall) async {
+          if (methodCall.method == 'getData') {
+            return <String, dynamic>{'text': mockedClipboardText};
+          }
+          if (methodCall.method == 'setData') {
+            mockedClipboardText = methodCall.arguments['text'];
+            return null;
+          }
+          return null;
+        },
+      );
+
+      // Import the formula back (this should update existing elements)
+      await tester.tap(find.byIcon(Icons.library_add));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(ImportFromTextScreen), findsOneWidget);
+
+      // Enter the export string into the code field
+      final editableText = find.byType(EditableText);
+      expect(editableText, findsOneWidget);
+      await tester.enterText(editableText, exportString);
+      await tester.pumpAndSettle();
+
+      // Tap Import
+      await tester.tap(find.text('Import'));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(ImportPreviewScreen), findsOneWidget);
+
+      // Verify the preview has the expected elements
+      final importPreviewState = tester.state(find.byType(ImportPreviewScreen));
+      final elements = (importPreviewState as dynamic).widget.elements;
+      expect(elements.isNotEmpty, true);
+
+      // Tap the "Import Selected" button (check icon in AppBar)
+      await tester.tap(find.byIcon(Icons.check));
+      await tester.pumpAndSettle(const Duration(seconds: 2));
+
+      // The import should succeed even though elements already exist in DB
+      // We can't directly verify the database update in widget test, but we verify no error occurred
+      print('DEBUG: Import with existing elements completed successfully');
+    } finally {
+      tester.view.resetPhysicalSize();
+    }
+  });
+}

test/app_test.dart.notest

@@ -1,106 +0,0 @@
-import 'dart:async';
-import 'dart:math';
-
-import 'package:d4rt_formulas/defaults/default_corpus.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:d4rt_formulas/main.dart';
-import 'package:d4rt_formulas/corpus.dart';
-import 'package:d4rt_formulas/formula_models.dart';
-import 'package:d4rt_formulas/database/database_service.dart';
-import 'package:d4rt_formulas/service_locator.dart';
-import 'package:get_it/get_it.dart';
-import 'package:d4rt_formulas/set_utils.dart';
-import 'package:d4rt_formulas/database/formulas_database.dart';
-import 'package:d4rt_formulas/ai/import_from_text_screen.dart';
-import 'package:d4rt_formulas/ai/import_preview_screen.dart';
-
-void main() {
-
-  setUpAll(() {
-    // Ensure the database is initialized once for all tests
-    setupLocator();
-  });
-
-  testWidgets('selects first formula and opens editor from AppBar', (WidgetTester tester) async {
-    // Reset GetIt to allow fresh corpus registration
-    if (GetIt.instance.isRegistered<Corpus>()) {
-      GetIt.instance.unregister<Corpus>();
-    }
-    GetIt.instance.unregister<FormulasDatabase>();
-    setupLocator();
-    
-    // Build the app
-    var corpus = await createDefaultCorpus();
-    var corpusCompleter = Completer<Corpus>();
-    corpusCompleter.complete(corpus);
-    var app = MyApp(corpusCompleter.future);
-    await tester.pumpWidget(app);
-    await tester.pump();
-    await tester.pumpAndSettle(const Duration(seconds: 10));
-
-    // Verify FormulaList is shown
-    expect(find.byType(ListView), findsOneWidget);
-
-    // Find and tap the first formula in the list
-    final formulaTile = find.byType(ListTile).first;
-    expect(formulaTile, findsOneWidget);
-    await tester.tap(formulaTile);
-    await tester.pumpAndSettle();
-
-
-    // Find and tap the edit icon in the AppBar
-    final editIcon = find.byIcon(Icons.edit);
-    expect(editIcon, findsOneWidget);
-    await tester.tap(editIcon);
-    await tester.pumpAndSettle();
-
-    // Verify FormulaEditor is shown
-    expect(find.text('Edit Formula'), findsOneWidget);
-  });
-
-  testWidgets('share first formula to clipboard and import it', (WidgetTester tester) async {
-    tester.view.physicalSize = const Size(1200, 800);
-    tester.view.devicePixelRatio = 1.0;
-
-    try {
-      // Reset GetIt to allow fresh corpus registration
-      if (GetIt.instance.isRegistered<Corpus>()) {
-        GetIt.instance.unregister<Corpus>();
-      }
-      GetIt.instance.unregister<FormulasDatabase>();
-      setupLocator();
-      
-      print('DEBUG: Building app...');
-      var corpus = await createDefaultCorpus();
-      var corpusCompleter = Completer<Corpus>();
-      corpusCompleter.complete(corpus);
-      var app = MyApp(corpusCompleter.future);
-      await tester.pumpWidget(app);
-      await tester.pump();
-      await tester.pumpAndSettle(const Duration(seconds: 10));
-      print('DEBUG: App built and settled');
-
-      final firstFormulaTile = find.byType(ListTile).first;
-      expect(firstFormulaTile, findsOneWidget);
-
-      await tester.tap(firstFormulaTile);
-      await tester.pumpAndSettle(const Duration(seconds: 1));
-      await tester.pump(const Duration(seconds: 1));
-
-      final shareButton = find.byIcon(Icons.share);
-
-      await tester.tap(shareButton);
-      await tester.pumpAndSettle();
-      print('DEBUG: Tapped share button');
-
-      await tester.tap(find.text('Copy to clipboard'));
-      await tester.pump(const Duration(seconds: 1));
-      print('DEBUG: Tapped copy to clipboard');
-
-    } finally {
-      tester.view.resetPhysicalSize();
-    }
-  });
-}

test/value_formatter_test.dart

@@ -8,7 +8,7 @@ void main() {
   group('Format', () {
     test('1 is 1', () {
       var s = formatOutput(1.0);
-      expect(s, "1.0");
+      expect(s, "1");
     });
   });
 }