-
-
+
-
+
-
+
-
+
-
+
+
-
-
+
+
Relationship Key
- Select schema item
+ Select schema item
-
+
+
-
+
-
+
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/ActiveThingifierWorkspaceTest.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/ActiveThingifierWorkspaceTest.java
index b7be17c0..96d4c69b 100644
--- a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/ActiveThingifierWorkspaceTest.java
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/ActiveThingifierWorkspaceTest.java
@@ -1,10 +1,17 @@
package uk.co.compendiumdev.thingifier.crudui;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import java.nio.file.Files;
+import java.nio.file.Path;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
public class ActiveThingifierWorkspaceTest {
+ @TempDir Path temp;
+
@Test
public void defaultWorkspaceStartsWithTodoManager() {
try (ActiveThingifierWorkspace workspace =
@@ -31,4 +38,80 @@ public void yamlLoadReplacesSchemaAndIncrementsVersion() {
Assertions.assertNull(snapshot.definition().entityNamed("project"));
}
}
+
+ @Test
+ public void switchToSqliteMemoryMigratesDataAndRelationships() {
+ try (ActiveThingifierWorkspace workspace =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ workspace.replaceWithYaml(TestResources.text("/models/project-tasks.yaml"));
+ createRelatedProjectAndTodo(new DynamicThingifierApiProxy(workspace));
+
+ workspace.switchStorage(WorkspaceStorage.sqliteMemory());
+
+ DynamicThingifierApiProxy proxy = new DynamicThingifierApiProxy(workspace);
+ Assertions.assertEquals("sqlite-memory", workspace.snapshot().storage().mode());
+ Assertions.assertTrue(proxy.getJson("projects").body().contains("Project A"));
+ Assertions.assertTrue(proxy.getJson("todos").body().contains("Task A"));
+ Assertions.assertEquals(
+ 1,
+ root(proxy.getJson("projects/1/tasks").body()).getAsJsonArray("todos").size());
+ }
+ }
+
+ @Test
+ public void switchToSqliteFileCreatesFileAndMigratesData() {
+ Path databaseFile = temp.resolve("workspace.sqlite");
+ try (ActiveThingifierWorkspace workspace =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ workspace.replaceWithYaml(TestResources.text("/models/project-tasks.yaml"));
+ createRelatedProjectAndTodo(new DynamicThingifierApiProxy(workspace));
+
+ workspace.switchStorage(WorkspaceStorage.sqliteFile(databaseFile));
+
+ DynamicThingifierApiProxy proxy = new DynamicThingifierApiProxy(workspace);
+ Assertions.assertTrue(Files.exists(databaseFile));
+ Assertions.assertEquals("sqlite-file", workspace.snapshot().storage().mode());
+ Assertions.assertTrue(proxy.getJson("projects").body().contains("Project A"));
+ Assertions.assertEquals(
+ 1,
+ root(proxy.getJson("projects/1/tasks").body()).getAsJsonArray("todos").size());
+ }
+ }
+
+ @Test
+ public void switchFromSqliteFileBackToMemoryMigratesData() {
+ Path databaseFile = temp.resolve("workspace.sqlite");
+ try (ActiveThingifierWorkspace workspace =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ workspace.replaceWithYaml(TestResources.text("/models/project-tasks.yaml"));
+ createRelatedProjectAndTodo(new DynamicThingifierApiProxy(workspace));
+ workspace.switchStorage(WorkspaceStorage.sqliteFile(databaseFile));
+
+ workspace.switchStorage(WorkspaceStorage.memory());
+
+ DynamicThingifierApiProxy proxy = new DynamicThingifierApiProxy(workspace);
+ Assertions.assertEquals("memory", workspace.snapshot().storage().mode());
+ Assertions.assertTrue(proxy.getJson("projects").body().contains("Project A"));
+ Assertions.assertEquals(
+ 1,
+ root(proxy.getJson("projects/1/tasks").body()).getAsJsonArray("todos").size());
+ }
+ }
+
+ private void createRelatedProjectAndTodo(final DynamicThingifierApiProxy proxy) {
+ String projectId =
+ field(proxy.postJson("projects", "{\"title\":\"Project A\"}").body(), "id");
+ String todoId = field(proxy.postJson("todos", "{\"title\":\"Task A\"}").body(), "id");
+ UiHttpResponse relationship =
+ proxy.postJson("projects/" + projectId + "/tasks", "{\"id\":\"" + todoId + "\"}");
+ Assertions.assertEquals(201, relationship.statusCode());
+ }
+
+ private String field(final String json, final String fieldName) {
+ return root(json).get(fieldName).getAsString();
+ }
+
+ private JsonObject root(final String json) {
+ return JsonParser.parseString(json).getAsJsonObject();
+ }
}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/CrudUiArgumentsTest.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/CrudUiArgumentsTest.java
index fb5dff13..f5908373 100644
--- a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/CrudUiArgumentsTest.java
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/CrudUiArgumentsTest.java
@@ -23,4 +23,18 @@ public void rejectsProjectAndModelYamlTogether() {
CrudUiArguments.parse(
new String[] {"-project=project-folder", "-modelYaml=model.yaml"}));
}
+
+ @Test
+ public void parsesStorageModeAndSqliteFilePath() {
+ CrudUiArguments arguments =
+ CrudUiArguments.parse(
+ new String[] {
+ "-modelYaml=model.yaml",
+ "-thingifier-repository=sqlite-file",
+ "-thingifier-sqlite-file=data.sqlite"
+ });
+
+ Assertions.assertEquals("sqlite-file", arguments.storage().mode());
+ Assertions.assertTrue(arguments.storage().sqliteFilePath().endsWith("data.sqlite"));
+ }
}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/CrudUiControllerTest.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/CrudUiControllerTest.java
index 4e172f4e..83a7ad8b 100644
--- a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/CrudUiControllerTest.java
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/CrudUiControllerTest.java
@@ -2,11 +2,16 @@
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
+import java.nio.file.Path;
+import java.util.Map;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
public class CrudUiControllerTest {
+ @TempDir Path temp;
+
@Test
public void workspaceRouteReturnsSchemaMetadata() {
try (ActiveThingifierWorkspace workspace =
@@ -15,11 +20,107 @@ public void workspaceRouteReturnsSchemaMetadata() {
UiHttpResponse response = controller.workspace();
- Assertions.assertEquals(200, response.statusCode());
+ Assertions.assertEquals(200, response.statusCode(), response.body());
Assertions.assertTrue(response.body().contains("\"entities\""));
Assertions.assertTrue(response.body().contains("\"relationships\""));
Assertions.assertTrue(response.body().contains("\"schemaYaml\""));
Assertions.assertTrue(response.body().contains("\"project\""));
+ Assertions.assertTrue(response.body().contains("\"storage\""));
+ }
+ }
+
+ @Test
+ public void storageSwitchEndpointChangesWorkspaceStorageMode() {
+ try (ActiveThingifierWorkspace workspace =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ CrudUiController controller = new CrudUiController(workspace);
+ Path databaseFile = temp.resolve("controller.sqlite");
+
+ UiHttpResponse response =
+ controller.switchStorage(
+ JsonSupport.toJson(
+ Map.of(
+ "mode",
+ "sqlite-file",
+ "sqliteFile",
+ databaseFile.toString())));
+
+ Assertions.assertEquals(200, response.statusCode(), response.body());
+ Assertions.assertEquals("sqlite-file", workspace.snapshot().storage().mode());
+ Assertions.assertTrue(response.body().contains("\"storageStatus\": \"switched\""));
+ }
+ }
+
+ @Test
+ public void projectBrowseEndpointReturnsSelectedPathFromChooser() {
+ try (ActiveThingifierWorkspace workspace =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ Path chosen = temp.resolve("chosen-project");
+ CrudUiController controller =
+ new CrudUiController(
+ workspace, request -> ProjectPathSelection.selected(chosen.toString()));
+
+ UiHttpResponse response =
+ controller.browseProject(
+ JsonSupport.toJson(Map.of("action", "save", "path", "")));
+ JsonObject body = JsonParser.parseString(response.body()).getAsJsonObject();
+
+ Assertions.assertEquals(200, response.statusCode());
+ Assertions.assertTrue(body.get("selected").getAsBoolean());
+ Assertions.assertEquals(chosen.toString(), body.get("path").getAsString());
+ }
+ }
+
+ @Test
+ public void projectBrowseEndpointReturnsCancelledSelection() {
+ try (ActiveThingifierWorkspace workspace =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ CrudUiController controller =
+ new CrudUiController(workspace, request -> ProjectPathSelection.cancelled());
+
+ UiHttpResponse response =
+ controller.browseProject(
+ JsonSupport.toJson(Map.of("action", "load", "path", "")));
+ JsonObject body = JsonParser.parseString(response.body()).getAsJsonObject();
+
+ Assertions.assertEquals(200, response.statusCode());
+ Assertions.assertFalse(body.get("selected").getAsBoolean());
+ Assertions.assertEquals(
+ "Project browsing cancelled.", body.get("message").getAsString());
+ }
+ }
+
+ @Test
+ public void projectBrowseEndpointReportsUnavailableChooserAsBadRequest() {
+ try (ActiveThingifierWorkspace workspace =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ CrudUiController controller =
+ new CrudUiController(
+ workspace,
+ request -> ProjectPathSelection.unavailable("Browse unavailable"));
+
+ UiHttpResponse response =
+ controller.browseProject(
+ JsonSupport.toJson(Map.of("action", "save", "path", "")));
+
+ Assertions.assertEquals(400, response.statusCode());
+ Assertions.assertTrue(response.body().contains("Browse unavailable"));
+ }
+ }
+
+ @Test
+ public void sqliteFileStorageSwitchRequiresAFilePathAndDoesNotMutateWorkspace() {
+ try (ActiveThingifierWorkspace workspace =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ CrudUiController controller = new CrudUiController(workspace);
+ long version = workspace.snapshot().version();
+
+ UiHttpResponse response =
+ controller.switchStorage(JsonSupport.toJson(Map.of("mode", "sqlite-file")));
+
+ Assertions.assertEquals(400, response.statusCode());
+ Assertions.assertEquals(version, workspace.snapshot().version());
+ Assertions.assertEquals("memory", workspace.snapshot().storage().mode());
}
}
@@ -109,6 +210,14 @@ public void staticIndexResourceIsAvailable() {
Assertions.assertTrue(index.contains("Load Project"));
Assertions.assertTrue(index.contains("id=\"project-dialog\""));
Assertions.assertTrue(index.contains("id=\"project-path-input\""));
+ Assertions.assertTrue(index.contains("id=\"project-recent-paths\""));
+ Assertions.assertTrue(index.contains("id=\"project-browse-button\""));
+ Assertions.assertTrue(index.contains("id=\"project-validate-button\""));
+ Assertions.assertTrue(index.contains("id=\"project-browser-save-button\""));
+ Assertions.assertTrue(index.contains("id=\"project-browser-load-button\""));
+ Assertions.assertTrue(index.contains("Browser Save..."));
+ Assertions.assertTrue(index.contains("Browser Load..."));
+ Assertions.assertTrue(index.contains("Validate Path"));
Assertions.assertTrue(index.contains("Workspace"));
Assertions.assertTrue(index.contains("Schema Edit"));
Assertions.assertTrue(index.contains("href=\"/schema\""));
@@ -280,6 +389,20 @@ public void staticAssetsContainExpandableRelationshipOutline() {
Assertions.assertTrue(script.contains("/ui/schema/upgrade/apply"));
Assertions.assertTrue(script.contains("/ui/project/save"));
Assertions.assertTrue(script.contains("/ui/project/load"));
+ Assertions.assertTrue(script.contains("/ui/project/browse"));
+ Assertions.assertTrue(script.contains("/ui/project/check"));
+ Assertions.assertTrue(script.contains("/ui/project/load-files"));
+ Assertions.assertTrue(script.contains("/ui/project/export-files"));
+ Assertions.assertTrue(script.contains("browserSaveProject"));
+ Assertions.assertTrue(script.contains("browserLoadProject"));
+ Assertions.assertTrue(script.contains("validateProjectPath"));
+ Assertions.assertTrue(script.contains("projectRecentPaths"));
+ Assertions.assertTrue(script.contains("showDirectoryPicker"));
+ Assertions.assertTrue(script.contains("Browser folder picker is not available"));
+ Assertions.assertTrue(script.contains("/ui/storage/switch"));
+ Assertions.assertTrue(script.contains("storageModeSelect"));
+ Assertions.assertTrue(script.contains("storageFileInput"));
+ Assertions.assertTrue(script.contains("Storage switched."));
Assertions.assertTrue(script.contains("openProjectDialog"));
Assertions.assertTrue(script.contains("Project saved."));
Assertions.assertTrue(script.contains("Project loaded."));
@@ -333,6 +456,9 @@ public void staticAssetsContainExpandableRelationshipOutline() {
Assertions.assertTrue(styles.contains(".schema-dialog-footer"));
Assertions.assertTrue(styles.contains(".project-dialog"));
Assertions.assertTrue(styles.contains(".project-dialog-warning"));
+ Assertions.assertTrue(styles.contains(".project-path-controls"));
+ Assertions.assertTrue(styles.contains(".project-browser-actions"));
+ Assertions.assertTrue(styles.contains(".project-browser-status"));
Assertions.assertTrue(styles.contains(".schema-upgrade-layout"));
Assertions.assertTrue(styles.contains(".schema-upgrade-row"));
Assertions.assertTrue(styles.contains(".schema-upgrade-summary"));
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/WorkspaceProjectServiceTest.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/WorkspaceProjectServiceTest.java
index 119718f9..b37a72cb 100644
--- a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/WorkspaceProjectServiceTest.java
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/WorkspaceProjectServiceTest.java
@@ -4,6 +4,10 @@
import com.google.gson.JsonParser;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -65,6 +69,176 @@ public void savedProjectReloadsSchemaDataAndRelationshipEdges() {
}
}
+ @Test
+ public void sqliteBackedSaveCreatesManifestSchemaAndDatabaseFile() throws Exception {
+ Path projectFolder = temp.resolve("sqlite-project-bundle");
+ try (ActiveThingifierWorkspace workspace =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ workspace.replaceWithYaml(TestResources.text("/models/project-tasks.yaml"));
+ createRelatedProjectAndTodo(new DynamicThingifierApiProxy(workspace));
+ workspace.switchStorage(WorkspaceStorage.sqliteFile(temp.resolve("source.sqlite")));
+
+ UiHttpResponse response =
+ new CrudUiController(workspace).saveProject(request(projectFolder));
+
+ Assertions.assertEquals(200, response.statusCode());
+ Assertions.assertTrue(Files.exists(projectFolder.resolve("projectfile.erproj")));
+ Assertions.assertTrue(Files.exists(projectFolder.resolve("schema.yaml")));
+ Assertions.assertTrue(Files.exists(projectFolder.resolve("data.sqlite")));
+ Assertions.assertFalse(Files.exists(projectFolder.resolve("data.json")));
+ Assertions.assertTrue(
+ Files.readString(projectFolder.resolve("projectfile.erproj"))
+ .contains("dataFile: data.sqlite"));
+ Assertions.assertFalse(
+ Files.readString(projectFolder.resolve("projectfile.erproj"))
+ .contains("storage:"));
+ }
+ }
+
+ @Test
+ public void saveAsSqliteFromMemorySwitchesWorkspaceToProjectDatabaseFile() throws Exception {
+ Path projectFolder = temp.resolve("sqlite-save-as-project");
+ try (ActiveThingifierWorkspace workspace =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ workspace.replaceWithYaml(TestResources.text("/models/project-tasks.yaml"));
+ createRelatedProjectAndTodo(new DynamicThingifierApiProxy(workspace));
+
+ UiHttpResponse response =
+ new CrudUiController(workspace).saveProject(request(projectFolder, "sqlite"));
+
+ Assertions.assertEquals(200, response.statusCode(), response.body());
+ Assertions.assertTrue(Files.exists(projectFolder.resolve("data.sqlite")));
+ Assertions.assertFalse(Files.exists(projectFolder.resolve("data.json")));
+ Assertions.assertEquals("sqlite-file", workspace.snapshot().storage().mode());
+ Assertions.assertEquals(
+ projectFolder.resolve("data.sqlite").toAbsolutePath().normalize().toString(),
+ workspace.snapshot().storage().sqliteFilePath());
+ Assertions.assertTrue(
+ new DynamicThingifierApiProxy(workspace)
+ .getJson("projects")
+ .body()
+ .contains("Project A"));
+ }
+ }
+
+ @Test
+ public void saveAsJsonFromSqliteSwitchesWorkspaceToInMemoryStorage() throws Exception {
+ Path projectFolder = temp.resolve("json-save-as-project");
+ try (ActiveThingifierWorkspace workspace =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ workspace.replaceWithYaml(TestResources.text("/models/project-tasks.yaml"));
+ createRelatedProjectAndTodo(new DynamicThingifierApiProxy(workspace));
+ workspace.switchStorage(WorkspaceStorage.sqliteFile(temp.resolve("source.sqlite")));
+
+ UiHttpResponse response =
+ new CrudUiController(workspace).saveProject(request(projectFolder, "json"));
+
+ Assertions.assertEquals(200, response.statusCode(), response.body());
+ Assertions.assertTrue(Files.exists(projectFolder.resolve("data.json")));
+ Assertions.assertFalse(
+ Files.readString(projectFolder.resolve("projectfile.erproj"))
+ .contains("sqlite-file"));
+ Assertions.assertEquals("memory", workspace.snapshot().storage().mode());
+ Assertions.assertTrue(
+ new DynamicThingifierApiProxy(workspace)
+ .getJson("projects")
+ .body()
+ .contains("Project A"));
+ }
+ }
+
+ @Test
+ public void sqliteBackedProjectReloadsDataAndSwitchesStorageMode() {
+ Path projectFolder = temp.resolve("sqlite-project-bundle");
+ try (ActiveThingifierWorkspace source =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ source.replaceWithYaml(TestResources.text("/models/project-tasks.yaml"));
+ createRelatedProjectAndTodo(new DynamicThingifierApiProxy(source));
+ source.switchStorage(WorkspaceStorage.sqliteFile(temp.resolve("source.sqlite")));
+ new CrudUiController(source).saveProject(request(projectFolder));
+ }
+
+ try (ActiveThingifierWorkspace target =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ UiHttpResponse response =
+ new CrudUiController(target).loadProject(request(projectFolder));
+ DynamicThingifierApiProxy targetProxy = new DynamicThingifierApiProxy(target);
+
+ Assertions.assertEquals(200, response.statusCode());
+ Assertions.assertEquals("sqlite-file", target.snapshot().storage().mode());
+ Assertions.assertTrue(
+ target.snapshot().storage().sqliteFilePath().endsWith("data.sqlite"));
+ Assertions.assertTrue(targetProxy.getJson("projects").body().contains("Project A"));
+ Assertions.assertEquals(
+ 1,
+ root(targetProxy.getJson("projects/1/tasks").body())
+ .getAsJsonArray("todos")
+ .size());
+ }
+ }
+
+ @Test
+ public void loadProjectTreatsSqliteDataFileAsSqliteStorageWithoutStorageBlock()
+ throws Exception {
+ Path projectFolder = temp.resolve("edited-sqlite-project-bundle");
+ try (ActiveThingifierWorkspace source =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ source.replaceWithYaml(TestResources.text("/models/project-tasks.yaml"));
+ createRelatedProjectAndTodo(new DynamicThingifierApiProxy(source));
+ source.switchStorage(WorkspaceStorage.sqliteFile(temp.resolve("source.sqlite")));
+ new CrudUiController(source).saveProject(request(projectFolder));
+ }
+ Files.move(
+ projectFolder.resolve("data.sqlite"), projectFolder.resolve("todomanager.sqlite"));
+ Files.writeString(
+ projectFolder.resolve("projectfile.erproj"),
+ "formatVersion: 1\n"
+ + "project:\n"
+ + " title: Edited SQLite Project\n"
+ + "schemaFile: schema.yaml\n"
+ + "dataFile: todomanager.sqlite\n");
+
+ try (ActiveThingifierWorkspace target =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ UiHttpResponse response =
+ new CrudUiController(target).loadProject(request(projectFolder));
+ DynamicThingifierApiProxy targetProxy = new DynamicThingifierApiProxy(target);
+
+ Assertions.assertEquals(200, response.statusCode(), response.body());
+ Assertions.assertEquals("sqlite-file", target.snapshot().storage().mode());
+ Assertions.assertTrue(
+ target.snapshot().storage().sqliteFilePath().endsWith("todomanager.sqlite"));
+ Assertions.assertTrue(targetProxy.getJson("projects").body().contains("Project A"));
+ }
+ }
+
+ @Test
+ public void loadProjectSniffsSqliteDataFileWhenFilenameHasNoSqliteExtension() throws Exception {
+ Path projectFolder = temp.resolve("sniffed-sqlite-project-bundle");
+ try (ActiveThingifierWorkspace source =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ source.replaceWithYaml(TestResources.text("/models/project-tasks.yaml"));
+ createRelatedProjectAndTodo(new DynamicThingifierApiProxy(source));
+ source.switchStorage(WorkspaceStorage.sqliteFile(temp.resolve("source.sqlite")));
+ new CrudUiController(source).saveProject(request(projectFolder));
+ }
+ Files.move(projectFolder.resolve("data.sqlite"), projectFolder.resolve("data.bin"));
+ Files.writeString(
+ projectFolder.resolve("projectfile.erproj"),
+ "formatVersion: 1\n" + "schemaFile: schema.yaml\n" + "dataFile: data.bin\n");
+
+ try (ActiveThingifierWorkspace target =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ UiHttpResponse response =
+ new CrudUiController(target).loadProject(request(projectFolder));
+
+ Assertions.assertEquals(200, response.statusCode(), response.body());
+ Assertions.assertEquals("sqlite-file", target.snapshot().storage().mode());
+ Assertions.assertTrue(
+ target.snapshot().storage().sqliteFilePath().endsWith("data.bin"));
+ }
+ }
+
@Test
public void loadAcceptsDirectProjectFilePath() {
Path projectFolder = temp.resolve("project-bundle");
@@ -85,6 +259,199 @@ public void loadAcceptsDirectProjectFilePath() {
}
}
+ @Test
+ public void checkSavePathReportsCreatableFolderAndManagedFiles() throws Exception {
+ Path creatableFolder = temp.resolve("new-project");
+ try (ActiveThingifierWorkspace workspace =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ CrudUiController controller = new CrudUiController(workspace);
+
+ JsonObject creatable =
+ root(controller.checkProject(actionRequest("save", creatableFolder)).body());
+
+ Assertions.assertTrue(creatable.get("canProceed").getAsBoolean());
+ Assertions.assertEquals("creatable-folder", creatable.get("kind").getAsString());
+
+ Path existingFolder = temp.resolve("existing-project");
+ Files.createDirectories(existingFolder);
+ Files.writeString(existingFolder.resolve("projectfile.erproj"), "managed");
+ Files.writeString(existingFolder.resolve("schema.yaml"), "managed");
+
+ JsonObject existing =
+ root(controller.checkProject(actionRequest("save", existingFolder)).body());
+
+ Assertions.assertTrue(existing.get("canProceed").getAsBoolean());
+ Assertions.assertTrue(
+ existing.get("warning").getAsString().contains("projectfile.erproj"));
+ Assertions.assertTrue(existing.get("warning").getAsString().contains("schema.yaml"));
+ }
+ }
+
+ @Test
+ public void checkLoadPathAcceptsFolderAndDirectProjectFile() {
+ Path projectFolder = temp.resolve("project-bundle");
+ try (ActiveThingifierWorkspace source =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ new CrudUiController(source).saveProject(request(projectFolder));
+ }
+ try (ActiveThingifierWorkspace workspace =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ CrudUiController controller = new CrudUiController(workspace);
+
+ JsonObject folderCheck =
+ root(controller.checkProject(actionRequest("load", projectFolder)).body());
+ JsonObject fileCheck =
+ root(
+ controller
+ .checkProject(
+ actionRequest(
+ "load",
+ projectFolder.resolve("projectfile.erproj")))
+ .body());
+
+ Assertions.assertTrue(folderCheck.get("canProceed").getAsBoolean());
+ Assertions.assertEquals("folder", folderCheck.get("kind").getAsString());
+ Assertions.assertTrue(fileCheck.get("canProceed").getAsBoolean());
+ Assertions.assertEquals("project-file", fileCheck.get("kind").getAsString());
+ }
+ }
+
+ @Test
+ public void browserExportFilesEmitsJsonBackedProjectFiles() {
+ try (ActiveThingifierWorkspace workspace =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ UiHttpResponse response = new CrudUiController(workspace).exportProjectFiles();
+ JsonObject body = root(response.body());
+
+ Assertions.assertEquals(200, response.statusCode());
+ Assertions.assertTrue(response.body().contains("\"projectStatus\": \"exported\""));
+ Assertions.assertTrue(response.body().contains("\"projectfile.erproj\""));
+ Assertions.assertTrue(response.body().contains("\"schema.yaml\""));
+ Assertions.assertTrue(response.body().contains("\"data.json\""));
+ Assertions.assertFalse(response.body().contains("\"data.sqlite\""));
+ Assertions.assertEquals("memory", body.get("storageMode").getAsString());
+ Assertions.assertEquals("json", body.get("projectStorageMode").getAsString());
+ }
+ }
+
+ @Test
+ public void browserExportFilesEmitsSqliteBackedProjectFiles() {
+ try (ActiveThingifierWorkspace workspace =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ workspace.switchStorage(WorkspaceStorage.sqliteFile(temp.resolve("source.sqlite")));
+
+ UiHttpResponse response = new CrudUiController(workspace).exportProjectFiles();
+ JsonObject body = root(response.body());
+
+ Assertions.assertEquals(200, response.statusCode());
+ Assertions.assertTrue(response.body().contains("\"projectfile.erproj\""));
+ Assertions.assertTrue(response.body().contains("\"schema.yaml\""));
+ Assertions.assertTrue(response.body().contains("\"data.sqlite\""));
+ Assertions.assertFalse(response.body().contains("\"data.json\""));
+ Assertions.assertEquals("sqlite-file", body.get("storageMode").getAsString());
+ Assertions.assertEquals("sqlite", body.get("projectStorageMode").getAsString());
+ }
+ }
+
+ @Test
+ public void browserExportFilesCanExportSqliteProjectFromMemoryWorkspace() {
+ try (ActiveThingifierWorkspace workspace =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ UiHttpResponse response =
+ new CrudUiController(workspace)
+ .exportProjectFiles(
+ JsonSupport.toJson(Map.of("projectStorageMode", "sqlite")));
+ JsonObject body = root(response.body());
+
+ Assertions.assertEquals(200, response.statusCode());
+ Assertions.assertTrue(response.body().contains("\"data.sqlite\""));
+ Assertions.assertFalse(response.body().contains("\"data.json\""));
+ Assertions.assertEquals("sqlite-file", body.get("storageMode").getAsString());
+ Assertions.assertEquals("sqlite", body.get("projectStorageMode").getAsString());
+ Assertions.assertEquals("memory", workspace.snapshot().storage().mode());
+ }
+ }
+
+ @Test
+ public void browserLoadFilesLoadsJsonBackedProjectWithoutServerPath() throws Exception {
+ Path projectFolder = temp.resolve("browser-json-project");
+ try (ActiveThingifierWorkspace source =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ source.replaceWithYaml(TestResources.text("/models/project-tasks.yaml"));
+ createRelatedProjectAndTodo(new DynamicThingifierApiProxy(source));
+ new CrudUiController(source).saveProject(request(projectFolder));
+ }
+
+ try (ActiveThingifierWorkspace target =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ UiHttpResponse response =
+ new CrudUiController(target)
+ .loadProjectFiles(browserFilePayload(projectFolder, "browser-json"));
+ DynamicThingifierApiProxy targetProxy = new DynamicThingifierApiProxy(target);
+
+ Assertions.assertEquals(200, response.statusCode(), response.body());
+ Assertions.assertEquals("Project Tasks", target.snapshot().definition().title());
+ Assertions.assertEquals(
+ "Browser folder: browser-json", target.snapshot().projectPath());
+ Assertions.assertTrue(targetProxy.getJson("projects").body().contains("Project A"));
+ Assertions.assertEquals(
+ 1,
+ root(targetProxy.getJson("projects/1/tasks").body())
+ .getAsJsonArray("todos")
+ .size());
+ }
+ }
+
+ @Test
+ public void browserLoadFilesLoadsSqliteBackedProject() throws Exception {
+ Path projectFolder = temp.resolve("browser-sqlite-project");
+ try (ActiveThingifierWorkspace source =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ source.replaceWithYaml(TestResources.text("/models/project-tasks.yaml"));
+ createRelatedProjectAndTodo(new DynamicThingifierApiProxy(source));
+ source.switchStorage(WorkspaceStorage.sqliteFile(temp.resolve("source.sqlite")));
+ new CrudUiController(source).saveProject(request(projectFolder));
+ }
+
+ try (ActiveThingifierWorkspace target =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ UiHttpResponse response =
+ new CrudUiController(target)
+ .loadProjectFiles(browserFilePayload(projectFolder, "browser-sqlite"));
+ DynamicThingifierApiProxy targetProxy = new DynamicThingifierApiProxy(target);
+
+ Assertions.assertEquals(200, response.statusCode(), response.body());
+ Assertions.assertEquals("sqlite-file", target.snapshot().storage().mode());
+ Assertions.assertEquals(
+ "Browser folder: browser-sqlite", target.snapshot().projectPath());
+ Assertions.assertTrue(targetProxy.getJson("projects").body().contains("Project A"));
+ Assertions.assertEquals(
+ 1,
+ root(targetProxy.getJson("projects/1/tasks").body())
+ .getAsJsonArray("todos")
+ .size());
+ }
+ }
+
+ @Test
+ public void invalidBrowserLoadFilesDoesNotMutateWorkspace() {
+ try (ActiveThingifierWorkspace workspace =
+ ActiveThingifierWorkspace.defaultTodoManagerWorkspace()) {
+ long version = workspace.snapshot().version();
+ List> files = new ArrayList<>();
+ files.add(textPayload("projectfile.erproj", "not: valid: yaml"));
+ UiHttpResponse response =
+ new CrudUiController(workspace)
+ .loadProjectFiles(
+ JsonSupport.toJson(
+ Map.of("folderName", "bad-project", "files", files)));
+
+ Assertions.assertEquals(400, response.statusCode());
+ Assertions.assertEquals(version, workspace.snapshot().version());
+ Assertions.assertEquals("Todo Manager", workspace.snapshot().definition().title());
+ }
+ }
+
@Test
public void invalidProjectLoadDoesNotMutateActiveWorkspace() throws Exception {
Path projectFolder = temp.resolve("invalid-project");
@@ -138,6 +505,49 @@ private String request(final Path path) {
return JsonSupport.toJson(Map.of("path", path.toString()));
}
+ private String request(final Path path, final String projectStorageMode) {
+ return JsonSupport.toJson(
+ Map.of("path", path.toString(), "projectStorageMode", projectStorageMode));
+ }
+
+ private String actionRequest(final String action, final Path path) {
+ return JsonSupport.toJson(Map.of("action", action, "path", path.toString()));
+ }
+
+ private String browserFilePayload(final Path folder, final String folderName) throws Exception {
+ List> files = new ArrayList<>();
+ files.add(
+ textPayload(
+ "projectfile.erproj",
+ Files.readString(folder.resolve("projectfile.erproj"))));
+ files.add(textPayload("schema.yaml", Files.readString(folder.resolve("schema.yaml"))));
+ Path dataJson = folder.resolve("data.json");
+ if (Files.exists(dataJson)) {
+ files.add(textPayload("data.json", Files.readString(dataJson)));
+ }
+ Path sqlite = folder.resolve("data.sqlite");
+ if (Files.exists(sqlite)) {
+ files.add(binaryPayload("data.sqlite", Files.readAllBytes(sqlite)));
+ }
+ return JsonSupport.toJson(Map.of("folderName", folderName, "files", files));
+ }
+
+ private Map textPayload(final String name, final String content) {
+ Map file = new LinkedHashMap<>();
+ file.put("name", name);
+ file.put("type", "text");
+ file.put("content", content);
+ return file;
+ }
+
+ private Map binaryPayload(final String name, final byte[] content) {
+ Map file = new LinkedHashMap<>();
+ file.put("name", name);
+ file.put("type", "base64");
+ file.put("content", Base64.getEncoder().encodeToString(content));
+ return file;
+ }
+
private String field(final String json, final String fieldName) {
JsonObject object = root(json);
return object.get(fieldName).getAsString();
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/BrowserFolderPickerStub.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/BrowserFolderPickerStub.java
new file mode 100644
index 00000000..0802e3cf
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/BrowserFolderPickerStub.java
@@ -0,0 +1,66 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e;
+
+import com.google.gson.Gson;
+import com.microsoft.playwright.Page;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+final class BrowserFolderPickerStub {
+
+ private final Page page;
+ private final Gson gson = new Gson();
+
+ BrowserFolderPickerStub(final Page page) {
+ this.page = page;
+ }
+
+ void install(final String folderName, final Map files) {
+ Map payload = new LinkedHashMap<>();
+ payload.put("name", folderName);
+ payload.put("files", files);
+ page.addInitScript(
+ "window.__thingifierCrudUiTestDirectory = "
+ + gson.toJson(payload)
+ + ";\n"
+ + "window.showDirectoryPicker = async function() {\n"
+ + " const directory = window.__thingifierCrudUiTestDirectory;\n"
+ + " return {\n"
+ + " name: directory.name,\n"
+ + " async getFileHandle(name, options) {\n"
+ + " if (!(name in directory.files) && !(options && options.create)) {\n"
+ + " throw new Error('Missing browser file: ' + name);\n"
+ + " }\n"
+ + " if (!(name in directory.files)) {\n"
+ + " directory.files[name] = '';\n"
+ + " }\n"
+ + " return {\n"
+ + " async getFile() {\n"
+ + " const value = directory.files[name] || '';\n"
+ + " return new File([value], name, {type: 'text/plain'});\n"
+ + " },\n"
+ + " async createWritable() {\n"
+ + " return {\n"
+ + " async write(value) {\n"
+ + " if (value instanceof Uint8Array) {\n"
+ + " let binary = '';\n"
+ + " for (const byte of value) binary += String.fromCharCode(byte);\n"
+ + " directory.files[name] = btoa(binary);\n"
+ + " } else {\n"
+ + " directory.files[name] = String(value);\n"
+ + " }\n"
+ + " },\n"
+ + " async close() {}\n"
+ + " };\n"
+ + " }\n"
+ + " };\n"
+ + " }\n"
+ + " };\n"
+ + "};");
+ }
+
+ @SuppressWarnings("unchecked")
+ Map files() {
+ return (Map)
+ page.evaluate("() => window.__thingifierCrudUiTestDirectory.files");
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/BrowserTestBase.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/BrowserTestBase.java
new file mode 100644
index 00000000..4ee20e36
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/BrowserTestBase.java
@@ -0,0 +1,138 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e;
+
+import com.microsoft.playwright.Browser;
+import com.microsoft.playwright.BrowserContext;
+import com.microsoft.playwright.BrowserType;
+import com.microsoft.playwright.Page;
+import com.microsoft.playwright.Playwright;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.extension.TestExecutionExceptionHandler;
+
+abstract class BrowserTestBase {
+
+ private static final Path ARTIFACT_DIR =
+ Path.of("thingifier-crud-ui", "target", "playwright-artifacts");
+ private static CrudUiTestServer sharedServer;
+ private static final ThreadLocal CURRENT = new ThreadLocal<>();
+
+ @RegisterExtension final BrowserFailureArtifacts artifacts = new BrowserFailureArtifacts();
+
+ protected Playwright playwright;
+ protected Browser browser;
+ protected BrowserContext context;
+ protected Page page;
+ protected final List consoleMessages = new ArrayList<>();
+ protected final List requestFailures = new ArrayList<>();
+
+ @BeforeAll
+ static void startCrudUi() {
+ if (sharedServer == null) {
+ sharedServer = CrudUiTestServer.start();
+ }
+ }
+
+ @AfterAll
+ static void stopCrudUi() {
+ if (sharedServer != null) {
+ sharedServer.close();
+ sharedServer = null;
+ }
+ }
+
+ @BeforeEach
+ void launchBrowser() {
+ CURRENT.set(this);
+ playwright = Playwright.create();
+ browser =
+ playwright
+ .chromium()
+ .launch(
+ new BrowserType.LaunchOptions()
+ .setHeadless(
+ Boolean.parseBoolean(
+ System.getProperty(
+ "crud.ui.headless", "true"))));
+ context = browser.newContext(new Browser.NewContextOptions().setAcceptDownloads(true));
+ page = context.newPage();
+ page.onConsoleMessage(
+ message -> consoleMessages.add(message.type() + ": " + message.text()));
+ page.onRequestFailed(
+ request -> requestFailures.add(request.method() + " " + request.url()));
+ }
+
+ @AfterEach
+ void closeBrowser() {
+ if (context != null) {
+ context.close();
+ }
+ if (browser != null) {
+ browser.close();
+ }
+ if (playwright != null) {
+ playwright.close();
+ }
+ CURRENT.remove();
+ }
+
+ protected CrudUiTestServer server() {
+ return sharedServer;
+ }
+
+ protected CrudUiApiClient api() {
+ return sharedServer.api();
+ }
+
+ protected void resetToProjectTasks() {
+ server().resetToYaml("/models/project-tasks.yaml");
+ }
+
+ protected void resetToMinimalTodo() {
+ server().resetToYaml("/models/minimal-todo.yaml");
+ }
+
+ protected void captureArtifacts(final String displayName) {
+ try {
+ Files.createDirectories(ARTIFACT_DIR);
+ String safeName =
+ displayName.toLowerCase().replaceAll("[^a-z0-9]+", "-").replaceAll("^-|-$", "");
+ if (page != null) {
+ page.screenshot(
+ new Page.ScreenshotOptions()
+ .setPath(ARTIFACT_DIR.resolve(safeName + ".png"))
+ .setFullPage(true));
+ Files.writeString(ARTIFACT_DIR.resolve(safeName + ".html"), page.content());
+ }
+ Files.writeString(
+ ARTIFACT_DIR.resolve(safeName + "-console.txt"),
+ String.join(System.lineSeparator(), consoleMessages));
+ Files.writeString(
+ ARTIFACT_DIR.resolve(safeName + "-network.txt"),
+ String.join(System.lineSeparator(), requestFailures));
+ } catch (IOException ignored) {
+ // Failure artifacts are best-effort only.
+ }
+ }
+
+ private static final class BrowserFailureArtifacts implements TestExecutionExceptionHandler {
+
+ @Override
+ public void handleTestExecutionException(
+ final ExtensionContext context, final Throwable throwable) throws Throwable {
+ BrowserTestBase base = CURRENT.get();
+ if (base != null) {
+ base.captureArtifacts(context.getDisplayName());
+ }
+ throw throwable;
+ }
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/CrudUiApiClient.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/CrudUiApiClient.java
new file mode 100644
index 00000000..fe03bfd8
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/CrudUiApiClient.java
@@ -0,0 +1,120 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URLEncoder;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.Map;
+
+final class CrudUiApiClient {
+
+ private final HttpClient client;
+ private final String baseUrl;
+
+ CrudUiApiClient(final String baseUrl) {
+ this.baseUrl = baseUrl;
+ this.client = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(5)).build();
+ }
+
+ ApiResult get(final String path) {
+ return send(HttpRequest.newBuilder(uri(path)).GET().build());
+ }
+
+ ApiResult delete(final String path) {
+ return send(HttpRequest.newBuilder(uri(path)).DELETE().build());
+ }
+
+ ApiResult postJson(final String path, final String json) {
+ return send(
+ HttpRequest.newBuilder(uri(path))
+ .header("Content-Type", "application/json")
+ .header("Accept", "application/json")
+ .POST(HttpRequest.BodyPublishers.ofString(json))
+ .build());
+ }
+
+ ApiResult putJson(final String path, final String json) {
+ return send(
+ HttpRequest.newBuilder(uri(path))
+ .header("Content-Type", "application/json")
+ .header("Accept", "application/json")
+ .PUT(HttpRequest.BodyPublishers.ofString(json))
+ .build());
+ }
+
+ ApiResult postText(final String path, final String text) {
+ return send(
+ HttpRequest.newBuilder(uri(path))
+ .header("Content-Type", "text/plain")
+ .header("Accept", "application/json")
+ .POST(HttpRequest.BodyPublishers.ofString(text))
+ .build());
+ }
+
+ String absoluteUrl(final String path) {
+ return baseUrl + path;
+ }
+
+ String encoded(final String value) {
+ return URLEncoder.encode(value, StandardCharsets.UTF_8).replace("+", "%20");
+ }
+
+ private ApiResult send(final HttpRequest request) {
+ try {
+ HttpResponse response =
+ client.send(request, HttpResponse.BodyHandlers.ofString());
+ return new ApiResult(response.statusCode(), response.body(), response.headers().map());
+ } catch (IOException e) {
+ throw new IllegalStateException(e);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new IllegalStateException(e);
+ }
+ }
+
+ private URI uri(final String path) {
+ return URI.create(baseUrl + path);
+ }
+
+ static final class ApiResult {
+
+ private final int statusCode;
+ private final String body;
+ private final Map> headers;
+
+ ApiResult(
+ final int statusCode,
+ final String body,
+ final Map> headers) {
+ this.statusCode = statusCode;
+ this.body = body;
+ this.headers = headers;
+ }
+
+ int statusCode() {
+ return statusCode;
+ }
+
+ String body() {
+ return body;
+ }
+
+ JsonObject jsonObject() {
+ JsonElement parsed = JsonParser.parseString(body);
+ return parsed.getAsJsonObject();
+ }
+
+ String header(final String name) {
+ return headers.getOrDefault(name.toLowerCase(), java.util.List.of()).stream()
+ .findFirst()
+ .orElse("");
+ }
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/CrudUiApiIT.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/CrudUiApiIT.java
new file mode 100644
index 00000000..069bb9fe
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/CrudUiApiIT.java
@@ -0,0 +1,188 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class CrudUiApiIT {
+
+ private static CrudUiTestServer server;
+ private CrudUiApiClient api;
+
+ @BeforeAll
+ static void startServer() {
+ server = CrudUiTestServer.start();
+ }
+
+ @AfterAll
+ static void stopServer() {
+ server.close();
+ }
+
+ @BeforeEach
+ void resetWorkspace() {
+ api = server.api();
+ server.resetToYaml("/models/project-tasks.yaml");
+ }
+
+ @Test
+ public void staticPagesAndGeneratedDocumentationAreReachable() {
+ assertStatusContains("/", 200, "Thingifier CRUD UI");
+ assertStatusContains("/schema", 200, "Thingifier Schema Edit");
+ assertStatusContains("/docs", 200, "API Documentation");
+ assertStatusContains("/swagger", 200, "SwaggerUIBundle");
+ assertStatusContains("/openapi.json", 200, "\"openapi\"");
+ assertStatusContains("/docs/swagger", 200, "\"openapi\"");
+ }
+
+ @Test
+ public void workspaceEndpointsImportExportAndSchemaPreviewWorkThroughHttp() {
+ JsonObject workspace = api.get("/ui/workspace").jsonObject();
+ Assertions.assertEquals(
+ "Project Tasks", workspace.getAsJsonObject("model").get("title").getAsString());
+
+ CrudUiApiClient.ApiResult fromYaml =
+ api.postText("/ui/schema/from-yaml", E2eResource.text("/models/minimal-todo.yaml"));
+ Assertions.assertEquals(200, fromYaml.statusCode(), fromYaml.body());
+ JsonObject draft = fromYaml.jsonObject().getAsJsonObject("draft");
+
+ CrudUiApiClient.ApiResult preview = api.postJson("/ui/schema/preview", draft.toString());
+ Assertions.assertEquals(200, preview.statusCode(), preview.body());
+ Assertions.assertTrue(preview.jsonObject().get("valid").getAsBoolean());
+
+ CrudUiApiClient.ApiResult created =
+ api.postJson("/api/todos", "{\"title\":\"Round trip\"}");
+ Assertions.assertEquals(201, created.statusCode(), created.body());
+ CrudUiApiClient.ApiResult exported = api.get("/ui/export");
+ Assertions.assertEquals(200, exported.statusCode(), exported.body());
+ Assertions.assertTrue(exported.body().contains("Round trip"));
+
+ CrudUiApiClient.ApiResult imported = api.postJson("/ui/import", exported.body());
+ Assertions.assertEquals(200, imported.statusCode(), imported.body());
+ Assertions.assertTrue(api.get("/api/todos").body().contains("Round trip"));
+ }
+
+ @Test
+ public void schemaUpgradePreviewAndApplyAreAvailableThroughHttp() {
+ JsonObject projectDraft =
+ api.postText("/ui/schema/from-yaml", E2eResource.text("/models/project-tasks.yaml"))
+ .jsonObject()
+ .getAsJsonObject("draft");
+ entityNamed(projectDraft, "todo")
+ .getAsJsonArray("fields")
+ .add(field("status", "string", "open"));
+
+ long version = api.get("/ui/workspace").jsonObject().get("workspaceVersion").getAsLong();
+ CrudUiApiClient.ApiResult preview =
+ api.postJson("/ui/schema/upgrade/preview", upgradeRequest(projectDraft, version));
+ Assertions.assertEquals(200, preview.statusCode(), preview.body());
+ Assertions.assertTrue(preview.jsonObject().get("canApply").getAsBoolean());
+
+ CrudUiApiClient.ApiResult apply =
+ api.postJson("/ui/schema/upgrade/apply", upgradeRequest(projectDraft, version));
+ Assertions.assertEquals(200, apply.statusCode(), apply.body());
+ Assertions.assertTrue(apply.body().contains("\"status\""));
+ }
+
+ @Test
+ public void projectFilePayloadAndCheckEndpointsWorkThroughHttp() {
+ CrudUiApiClient.ApiResult check =
+ api.postJson(
+ "/ui/project/check",
+ "{\"action\":\"save\",\"path\":\"target/e2e-project\"}");
+ Assertions.assertEquals(200, check.statusCode(), check.body());
+ Assertions.assertTrue(check.jsonObject().get("canProceed").getAsBoolean());
+
+ CrudUiApiClient.ApiResult exported = api.postJson("/ui/project/export-files", "{}");
+ Assertions.assertEquals(200, exported.statusCode(), exported.body());
+ JsonArray files = exported.jsonObject().getAsJsonArray("files");
+ Assertions.assertTrue(files.toString().contains("projectfile.erproj"));
+
+ JsonObject loadRequest = new JsonObject();
+ loadRequest.addProperty("folderName", "browser-project");
+ loadRequest.add("files", files);
+ CrudUiApiClient.ApiResult loaded =
+ api.postJson("/ui/project/load-files", loadRequest.toString());
+ Assertions.assertEquals(200, loaded.statusCode(), loaded.body());
+ Assertions.assertTrue(loaded.body().contains("Browser folder: browser-project"));
+ }
+
+ @Test
+ public void storageEndpointAndDynamicApiProxySupportCrudAndRelationships() {
+ CrudUiApiClient.ApiResult switched =
+ api.postJson("/ui/storage/switch", "{\"mode\":\"sqlite-memory\"}");
+ Assertions.assertEquals(200, switched.statusCode(), switched.body());
+ Assertions.assertEquals(
+ "sqlite-memory",
+ switched.jsonObject().getAsJsonObject("storage").get("mode").getAsString());
+
+ String projectId = create("/api/projects", "title", "Smoke Project");
+ String todoId = create("/api/todos", "title", "Do this");
+ CrudUiApiClient.ApiResult connected =
+ api.postJson(
+ "/api/projects/" + projectId + "/tasks", "{\"id\":\"" + todoId + "\"}");
+ Assertions.assertEquals(201, connected.statusCode(), connected.body());
+ Assertions.assertTrue(
+ api.get("/api/projects/" + projectId + "/tasks").body().contains("Do this"));
+
+ CrudUiApiClient.ApiResult disconnected =
+ api.delete("/api/projects/" + projectId + "/tasks/" + todoId);
+ Assertions.assertEquals(200, disconnected.statusCode(), disconnected.body());
+ Assertions.assertTrue(api.get("/api/todos/" + todoId).body().contains("Do this"));
+ }
+
+ private void assertStatusContains(
+ final String path, final int statusCode, final String expectedText) {
+ CrudUiApiClient.ApiResult result = api.get(path);
+ Assertions.assertEquals(statusCode, result.statusCode(), result.body());
+ Assertions.assertTrue(result.body().contains(expectedText), result.body());
+ }
+
+ private String create(final String path, final String field, final String value) {
+ CrudUiApiClient.ApiResult created =
+ api.postJson(path, JsonSupport.map(field, value).toString());
+ Assertions.assertEquals(201, created.statusCode(), created.body());
+ return created.jsonObject().get("id").getAsString();
+ }
+
+ private String upgradeRequest(final JsonObject draft, final long version) {
+ JsonObject request = new JsonObject();
+ request.add("draft", draft);
+ request.addProperty("expectedWorkspaceVersion", version);
+ request.add("mappings", new JsonObject());
+ return request.toString();
+ }
+
+ private JsonObject field(final String name, final String type, final String defaultValue) {
+ JsonObject field = new JsonObject();
+ field.addProperty("name", name);
+ field.addProperty("type", type);
+ field.addProperty("defaultValue", defaultValue);
+ return field;
+ }
+
+ private JsonObject entityNamed(final JsonObject draft, final String name) {
+ for (var entityValue : draft.getAsJsonArray("entities")) {
+ JsonObject entity = entityValue.getAsJsonObject();
+ if (name.equals(entity.get("name").getAsString())) {
+ return entity;
+ }
+ }
+ throw new AssertionError("Missing entity " + name);
+ }
+
+ private static final class JsonSupport {
+
+ private JsonSupport() {}
+
+ static JsonObject map(final String key, final String value) {
+ JsonObject object = new JsonObject();
+ object.addProperty(key, value);
+ return object;
+ }
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/CrudUiTestServer.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/CrudUiTestServer.java
new file mode 100644
index 00000000..06b41041
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/CrudUiTestServer.java
@@ -0,0 +1,57 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import uk.co.compendiumdev.thingifier.crudui.ActiveThingifierWorkspace;
+import uk.co.compendiumdev.thingifier.crudui.adapter.spark.CrudUiApplication;
+
+final class CrudUiTestServer implements AutoCloseable {
+
+ private final int port;
+ private final ActiveThingifierWorkspace workspace;
+ private final CrudUiApplication application;
+ private final CrudUiApiClient api;
+
+ private CrudUiTestServer(final int port) {
+ this.port = port;
+ this.workspace = ActiveThingifierWorkspace.defaultTodoManagerWorkspace();
+ this.application = new CrudUiApplication(workspace, port);
+ this.api = new CrudUiApiClient(baseUrl());
+ }
+
+ static CrudUiTestServer start() {
+ CrudUiTestServer server = new CrudUiTestServer(availablePort());
+ server.application.start();
+ return server;
+ }
+
+ String baseUrl() {
+ return "http://localhost:" + port;
+ }
+
+ CrudUiApiClient api() {
+ return api;
+ }
+
+ void resetToYaml(final String resourcePath) {
+ api.postJson("/ui/storage/switch", "{\"mode\":\"memory\"}");
+ CrudUiApiClient.ApiResult result =
+ api.postText("/ui/model/yaml", E2eResource.text(resourcePath));
+ if (result.statusCode() != 200) {
+ throw new IllegalStateException(result.body());
+ }
+ }
+
+ private static int availablePort() {
+ try (ServerSocket socket = new ServerSocket(0)) {
+ return socket.getLocalPort();
+ } catch (IOException e) {
+ throw new IllegalStateException(e);
+ }
+ }
+
+ @Override
+ public void close() {
+ application.close();
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/E2eResource.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/E2eResource.java
new file mode 100644
index 00000000..aa42a920
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/E2eResource.java
@@ -0,0 +1,21 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
+final class E2eResource {
+
+ private E2eResource() {}
+
+ static String text(final String resourcePath) {
+ try (InputStream stream = E2eResource.class.getResourceAsStream(resourcePath)) {
+ if (stream == null) {
+ throw new IllegalArgumentException("Missing test resource " + resourcePath);
+ }
+ return new String(stream.readAllBytes(), StandardCharsets.UTF_8);
+ } catch (IOException e) {
+ throw new IllegalStateException(e);
+ }
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/ProjectStorageUiIT.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/ProjectStorageUiIT.java
new file mode 100644
index 00000000..6af5f707
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/ProjectStorageUiIT.java
@@ -0,0 +1,161 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e;
+
+import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
+
+import java.awt.GraphicsEnvironment;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import uk.co.compendiumdev.thingifier.crudui.e2e.pages.WorkspacePage;
+
+public class ProjectStorageUiIT extends BrowserTestBase {
+
+ @TempDir Path temp;
+
+ private WorkspacePage workspace;
+
+ @BeforeEach
+ void resetWorkspace() {
+ resetToProjectTasks();
+ }
+
+ @Test
+ public void typedProjectSaveLoadAndRecentPathWorkFromWorkspace() {
+ workspace = new WorkspacePage(page, server().baseUrl()).open();
+ api().postJson("/api/todos", "{\"title\":\"Saved Task\"}");
+ Path projectFolder = temp.resolve("typed-project");
+
+ workspace.projectDialog().openSave();
+ workspace.projectDialog().fillPath(projectFolder.toString());
+ workspace.projectDialog().validatePath();
+ assertThat(workspace.projectDialog().status())
+ .containsText("Project folder can be created");
+ workspace.projectDialog().confirm();
+ assertThat(workspace.messages().root()).containsText("Project saved.");
+ Assertions.assertTrue(Files.exists(projectFolder.resolve("projectfile.erproj")));
+ Assertions.assertTrue(Files.exists(projectFolder.resolve("schema.yaml")));
+ Assertions.assertTrue(Files.exists(projectFolder.resolve("data.json")));
+
+ api().postText("/ui/model/yaml", E2eResource.text("/models/minimal-todo.yaml"));
+ workspace = new WorkspacePage(page, server().baseUrl()).open();
+ workspace.projectDialog().openLoad();
+ workspace.projectDialog().fillPath(projectFolder.toString());
+ workspace.projectDialog().confirm();
+ assertThat(workspace.messages().root()).containsText("Project loaded.");
+ Assertions.assertTrue(api().get("/api/todos").body().contains("Saved Task"));
+ Assertions.assertTrue(
+ String.valueOf(
+ page.evaluate(
+ "() => localStorage.getItem('thingifier-crud-ui.projectPaths')"))
+ .contains("typed-project"));
+ }
+
+ @Test
+ public void saveProjectStorageChoiceSwitchesActiveWorkspaceStorage() {
+ workspace = new WorkspacePage(page, server().baseUrl()).open();
+ api().postJson("/api/todos", "{\"title\":\"Saved Storage Task\"}");
+ Path sqliteProject = temp.resolve("save-as-sqlite-project");
+ Path jsonProject = temp.resolve("save-as-json-project");
+
+ workspace.projectDialog().openSave();
+ assertThat(workspace.projectDialog().saveStorageOptions()).isVisible();
+ workspace.projectDialog().chooseSqliteProject();
+ workspace.projectDialog().fillPath(sqliteProject.toString());
+ workspace.projectDialog().confirm();
+
+ assertThat(workspace.messages().root()).containsText("Project saved.");
+ assertThat(workspace.topBar().description()).containsText("SQLite File");
+ Assertions.assertTrue(Files.exists(sqliteProject.resolve("data.sqlite")));
+ Assertions.assertFalse(Files.exists(sqliteProject.resolve("data.json")));
+ Assertions.assertTrue(api().get("/api/todos").body().contains("Saved Storage Task"));
+
+ workspace.projectDialog().openSave();
+ workspace.projectDialog().chooseJsonProject();
+ workspace.projectDialog().fillPath(jsonProject.toString());
+ workspace.projectDialog().confirm();
+
+ assertThat(workspace.messages().root()).containsText("Project saved.");
+ assertThat(workspace.topBar().description()).containsText("In Memory");
+ Assertions.assertTrue(Files.exists(jsonProject.resolve("data.json")));
+ Assertions.assertFalse(Files.exists(jsonProject.resolve("data.sqlite")));
+ Assertions.assertTrue(api().get("/api/todos").body().contains("Saved Storage Task"));
+ }
+
+ @Test
+ public void browserFolderProjectSaveAndLoadUseInjectedFolderPicker() {
+ BrowserFolderPickerStub savePicker = new BrowserFolderPickerStub(page);
+ savePicker.install("browser-project", new LinkedHashMap<>());
+ workspace = new WorkspacePage(page, server().baseUrl()).open();
+ api().postJson("/api/todos", "{\"title\":\"Browser Saved Task\"}");
+
+ workspace.projectDialog().openSave();
+ workspace.projectDialog().browserSave();
+ assertThat(workspace.projectDialog().status()).containsText("Browser project saved");
+ Assertions.assertEquals("browser-project", workspace.projectDialog().pathValue());
+ Map savedFiles = savePicker.files();
+ Assertions.assertTrue(savedFiles.containsKey("projectfile.erproj"));
+ Assertions.assertTrue(savedFiles.containsKey("schema.yaml"));
+ Assertions.assertTrue(savedFiles.containsKey("data.json"));
+
+ page.close();
+ page = context.newPage();
+ BrowserFolderPickerStub loadPicker = new BrowserFolderPickerStub(page);
+ loadPicker.install("browser-project", savedFiles);
+ api().postText("/ui/model/yaml", E2eResource.text("/models/minimal-todo.yaml"));
+ workspace = new WorkspacePage(page, server().baseUrl()).open();
+ workspace.projectDialog().openLoad();
+ workspace.projectDialog().browserLoad();
+ assertThat(workspace.messages().root()).containsText("Browser project loaded");
+ Assertions.assertTrue(api().get("/api/todos").body().contains("Browser Saved Task"));
+ }
+
+ @Test
+ public void storageSelectorSwitchesModesAndPreservesData() {
+ workspace = new WorkspacePage(page, server().baseUrl()).open();
+ api().postJson("/api/todos", "{\"title\":\"Stored Task\"}");
+
+ workspace.storage().switchTo("sqlite-memory");
+ assertThat(workspace.messages().root()).containsText("Storage switched.");
+ Assertions.assertTrue(api().get("/api/todos").body().contains("Stored Task"));
+
+ Path database = temp.resolve("workspace.sqlite");
+ workspace.storage().switchToFile(database.toString());
+ assertThat(workspace.messages().root()).containsText("Storage switched.");
+ assertThat(workspace.topBar().description()).containsText("SQLite File");
+ Assertions.assertTrue(api().get("/api/todos").body().contains("Stored Task"));
+ workspace.storage().switchTo("memory");
+ assertThat(workspace.messages().root()).containsText("Storage switched.");
+ }
+
+ @Test
+ public void nativeBrowseReportsHeadlessFallbackWhenRunningHeadless() {
+ Assumptions.assumeTrue(GraphicsEnvironment.isHeadless());
+ workspace = new WorkspacePage(page, server().baseUrl()).open();
+
+ workspace.projectDialog().openSave();
+ workspace.projectDialog().browse();
+ assertThat(workspace.projectDialog().status()).containsText("Native project browsing");
+ }
+
+ @Test
+ public void jsonImportExportRoundTripWorksThroughBrowserControls() {
+ workspace = new WorkspacePage(page, server().baseUrl()).open();
+ api().postJson("/api/todos", "{\"title\":\"Downloaded Task\"}");
+ Path downloadPath = temp.resolve("thingifier-workspace.json");
+
+ com.microsoft.playwright.Download download =
+ page.waitForDownload(() -> page.locator("[data-testid='export-button']").click());
+ download.saveAs(downloadPath);
+
+ api().postText("/ui/model/yaml", E2eResource.text("/models/minimal-todo.yaml"));
+ page.locator("[data-testid='import-file']").setInputFiles(downloadPath);
+ assertThat(workspace.messages().root()).containsText("Workspace imported.");
+ Assertions.assertTrue(api().get("/api/todos").body().contains("Downloaded Task"));
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/RelationshipUiIT.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/RelationshipUiIT.java
new file mode 100644
index 00000000..77ad4545
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/RelationshipUiIT.java
@@ -0,0 +1,61 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e;
+
+import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import uk.co.compendiumdev.thingifier.crudui.e2e.pages.WorkspacePage;
+
+public class RelationshipUiIT extends BrowserTestBase {
+
+ private WorkspacePage workspace;
+
+ @BeforeEach
+ void seedRelationshipWorkspace() {
+ resetToProjectTasks();
+ api().postJson("/api/projects", "{\"title\":\"Smoke Project\"}");
+ api().postJson("/api/todos", "{\"title\":\"Do this\"}");
+ api().postJson("/api/todos", "{\"title\":\"Do that\"}");
+ workspace = new WorkspacePage(page, server().baseUrl()).open();
+ }
+
+ @Test
+ public void relationshipManagerCanConnectCreateAndRemoveRelationshipEdges() {
+ workspace.outline().expandEntity("project");
+ workspace.outline().expandInstance("project", "1");
+ workspace.outline().selectRelationship("project", "1", "tasks");
+ assertThat(workspace.relationships().root()).isVisible();
+ assertThat(workspace.relationships().connectSelect()).isVisible();
+
+ workspace.relationships().connectExisting("1");
+ assertThat(workspace.messages().root()).containsText("todo connected.");
+ assertThat(workspace.grid().row("todo", "1")).containsText("Do this");
+ Assertions.assertTrue(api().get("/api/projects/1/tasks").body().contains("Do this"));
+
+ workspace.relationships().createAndConnect("Do from relationship");
+ assertThat(workspace.messages().root()).containsText("todo created and connected.");
+ assertThat(workspace.grid().row("todo", "3")).containsText("Do from relationship");
+ Assertions.assertTrue(api().get("/api/todos/3").body().contains("Do from relationship"));
+
+ workspace.relationships().removeRow("todo", "1");
+ assertThat(workspace.messages().root()).containsText("todo removed from relationship.");
+ Assertions.assertFalse(api().get("/api/projects/1/tasks").body().contains("Do this"));
+ Assertions.assertTrue(api().get("/api/todos/1").body().contains("Do this"));
+ }
+
+ @Test
+ public void editorRelationshipRemoveDoesNotDeleteTargetInstance() {
+ api().postJson("/api/projects/1/tasks", "{\"id\":\"2\"}");
+ page.reload();
+ workspace.outline().expandEntity("project");
+ workspace.outline().expandInstance("project", "1");
+ workspace.outline().selectRelationship("project", "1", "tasks");
+ workspace.grid().row("todo", "2").click();
+ workspace.editor().removeFromRelationship();
+
+ assertThat(workspace.messages().root()).containsText("todo removed from relationship.");
+ Assertions.assertFalse(api().get("/api/projects/1/tasks").body().contains("Do that"));
+ Assertions.assertTrue(api().get("/api/todos/2").body().contains("Do that"));
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/SchemaApplyUiIT.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/SchemaApplyUiIT.java
new file mode 100644
index 00000000..673c23a5
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/SchemaApplyUiIT.java
@@ -0,0 +1,62 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e;
+
+import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import uk.co.compendiumdev.thingifier.crudui.e2e.components.TestSelectors;
+import uk.co.compendiumdev.thingifier.crudui.e2e.pages.SchemaEditPage;
+
+public class SchemaApplyUiIT extends BrowserTestBase {
+
+ private SchemaEditPage schema;
+
+ @BeforeEach
+ void openSchemaEditorWithData() {
+ resetToProjectTasks();
+ api().postJson("/api/todos", "{\"title\":\"Migrated Task\"}");
+ schema = new SchemaEditPage(page, server().baseUrl()).open();
+ }
+
+ @Test
+ public void applyDialogOpensOnlyOnApplyCancelLeavesWorkspaceAndConfirmMigratesData() {
+ assertThat(schema.upgrade().root()).isHidden();
+ addTodoStatusField();
+
+ assertThat(TestSelectors.byTestId(page, "schema-apply-workspace-button")).isEnabled();
+ schema.upgrade().open();
+ assertThat(schema.upgrade().root()).isVisible();
+ assertThat(schema.upgrade().report()).containsText("Upgrade can be applied");
+ schema.upgrade().cancel();
+ assertThat(schema.upgrade().root()).isHidden();
+ Assertions.assertFalse(api().get("/api/todos/1").body().contains("status"));
+
+ schema.upgrade().open();
+ assertThat(schema.upgrade().report()).containsText("Upgrade can be applied");
+ schema.upgrade().confirm();
+ assertThat(schema.messages().root()).containsText("Schema upgrade applied");
+ Assertions.assertTrue(api().get("/api/todos/1").body().contains("\"status\":\"open\""));
+ }
+
+ @Test
+ public void staleWorkspaceApplyFailureIsReportedByUi() {
+ addTodoStatusField();
+ schema.upgrade().open();
+ assertThat(schema.upgrade().root()).isVisible();
+ api().postText("/ui/model/yaml", E2eResource.text("/models/minimal-todo.yaml"));
+ schema.upgrade().confirm();
+ assertThat(schema.messages().root()).containsText("Request failed with status 409");
+ }
+
+ private void addTodoStatusField() {
+ schema.tree().selectEntity("todo");
+ schema.detail().clickAction("Add Field");
+ schema.detail().fill("Name", "status");
+ schema.detail().select("Type", "string");
+ schema.detail().fill("Default", "open");
+ schema.validate();
+ assertThat(TestSelectors.byTestId(page, "schema-validation"))
+ .containsText("Schema is valid");
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/SchemaEditorUiIT.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/SchemaEditorUiIT.java
new file mode 100644
index 00000000..9ad36c60
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/SchemaEditorUiIT.java
@@ -0,0 +1,121 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e;
+
+import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
+
+import com.microsoft.playwright.Download;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import uk.co.compendiumdev.thingifier.crudui.e2e.components.TestSelectors;
+import uk.co.compendiumdev.thingifier.crudui.e2e.pages.SchemaEditPage;
+
+public class SchemaEditorUiIT extends BrowserTestBase {
+
+ @TempDir Path temp;
+
+ private SchemaEditPage schema;
+
+ @BeforeEach
+ void openSchemaEditor() {
+ resetToProjectTasks();
+ schema = new SchemaEditPage(page, server().baseUrl()).open();
+ }
+
+ @Test
+ public void schemaEditIsSeparateFromWorkspaceAndDiagramControlsWork() {
+ assertThat(TestSelectors.byTestId(page, "schema-page")).isVisible();
+ Assertions.assertEquals(0, page.locator("[data-testid='docs-link']").count());
+ Assertions.assertEquals(0, page.locator("[data-testid='swagger-link']").count());
+ Assertions.assertEquals(0, page.locator("[data-testid='download-openapi-link']").count());
+ assertThat(schema.diagram().key()).containsText("Relationship Key");
+ assertThat(schema.diagram().diagram()).isVisible();
+
+ schema.diagram().zoomIn();
+ assertThat(TestSelectors.byTestId(page, "schema-zoom-reset-button")).containsText("110%");
+ schema.diagram().zoomOut();
+ assertThat(TestSelectors.byTestId(page, "schema-zoom-reset-button")).containsText("100%");
+ schema.diagram().toggleLayout();
+ assertThat(TestSelectors.byTestId(page, "schema-layout-toggle-button"))
+ .containsText("Horizontal Layout");
+ schema.diagram().toggleVisible();
+ assertThat(schema.diagram().content()).isHidden();
+ schema.diagram().toggleVisible();
+ assertThat(schema.diagram().content()).isVisible();
+ }
+
+ @Test
+ public void schemaTreeSupportsEntityFieldValidationAndRelationshipEditing() {
+ schema.tree().addEntity();
+ schema.detail().fill("Name", "note");
+ schema.detail().fill("Plural", "notes");
+ schema.detail().fill("Primary Key", "id");
+ schema.detail().clickAction("Add Field");
+ schema.detail().fill("Name", "id");
+ schema.detail().select("Type", "auto-increment");
+ schema.tree().selectEntity("note");
+ schema.detail().clickAction("Add Field");
+ schema.detail().fill("Name", "body");
+ schema.detail().select("Type", "string");
+ schema.detail().clickAction("Add Validation");
+ assertThat(TestSelectors.byTestId(page, "schema-dirty-status")).isVisible();
+
+ page.locator(
+ "[data-testid='schema-section-relationships'] [data-testid='schema-action-add']")
+ .click();
+ schema.detail().select("From", "project");
+ schema.detail().fill("Name", "notes");
+ schema.detail().select("To", "note");
+ schema.detail().select("Cardinality", "one-to-many");
+ schema.detail().select("Optionality", "optional");
+ schema.validate();
+ assertThat(TestSelectors.byTestId(page, "schema-validation"))
+ .containsText("Schema is valid");
+ }
+
+ @Test
+ public void yamlParseValidateExportsCopyAndDownloadWorkFromSchemaEdit() throws Exception {
+ schema.toggleYamlDraft();
+ assertThat(TestSelectors.byTestId(page, "schema-yaml-section")).isVisible();
+ TestSelectors.byTestId(page, "schema-yaml-input").fill("formatVersion: 1\nentities: [");
+ TestSelectors.byTestId(page, "schema-parse-yaml-button").click();
+ assertThat(schema.messages().root()).isVisible();
+
+ TestSelectors.byTestId(page, "schema-yaml-input")
+ .fill(E2eResource.text("/models/minimal-todo.yaml"));
+ TestSelectors.byTestId(page, "schema-parse-yaml-button").click();
+ assertThat(schema.tree().root()).containsText("todo");
+ schema.validate();
+
+ schema.exports().toggle();
+ assertThat(schema.exports().root()).isVisible();
+ Assertions.assertTrue(
+ schema.exports().canonicalYaml().inputValue().contains("Minimal Todo"));
+ Assertions.assertTrue(schema.exports().mermaid().inputValue().contains("erDiagram"));
+ Assertions.assertTrue(schema.exports().graphviz().inputValue().contains("digraph"));
+ schema.exports().copyYaml();
+ assertThat(schema.messages().root()).containsText("YAML copied");
+
+ Download download = schema.exports().downloadMermaid();
+ Path mermaidFile = temp.resolve(download.suggestedFilename());
+ download.saveAs(mermaidFile);
+ Assertions.assertTrue(Files.readString(mermaidFile).contains("erDiagram"));
+ }
+
+ @Test
+ public void dirtyResetPromptsBeforeDiscardingDraftChanges() {
+ schema.tree().selectModel();
+ schema.detail().fill("Title", "Changed Title");
+ assertThat(TestSelectors.byTestId(page, "schema-dirty-status")).isVisible();
+
+ page.onDialog(dialog -> dialog.accept());
+ TestSelectors.byTestId(page, "schema-reset-button").click();
+ Assertions.assertEquals(
+ Boolean.TRUE,
+ TestSelectors.byTestId(page, "schema-dirty-status")
+ .evaluate("element => element.hidden"));
+ assertThat(schema.topBar().description()).containsText("Project Tasks");
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/WorkspaceUiIT.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/WorkspaceUiIT.java
new file mode 100644
index 00000000..836a57ca
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/WorkspaceUiIT.java
@@ -0,0 +1,136 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e;
+
+import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import uk.co.compendiumdev.thingifier.crudui.e2e.pages.WorkspacePage;
+
+public class WorkspaceUiIT extends BrowserTestBase {
+
+ private WorkspacePage workspace;
+
+ @BeforeEach
+ void openWorkspace() {
+ resetToProjectTasks();
+ workspace = new WorkspacePage(page, server().baseUrl()).open();
+ }
+
+ @Test
+ public void workspaceLoadsDefaultMetadataAndRelationshipOutlineCanExpand() {
+ assertThat(workspace.topBar().title()).containsText("Project Tasks");
+ assertThat(workspace.outline().entity("project")).isVisible();
+ assertThat(workspace.outline().entity("todo")).isVisible();
+
+ api().postJson("/api/projects", "{\"title\":\"Smoke Project\"}");
+ api().postJson("/api/todos", "{\"title\":\"Do this\"}");
+ api().postJson("/api/todos", "{\"title\":\"Do that\"}");
+ api().postJson("/api/projects/1/tasks", "{\"id\":\"1\"}");
+ api().postJson("/api/projects/1/tasks", "{\"id\":\"2\"}");
+ workspace.grid().refresh();
+
+ workspace.outline().expandEntity("project");
+ assertThat(workspace.outline().instance("project", "1")).containsText("Smoke Project");
+ workspace.outline().expandInstance("project", "1");
+ assertThat(workspace.outline().relationship("project", "1", "tasks")).isVisible();
+ workspace.outline().expandRelationship("project", "1", "tasks");
+ assertThat(workspace.outline().relatedInstance("todo", "1")).containsText("Do this");
+ assertThat(workspace.outline().relatedInstance("todo", "2")).containsText("Do that");
+ }
+
+ @Test
+ public void entityCrudSearchRefreshAndDocumentationLinksWorkFromWorkspace() {
+ workspace.outline().selectEntity("todo");
+ assertThat(workspace.grid().title()).containsText("todos");
+ workspace.grid().clickNew();
+ assertThat(workspace.editor().field("id")).isDisabled();
+ assertThat(workspace.editor().field("id")).hasValue("");
+ workspace.editor().fillField("title", "Do this");
+ workspace.editor().save();
+ assertThat(workspace.messages().root()).containsText("todo saved.");
+ assertThat(workspace.grid().row("todo", "1")).containsText("Do this");
+
+ workspace.grid().row("todo", "1").click();
+ workspace.editor().fillField("title", "Do that");
+ workspace.editor().save();
+ assertThat(workspace.grid().row("todo", "1")).containsText("Do that");
+ workspace.grid().globalSearch("Do that");
+ assertThat(workspace.grid().row("todo", "1")).isVisible();
+ Assertions.assertTrue(api().get("/api/todos/1").body().contains("Do that"));
+
+ workspace.grid().row("todo", "1").click();
+ workspace.editor().delete();
+ assertThat(workspace.messages().root()).containsText("todo deleted.");
+ Assertions.assertEquals(404, api().get("/api/todos/1").statusCode());
+
+ workspace.topBar().openApiDocs();
+ page.waitForURL("**/docs");
+ assertThat(page.locator("body")).containsText("Project Tasks API Documentation");
+ page.navigate(server().baseUrl() + "/");
+ workspace.topBar().openSwagger();
+ page.waitForURL("**/swagger");
+ assertThat(page.locator("body")).containsText("Explore");
+ page.navigate(server().baseUrl() + "/");
+ Assertions.assertTrue(
+ workspace.topBar().downloadOpenApi().suggestedFilename().endsWith(".json"));
+ }
+
+ @Test
+ public void booleanFieldsAreSubmittedAsJsonBooleansFromWorkspaceEditor() {
+ api().postText("/ui/model/yaml", E2eResource.text("/models/todo-manager.yaml"));
+ workspace = new WorkspacePage(page, server().baseUrl()).open();
+ List projectPostBodies = new ArrayList<>();
+ page.onRequest(
+ request -> {
+ if ("POST".equals(request.method())
+ && request.url().endsWith("/api/projects")) {
+ projectPostBodies.add(request.postData());
+ }
+ });
+
+ workspace.outline().selectEntity("project");
+ workspace.grid().clickNew();
+ workspace.editor().fillField("title", "Boolean Smoke Project");
+ workspace.editor().save();
+
+ assertThat(workspace.messages().root()).containsText("project saved.");
+ Assertions.assertFalse(projectPostBodies.isEmpty());
+ Assertions.assertTrue(projectPostBodies.get(0).contains("\"completed\":false"));
+ Assertions.assertTrue(projectPostBodies.get(0).contains("\"active\":false"));
+ String savedProject = api().get("/api/projects/1").body();
+ Assertions.assertTrue(
+ savedProject.matches("(?s).*\"completed\"\\s*:\\s*false.*"), savedProject);
+ Assertions.assertTrue(
+ savedProject.matches("(?s).*\"active\"\\s*:\\s*false.*"), savedProject);
+ }
+
+ @Test
+ public void stringFieldsWithoutMaxLengthRenderAsTextareas() {
+ workspace.outline().selectEntity("project");
+ workspace.grid().clickNew();
+ Assertions.assertEquals("textarea", workspace.editor().fieldTagName("title"));
+
+ api().postText("/ui/model/yaml", E2eResource.text("/models/validations.yaml"));
+ workspace = new WorkspacePage(page, server().baseUrl()).open();
+ workspace.outline().selectEntity("item");
+ workspace.grid().clickNew();
+ Assertions.assertEquals("input", workspace.editor().fieldTagName("title"));
+ }
+
+ @Test
+ public void yamlUploadReplacesSchemaAndClearsData() {
+ api().postJson("/api/projects", "{\"title\":\"Smoke Project\"}");
+ page.locator("[data-testid='yaml-file']")
+ .setInputFiles(
+ Path.of("src/test/resources/models/minimal-todo.yaml").toAbsolutePath());
+
+ assertThat(workspace.topBar().title()).containsText("Minimal Todo");
+ assertThat(workspace.outline().entity("todo")).isVisible();
+ Assertions.assertEquals(404, api().get("/api/projects").statusCode());
+ Assertions.assertFalse(api().get("/api/todos").body().contains("Smoke Project"));
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/DataGridComponent.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/DataGridComponent.java
new file mode 100644
index 00000000..bba2b36f
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/DataGridComponent.java
@@ -0,0 +1,41 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e.components;
+
+import com.microsoft.playwright.Locator;
+import com.microsoft.playwright.Page;
+
+public final class DataGridComponent {
+
+ private final Page page;
+
+ public DataGridComponent(final Page page) {
+ this.page = page;
+ }
+
+ public Locator title() {
+ return TestSelectors.byTestId(page, "grid-title");
+ }
+
+ public Locator context() {
+ return TestSelectors.byTestId(page, "grid-context");
+ }
+
+ public Locator row(final String entityName, final String id) {
+ return TestSelectors.byTestId(page, TestSelectors.id("grid-row", entityName, id));
+ }
+
+ public Locator columnFilter(final String entityName, final String fieldName) {
+ return TestSelectors.byTestId(page, TestSelectors.id("grid-filter", entityName, fieldName));
+ }
+
+ public void globalSearch(final String text) {
+ TestSelectors.byTestId(page, "search-input").fill(text);
+ }
+
+ public void clickNew() {
+ TestSelectors.byTestId(page, "new-button").click();
+ }
+
+ public void refresh() {
+ TestSelectors.byTestId(page, "refresh-button").click();
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/DiagramPanelComponent.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/DiagramPanelComponent.java
new file mode 100644
index 00000000..22a0d00c
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/DiagramPanelComponent.java
@@ -0,0 +1,45 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e.components;
+
+import com.microsoft.playwright.Locator;
+import com.microsoft.playwright.Page;
+
+public final class DiagramPanelComponent {
+
+ private final Page page;
+
+ public DiagramPanelComponent(final Page page) {
+ this.page = page;
+ }
+
+ public Locator content() {
+ return TestSelectors.byTestId(page, "schema-diagram-content");
+ }
+
+ public Locator diagram() {
+ return TestSelectors.byTestId(page, "schema-mermaid-diagram");
+ }
+
+ public Locator key() {
+ return TestSelectors.byTestId(page, "schema-diagram-key");
+ }
+
+ public Locator resizer() {
+ return TestSelectors.byTestId(page, "schema-diagram-resizer");
+ }
+
+ public void toggleVisible() {
+ TestSelectors.byTestId(page, "schema-toggle-diagram-button").click();
+ }
+
+ public void zoomIn() {
+ TestSelectors.byTestId(page, "schema-zoom-in-button").click();
+ }
+
+ public void zoomOut() {
+ TestSelectors.byTestId(page, "schema-zoom-out-button").click();
+ }
+
+ public void toggleLayout() {
+ TestSelectors.byTestId(page, "schema-layout-toggle-button").click();
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/EditorPanelComponent.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/EditorPanelComponent.java
new file mode 100644
index 00000000..efdae1c1
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/EditorPanelComponent.java
@@ -0,0 +1,42 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e.components;
+
+import com.microsoft.playwright.Locator;
+import com.microsoft.playwright.Page;
+
+public final class EditorPanelComponent {
+
+ private final Page page;
+
+ public EditorPanelComponent(final Page page) {
+ this.page = page;
+ }
+
+ public Locator root() {
+ return TestSelectors.byTestId(page, "editor-panel");
+ }
+
+ public Locator field(final String fieldName) {
+ return TestSelectors.byTestId(page, TestSelectors.id("field-input", "editor", fieldName));
+ }
+
+ public String fieldTagName(final String fieldName) {
+ return String.valueOf(
+ field(fieldName).evaluate("element => element.tagName.toLowerCase()"));
+ }
+
+ public void fillField(final String fieldName, final String value) {
+ field(fieldName).fill(value);
+ }
+
+ public void save() {
+ TestSelectors.byTestId(page, "editor-save-button").click();
+ }
+
+ public void delete() {
+ TestSelectors.byTestId(page, "editor-delete-button").click();
+ }
+
+ public void removeFromRelationship() {
+ TestSelectors.byTestId(page, "editor-remove-relationship-button").click();
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/MessageBarComponent.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/MessageBarComponent.java
new file mode 100644
index 00000000..719c3587
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/MessageBarComponent.java
@@ -0,0 +1,17 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e.components;
+
+import com.microsoft.playwright.Locator;
+import com.microsoft.playwright.Page;
+
+public final class MessageBarComponent {
+
+ private final Page page;
+
+ public MessageBarComponent(final Page page) {
+ this.page = page;
+ }
+
+ public Locator root() {
+ return TestSelectors.byTestId(page, "message-bar");
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/OutlineTreeComponent.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/OutlineTreeComponent.java
new file mode 100644
index 00000000..df77f4d6
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/OutlineTreeComponent.java
@@ -0,0 +1,61 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e.components;
+
+import com.microsoft.playwright.Locator;
+import com.microsoft.playwright.Page;
+
+public final class OutlineTreeComponent {
+
+ private final Page page;
+
+ public OutlineTreeComponent(final Page page) {
+ this.page = page;
+ }
+
+ public Locator root() {
+ return TestSelectors.byTestId(page, "outline-tree");
+ }
+
+ public Locator entity(final String entityName) {
+ return TestSelectors.byTestId(page, TestSelectors.id("outline-entity", entityName));
+ }
+
+ public Locator instance(final String entityName, final String id) {
+ return TestSelectors.byTestId(page, TestSelectors.id("outline-instance", entityName, id));
+ }
+
+ public Locator relationship(final String entityName, final String sourceId, final String name) {
+ return TestSelectors.byTestId(
+ page, TestSelectors.id("outline-relationship", entityName, sourceId, name));
+ }
+
+ public Locator relatedInstance(final String entityName, final String id) {
+ return TestSelectors.byTestId(
+ page, TestSelectors.id("outline-related-instance", entityName, id));
+ }
+
+ public void expandEntity(final String entityName) {
+ entity(entityName).locator(".tree-caret").click();
+ }
+
+ public void expandInstance(final String entityName, final String id) {
+ instance(entityName, id).locator(".tree-caret").click();
+ }
+
+ public void expandRelationship(
+ final String entityName, final String sourceId, final String relationshipName) {
+ relationship(entityName, sourceId, relationshipName).locator(".tree-caret").click();
+ }
+
+ public void selectEntity(final String entityName) {
+ entity(entityName).click();
+ }
+
+ public void selectInstance(final String entityName, final String id) {
+ instance(entityName, id).click();
+ }
+
+ public void selectRelationship(
+ final String entityName, final String sourceId, final String relationshipName) {
+ relationship(entityName, sourceId, relationshipName).click();
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/ProjectDialogComponent.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/ProjectDialogComponent.java
new file mode 100644
index 00000000..de73b351
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/ProjectDialogComponent.java
@@ -0,0 +1,69 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e.components;
+
+import com.microsoft.playwright.Locator;
+import com.microsoft.playwright.Page;
+
+public final class ProjectDialogComponent {
+
+ private final Page page;
+
+ public ProjectDialogComponent(final Page page) {
+ this.page = page;
+ }
+
+ public Locator root() {
+ return TestSelectors.byTestId(page, "project-dialog");
+ }
+
+ public Locator status() {
+ return TestSelectors.byTestId(page, "project-browser-status");
+ }
+
+ public Locator saveStorageOptions() {
+ return TestSelectors.byTestId(page, "project-save-storage-options");
+ }
+
+ public void openSave() {
+ TestSelectors.byTestId(page, "save-project-button").click();
+ }
+
+ public void openLoad() {
+ TestSelectors.byTestId(page, "load-project-button").click();
+ }
+
+ public void fillPath(final String path) {
+ TestSelectors.byTestId(page, "project-path-input").fill(path);
+ }
+
+ public String pathValue() {
+ return TestSelectors.byTestId(page, "project-path-input").inputValue();
+ }
+
+ public void validatePath() {
+ TestSelectors.byTestId(page, "project-validate-button").click();
+ }
+
+ public void browse() {
+ TestSelectors.byTestId(page, "project-browse-button").click();
+ }
+
+ public void chooseJsonProject() {
+ TestSelectors.byTestId(page, "project-save-storage-json").check();
+ }
+
+ public void chooseSqliteProject() {
+ TestSelectors.byTestId(page, "project-save-storage-sqlite").check();
+ }
+
+ public void confirm() {
+ TestSelectors.byTestId(page, "project-dialog-confirm").click();
+ }
+
+ public void browserSave() {
+ TestSelectors.byTestId(page, "project-browser-save-button").click();
+ }
+
+ public void browserLoad() {
+ TestSelectors.byTestId(page, "project-browser-load-button").click();
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/RelationshipManagerComponent.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/RelationshipManagerComponent.java
new file mode 100644
index 00000000..369b4ae1
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/RelationshipManagerComponent.java
@@ -0,0 +1,41 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e.components;
+
+import com.microsoft.playwright.Locator;
+import com.microsoft.playwright.Page;
+
+public final class RelationshipManagerComponent {
+
+ private final Page page;
+
+ public RelationshipManagerComponent(final Page page) {
+ this.page = page;
+ }
+
+ public Locator root() {
+ return TestSelectors.byTestId(page, "relationship-manager");
+ }
+
+ public Locator connectSelect() {
+ return TestSelectors.byTestId(page, "relationship-connect-select");
+ }
+
+ public void connectExisting(final String id) {
+ connectSelect().selectOption(id);
+ TestSelectors.byTestId(page, "relationship-connect-submit").click();
+ }
+
+ public Locator createField(final String fieldName) {
+ return TestSelectors.byTestId(
+ page, TestSelectors.id("field-input", "relationship-create", fieldName));
+ }
+
+ public void createAndConnect(final String title) {
+ createField("title").fill(title);
+ TestSelectors.byTestId(page, "relationship-create-submit").click();
+ }
+
+ public void removeRow(final String entityName, final String id) {
+ TestSelectors.byTestId(page, TestSelectors.id("relationship-row-remove", entityName, id))
+ .click();
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/SchemaDetailComponent.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/SchemaDetailComponent.java
new file mode 100644
index 00000000..1d30b30e
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/SchemaDetailComponent.java
@@ -0,0 +1,39 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e.components;
+
+import com.microsoft.playwright.Locator;
+import com.microsoft.playwright.Page;
+
+public final class SchemaDetailComponent {
+
+ private final Page page;
+
+ public SchemaDetailComponent(final Page page) {
+ this.page = page;
+ }
+
+ public Locator title() {
+ return TestSelectors.byTestId(page, "schema-detail-title");
+ }
+
+ public Locator input(final String label) {
+ return page.locator("[data-testid='" + TestSelectors.id("schema-input", label) + "']")
+ .first();
+ }
+
+ public Locator action(final String label) {
+ return page.locator("[data-testid='" + TestSelectors.id("schema-action", label) + "']")
+ .first();
+ }
+
+ public void fill(final String label, final String value) {
+ input(label).fill(value);
+ }
+
+ public void select(final String label, final String value) {
+ input(label).selectOption(value);
+ }
+
+ public void clickAction(final String label) {
+ action(label).click();
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/SchemaExportsComponent.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/SchemaExportsComponent.java
new file mode 100644
index 00000000..dc176ab0
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/SchemaExportsComponent.java
@@ -0,0 +1,43 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e.components;
+
+import com.microsoft.playwright.Download;
+import com.microsoft.playwright.Locator;
+import com.microsoft.playwright.Page;
+
+public final class SchemaExportsComponent {
+
+ private final Page page;
+
+ public SchemaExportsComponent(final Page page) {
+ this.page = page;
+ }
+
+ public Locator root() {
+ return TestSelectors.byTestId(page, "schema-exports-section");
+ }
+
+ public Locator canonicalYaml() {
+ return TestSelectors.byTestId(page, "schema-canonical-yaml");
+ }
+
+ public Locator mermaid() {
+ return TestSelectors.byTestId(page, "schema-mermaid-output");
+ }
+
+ public Locator graphviz() {
+ return TestSelectors.byTestId(page, "schema-graphviz-output");
+ }
+
+ public void toggle() {
+ TestSelectors.byTestId(page, "schema-toggle-exports-button").click();
+ }
+
+ public void copyYaml() {
+ TestSelectors.byTestId(page, "schema-copy-yaml").click();
+ }
+
+ public Download downloadMermaid() {
+ return page.waitForDownload(
+ () -> TestSelectors.byTestId(page, "schema-download-mermaid").click());
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/SchemaTreeComponent.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/SchemaTreeComponent.java
new file mode 100644
index 00000000..5fc9c88d
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/SchemaTreeComponent.java
@@ -0,0 +1,46 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e.components;
+
+import com.microsoft.playwright.Locator;
+import com.microsoft.playwright.Page;
+
+public final class SchemaTreeComponent {
+
+ private final Page page;
+
+ public SchemaTreeComponent(final Page page) {
+ this.page = page;
+ }
+
+ public Locator root() {
+ return TestSelectors.byTestId(page, "schema-tree");
+ }
+
+ public void addEntity() {
+ TestSelectors.byTestId(page, "schema-add-entity-button").click();
+ }
+
+ public void selectModel() {
+ page.locator("[data-testid^='schema-tree-model']").click();
+ }
+
+ public void selectEntity(final String label) {
+ page.locator("[data-testid^='schema-tree-entity']")
+ .filter(new Locator.FilterOptions().setHasText(label))
+ .first()
+ .click();
+ }
+
+ public void selectField(final String label) {
+ page.locator("[data-testid^='schema-tree-field']")
+ .filter(new Locator.FilterOptions().setHasText(label))
+ .first()
+ .click();
+ }
+
+ public void selectRelationship(final String label) {
+ page.locator("[data-testid^='schema-tree-relationship']")
+ .filter(new Locator.FilterOptions().setHasText(label))
+ .first()
+ .click();
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/SchemaUpgradeDialogComponent.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/SchemaUpgradeDialogComponent.java
new file mode 100644
index 00000000..47871bc3
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/SchemaUpgradeDialogComponent.java
@@ -0,0 +1,37 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e.components;
+
+import com.microsoft.playwright.Locator;
+import com.microsoft.playwright.Page;
+
+public final class SchemaUpgradeDialogComponent {
+
+ private final Page page;
+
+ public SchemaUpgradeDialogComponent(final Page page) {
+ this.page = page;
+ }
+
+ public Locator root() {
+ return TestSelectors.byTestId(page, "schema-upgrade-dialog");
+ }
+
+ public Locator report() {
+ return TestSelectors.byTestId(page, "schema-upgrade-report");
+ }
+
+ public void open() {
+ TestSelectors.byTestId(page, "schema-apply-workspace-button").click();
+ }
+
+ public void preview() {
+ TestSelectors.byTestId(page, "schema-upgrade-preview-button").click();
+ }
+
+ public void confirm() {
+ TestSelectors.byTestId(page, "schema-upgrade-confirm-button").click();
+ }
+
+ public void cancel() {
+ TestSelectors.byTestId(page, "schema-upgrade-cancel-button").click();
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/StorageControlsComponent.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/StorageControlsComponent.java
new file mode 100644
index 00000000..7f4ba730
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/StorageControlsComponent.java
@@ -0,0 +1,32 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e.components;
+
+import com.microsoft.playwright.Locator;
+import com.microsoft.playwright.Page;
+
+public final class StorageControlsComponent {
+
+ private final Page page;
+
+ public StorageControlsComponent(final Page page) {
+ this.page = page;
+ }
+
+ public Locator modeSelect() {
+ return TestSelectors.byTestId(page, "storage-mode-select");
+ }
+
+ public Locator sqliteFileInput() {
+ return TestSelectors.byTestId(page, "storage-file-input");
+ }
+
+ public void switchTo(final String mode) {
+ modeSelect().selectOption(mode);
+ TestSelectors.byTestId(page, "switch-storage-button").click();
+ }
+
+ public void switchToFile(final String path) {
+ modeSelect().selectOption("sqlite-file");
+ sqliteFileInput().fill(path);
+ TestSelectors.byTestId(page, "switch-storage-button").click();
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/TestSelectors.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/TestSelectors.java
new file mode 100644
index 00000000..cf6b21ce
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/TestSelectors.java
@@ -0,0 +1,25 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e.components;
+
+import com.microsoft.playwright.Locator;
+import com.microsoft.playwright.Page;
+
+public final class TestSelectors {
+
+ private TestSelectors() {}
+
+ public static Locator byTestId(final Page page, final String testId) {
+ return page.locator("[data-testid='" + testId + "']");
+ }
+
+ public static String idPart(final String value) {
+ return value.toLowerCase().replaceAll("[^a-z0-9]+", "-").replaceAll("^-+|-+$", "");
+ }
+
+ public static String id(final String prefix, final String... parts) {
+ StringBuilder builder = new StringBuilder(prefix);
+ for (String part : parts) {
+ builder.append('-').append(idPart(part));
+ }
+ return builder.toString();
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/TopBarComponent.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/TopBarComponent.java
new file mode 100644
index 00000000..903c1bf7
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/components/TopBarComponent.java
@@ -0,0 +1,43 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e.components;
+
+import com.microsoft.playwright.Download;
+import com.microsoft.playwright.Locator;
+import com.microsoft.playwright.Page;
+
+public final class TopBarComponent {
+
+ private final Page page;
+
+ public TopBarComponent(final Page page) {
+ this.page = page;
+ }
+
+ public Locator title() {
+ return TestSelectors.byTestId(page, "model-title");
+ }
+
+ public Locator description() {
+ return TestSelectors.byTestId(page, "model-description");
+ }
+
+ public void openWorkspace() {
+ TestSelectors.byTestId(page, "schema-workspace-link").click();
+ }
+
+ public void openSchemaEdit() {
+ TestSelectors.byTestId(page, "schema-link").click();
+ }
+
+ public void openApiDocs() {
+ TestSelectors.byTestId(page, "docs-link").click();
+ }
+
+ public void openSwagger() {
+ TestSelectors.byTestId(page, "swagger-link").click();
+ }
+
+ public Download downloadOpenApi() {
+ return page.waitForDownload(
+ () -> TestSelectors.byTestId(page, "download-openapi-link").click());
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/pages/SchemaEditPage.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/pages/SchemaEditPage.java
new file mode 100644
index 00000000..8e027bd2
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/pages/SchemaEditPage.java
@@ -0,0 +1,79 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e.pages;
+
+import com.microsoft.playwright.Page;
+import uk.co.compendiumdev.thingifier.crudui.e2e.components.DiagramPanelComponent;
+import uk.co.compendiumdev.thingifier.crudui.e2e.components.MessageBarComponent;
+import uk.co.compendiumdev.thingifier.crudui.e2e.components.SchemaDetailComponent;
+import uk.co.compendiumdev.thingifier.crudui.e2e.components.SchemaExportsComponent;
+import uk.co.compendiumdev.thingifier.crudui.e2e.components.SchemaTreeComponent;
+import uk.co.compendiumdev.thingifier.crudui.e2e.components.SchemaUpgradeDialogComponent;
+import uk.co.compendiumdev.thingifier.crudui.e2e.components.TestSelectors;
+import uk.co.compendiumdev.thingifier.crudui.e2e.components.TopBarComponent;
+
+public final class SchemaEditPage {
+
+ private final Page page;
+ private final String baseUrl;
+ private final TopBarComponent topBar;
+ private final SchemaTreeComponent tree;
+ private final SchemaDetailComponent detail;
+ private final DiagramPanelComponent diagram;
+ private final SchemaExportsComponent exports;
+ private final SchemaUpgradeDialogComponent upgrade;
+ private final MessageBarComponent messages;
+
+ public SchemaEditPage(final Page page, final String baseUrl) {
+ this.page = page;
+ this.baseUrl = baseUrl;
+ this.topBar = new TopBarComponent(page);
+ this.tree = new SchemaTreeComponent(page);
+ this.detail = new SchemaDetailComponent(page);
+ this.diagram = new DiagramPanelComponent(page);
+ this.exports = new SchemaExportsComponent(page);
+ this.upgrade = new SchemaUpgradeDialogComponent(page);
+ this.messages = new MessageBarComponent(page);
+ }
+
+ public SchemaEditPage open() {
+ page.navigate(baseUrl + "/schema");
+ TestSelectors.byTestId(page, "schema-page").waitFor();
+ TestSelectors.byTestId(page, "schema-tree").waitFor();
+ return this;
+ }
+
+ public TopBarComponent topBar() {
+ return topBar;
+ }
+
+ public SchemaTreeComponent tree() {
+ return tree;
+ }
+
+ public SchemaDetailComponent detail() {
+ return detail;
+ }
+
+ public DiagramPanelComponent diagram() {
+ return diagram;
+ }
+
+ public SchemaExportsComponent exports() {
+ return exports;
+ }
+
+ public SchemaUpgradeDialogComponent upgrade() {
+ return upgrade;
+ }
+
+ public MessageBarComponent messages() {
+ return messages;
+ }
+
+ public void toggleYamlDraft() {
+ TestSelectors.byTestId(page, "schema-toggle-yaml-button").click();
+ }
+
+ public void validate() {
+ TestSelectors.byTestId(page, "schema-validate-button").click();
+ }
+}
diff --git a/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/pages/WorkspacePage.java b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/pages/WorkspacePage.java
new file mode 100644
index 00000000..c91129f2
--- /dev/null
+++ b/thingifier-crud-ui/src/test/java/uk/co/compendiumdev/thingifier/crudui/e2e/pages/WorkspacePage.java
@@ -0,0 +1,78 @@
+package uk.co.compendiumdev.thingifier.crudui.e2e.pages;
+
+import com.microsoft.playwright.Page;
+import uk.co.compendiumdev.thingifier.crudui.e2e.components.DataGridComponent;
+import uk.co.compendiumdev.thingifier.crudui.e2e.components.EditorPanelComponent;
+import uk.co.compendiumdev.thingifier.crudui.e2e.components.MessageBarComponent;
+import uk.co.compendiumdev.thingifier.crudui.e2e.components.OutlineTreeComponent;
+import uk.co.compendiumdev.thingifier.crudui.e2e.components.ProjectDialogComponent;
+import uk.co.compendiumdev.thingifier.crudui.e2e.components.RelationshipManagerComponent;
+import uk.co.compendiumdev.thingifier.crudui.e2e.components.StorageControlsComponent;
+import uk.co.compendiumdev.thingifier.crudui.e2e.components.TestSelectors;
+import uk.co.compendiumdev.thingifier.crudui.e2e.components.TopBarComponent;
+
+public final class WorkspacePage {
+
+ private final Page page;
+ private final String baseUrl;
+ private final TopBarComponent topBar;
+ private final OutlineTreeComponent outline;
+ private final DataGridComponent grid;
+ private final EditorPanelComponent editor;
+ private final RelationshipManagerComponent relationships;
+ private final ProjectDialogComponent projectDialog;
+ private final StorageControlsComponent storage;
+ private final MessageBarComponent messages;
+
+ public WorkspacePage(final Page page, final String baseUrl) {
+ this.page = page;
+ this.baseUrl = baseUrl;
+ this.topBar = new TopBarComponent(page);
+ this.outline = new OutlineTreeComponent(page);
+ this.grid = new DataGridComponent(page);
+ this.editor = new EditorPanelComponent(page);
+ this.relationships = new RelationshipManagerComponent(page);
+ this.projectDialog = new ProjectDialogComponent(page);
+ this.storage = new StorageControlsComponent(page);
+ this.messages = new MessageBarComponent(page);
+ }
+
+ public WorkspacePage open() {
+ page.navigate(baseUrl + "/");
+ TestSelectors.byTestId(page, "workspace-page").waitFor();
+ TestSelectors.byTestId(page, "outline-tree").waitFor();
+ return this;
+ }
+
+ public TopBarComponent topBar() {
+ return topBar;
+ }
+
+ public OutlineTreeComponent outline() {
+ return outline;
+ }
+
+ public DataGridComponent grid() {
+ return grid;
+ }
+
+ public EditorPanelComponent editor() {
+ return editor;
+ }
+
+ public RelationshipManagerComponent relationships() {
+ return relationships;
+ }
+
+ public ProjectDialogComponent projectDialog() {
+ return projectDialog;
+ }
+
+ public StorageControlsComponent storage() {
+ return storage;
+ }
+
+ public MessageBarComponent messages() {
+ return messages;
+ }
+}
diff --git a/thingifier-crud-ui/src/test/resources/models/todo-manager.yaml b/thingifier-crud-ui/src/test/resources/models/todo-manager.yaml
new file mode 100644
index 00000000..ec669052
--- /dev/null
+++ b/thingifier-crud-ui/src/test/resources/models/todo-manager.yaml
@@ -0,0 +1,83 @@
+formatVersion: 1
+model:
+ title: Todo Manager
+ description: A Simple todo manager with categories and projects.
+entities:
+ todo:
+ plural: todos
+ maxInstances: -1
+ primaryKey: id
+ fields:
+ id:
+ type: auto-increment
+ title:
+ type: string
+ required: true
+ validations:
+ - notEmpty
+ doneStatus:
+ type: boolean
+ default: "false"
+ description:
+ type: string
+ project:
+ plural: projects
+ maxInstances: -1
+ primaryKey: id
+ fields:
+ id:
+ type: auto-increment
+ title:
+ type: string
+ completed:
+ type: boolean
+ default: "false"
+ active:
+ type: boolean
+ default: "false"
+ description:
+ type: string
+ category:
+ plural: categories
+ maxInstances: -1
+ primaryKey: id
+ fields:
+ id:
+ type: auto-increment
+ title:
+ type: string
+ required: true
+ validations:
+ - notEmpty
+ description:
+ type: string
+relationships:
+ - from: project
+ name: tasks
+ to: todo
+ cardinality: one-to-many
+ optionality: optional
+ reverse:
+ name: tasksof
+ cardinality: one-to-many
+ optionality: optional
+ - from: project
+ name: categories
+ to: category
+ cardinality: one-to-many
+ optionality: optional
+ - from: category
+ name: todos
+ to: todo
+ cardinality: one-to-many
+ optionality: optional
+ - from: category
+ name: projects
+ to: project
+ cardinality: one-to-many
+ optionality: optional
+ - from: todo
+ name: categories
+ to: category
+ cardinality: one-to-many
+ optionality: optional
diff --git a/thingifier-yaml/src/main/java/uk/co/compendiumdev/thingifier/yaml/ThingifierProjectManifest.java b/thingifier-yaml/src/main/java/uk/co/compendiumdev/thingifier/yaml/ThingifierProjectManifest.java
index 08f75d6e..8729052c 100644
--- a/thingifier-yaml/src/main/java/uk/co/compendiumdev/thingifier/yaml/ThingifierProjectManifest.java
+++ b/thingifier-yaml/src/main/java/uk/co/compendiumdev/thingifier/yaml/ThingifierProjectManifest.java
@@ -8,12 +8,18 @@ public final class ThingifierProjectManifest {
public static final String DEFAULT_MANIFEST_FILE = "projectfile.erproj";
public static final String DEFAULT_SCHEMA_FILE = "schema.yaml";
public static final String DEFAULT_DATA_FILE = "data.json";
+ public static final String DEFAULT_SQLITE_FILE = "data.sqlite";
+ public static final String STORAGE_MEMORY = "memory";
+ public static final String STORAGE_SQLITE_MEMORY = "sqlite-memory";
+ public static final String STORAGE_SQLITE_FILE = "sqlite-file";
private final int formatVersion;
private final String title;
private final String description;
private final String schemaFile;
private final String dataFile;
+ private final String storageMode;
+ private final String sqliteFile;
public ThingifierProjectManifest(
final int formatVersion,
@@ -21,11 +27,30 @@ public ThingifierProjectManifest(
final String description,
final String schemaFile,
final String dataFile) {
+ this(formatVersion, title, description, schemaFile, dataFile, STORAGE_MEMORY, "");
+ }
+
+ public ThingifierProjectManifest(
+ final int formatVersion,
+ final String title,
+ final String description,
+ final String schemaFile,
+ final String dataFile,
+ final String storageMode,
+ final String sqliteFile) {
this.formatVersion = formatVersion;
this.title = nullToEmpty(title);
this.description = nullToEmpty(description);
this.schemaFile = validatedRelativeFile(schemaFile, "schemaFile");
- this.dataFile = validatedRelativeFile(dataFile, "dataFile");
+ this.storageMode = resolvedStorageMode(storageMode, dataFile);
+ if (isSqliteFileStorage()) {
+ String sqliteDataFile = firstPresent(sqliteFile, dataFile);
+ this.sqliteFile = validatedRelativeFile(sqliteDataFile, "storage.sqliteFile");
+ this.dataFile = optionalRelativeFile(dataFile, "dataFile");
+ } else {
+ this.sqliteFile = "";
+ this.dataFile = validatedRelativeFile(dataFile, "dataFile");
+ }
if (formatVersion != SUPPORTED_FORMAT_VERSION) {
throw new ThingifierYamlException("Unsupported project formatVersion " + formatVersion);
}
@@ -41,6 +66,23 @@ public static ThingifierProjectManifest defaultFor(
DEFAULT_DATA_FILE);
}
+ public static ThingifierProjectManifest sqliteFileBackedFor(
+ final String title, final String description) {
+ return sqliteFileBackedFor(title, description, DEFAULT_SQLITE_FILE);
+ }
+
+ public static ThingifierProjectManifest sqliteFileBackedFor(
+ final String title, final String description, final String sqliteFile) {
+ return new ThingifierProjectManifest(
+ SUPPORTED_FORMAT_VERSION,
+ title,
+ description,
+ DEFAULT_SCHEMA_FILE,
+ sqliteFile,
+ STORAGE_SQLITE_FILE,
+ sqliteFile);
+ }
+
public int formatVersion() {
return formatVersion;
}
@@ -61,6 +103,23 @@ public String dataFile() {
return dataFile;
}
+ public String storageMode() {
+ return storageMode;
+ }
+
+ public String sqliteFile() {
+ return sqliteFile;
+ }
+
+ public boolean isSqliteFileStorage() {
+ return STORAGE_SQLITE_FILE.equals(storageMode);
+ }
+
+ public boolean hasStorageBlockEquivalent() {
+ return !STORAGE_MEMORY.equals(storageMode)
+ && !(isSqliteFileStorage() && sqliteFile.equals(dataFile));
+ }
+
private String validatedRelativeFile(final String value, final String fieldName) {
String text = nullToEmpty(value).trim();
if (text.isEmpty()) {
@@ -85,6 +144,51 @@ private String validatedRelativeFile(final String value, final String fieldName)
return normalized;
}
+ private String optionalRelativeFile(final String value, final String fieldName) {
+ String text = nullToEmpty(value).trim();
+ if (text.isEmpty()) {
+ return "";
+ }
+ return validatedRelativeFile(text, fieldName);
+ }
+
+ private String validatedStorageMode(final String value) {
+ String text = nullToEmpty(value).trim();
+ if (text.isEmpty()) {
+ return STORAGE_MEMORY;
+ }
+ String normalized = text.toLowerCase().replace("_", "-");
+ if (STORAGE_MEMORY.equals(normalized)
+ || STORAGE_SQLITE_MEMORY.equals(normalized)
+ || STORAGE_SQLITE_FILE.equals(normalized)) {
+ return normalized;
+ }
+ throw new ThingifierYamlException("Unsupported project storage mode " + value);
+ }
+
+ private String resolvedStorageMode(final String storageMode, final String dataFile) {
+ String validated = validatedStorageMode(storageMode);
+ if (STORAGE_MEMORY.equals(validated) && looksLikeSqliteFile(dataFile)) {
+ return STORAGE_SQLITE_FILE;
+ }
+ return validated;
+ }
+
+ private boolean looksLikeSqliteFile(final String fileName) {
+ String normalized = nullToEmpty(fileName).trim().toLowerCase();
+ return normalized.endsWith(".sqlite")
+ || normalized.endsWith(".sqlite3")
+ || normalized.endsWith(".db");
+ }
+
+ private String firstPresent(final String first, final String second) {
+ String firstText = nullToEmpty(first).trim();
+ if (!firstText.isEmpty()) {
+ return firstText;
+ }
+ return nullToEmpty(second).trim();
+ }
+
private String nullToEmpty(final String value) {
return value == null ? "" : value;
}
diff --git a/thingifier-yaml/src/main/java/uk/co/compendiumdev/thingifier/yaml/ThingifierProjectManifestYaml.java b/thingifier-yaml/src/main/java/uk/co/compendiumdev/thingifier/yaml/ThingifierProjectManifestYaml.java
index eba4baab..2233422b 100644
--- a/thingifier-yaml/src/main/java/uk/co/compendiumdev/thingifier/yaml/ThingifierProjectManifestYaml.java
+++ b/thingifier-yaml/src/main/java/uk/co/compendiumdev/thingifier/yaml/ThingifierProjectManifestYaml.java
@@ -44,7 +44,17 @@ public String export(final ThingifierProjectManifest manifest) {
project.put("description", manifest.description());
root.put("project", project);
root.put("schemaFile", manifest.schemaFile());
- root.put("dataFile", manifest.dataFile());
+ if (!manifest.dataFile().isEmpty()) {
+ root.put("dataFile", manifest.dataFile());
+ }
+ if (manifest.hasStorageBlockEquivalent()) {
+ Map storage = new LinkedHashMap<>();
+ storage.put("mode", manifest.storageMode());
+ if (manifest.isSqliteFileStorage()) {
+ storage.put("sqliteFile", manifest.sqliteFile());
+ }
+ root.put("storage", storage);
+ }
return dumper().dump(root);
}
@@ -54,12 +64,15 @@ private ThingifierProjectManifest fromObject(final Object parsed) {
}
Map root = (Map) parsed;
Map project = mapValue(root.get("project"));
+ Map storage = mapValue(root.get("storage"));
return new ThingifierProjectManifest(
intValue(root.get("formatVersion")),
stringValue(project.get("title")),
stringValue(project.get("description")),
stringValue(root.get("schemaFile")),
- stringValue(root.get("dataFile")));
+ stringValue(root.get("dataFile")),
+ stringValue(storage.get("mode")),
+ stringValue(storage.get("sqliteFile")));
}
private int intValue(final Object value) {
diff --git a/thingifier-yaml/src/main/java/uk/co/compendiumdev/thingifier/yaml/ThingifierYamlLoader.java b/thingifier-yaml/src/main/java/uk/co/compendiumdev/thingifier/yaml/ThingifierYamlLoader.java
index 9ef0608d..cbf37cfc 100644
--- a/thingifier-yaml/src/main/java/uk/co/compendiumdev/thingifier/yaml/ThingifierYamlLoader.java
+++ b/thingifier-yaml/src/main/java/uk/co/compendiumdev/thingifier/yaml/ThingifierYamlLoader.java
@@ -12,6 +12,7 @@
import uk.co.compendiumdev.thingifier.application.schema.definition.SchemaDefinitionValidationReport;
import uk.co.compendiumdev.thingifier.application.schema.definition.ThingifierModelAssembler;
import uk.co.compendiumdev.thingifier.application.schema.definition.ThingifierModelDefinition;
+import uk.co.compendiumdev.thingifier.core.repository.ThingStoreProvider;
import uk.co.compendiumdev.thingifier.yaml.internal.YamlThingifierDocument;
import uk.co.compendiumdev.thingifier.yaml.internal.YamlThingifierDocumentMapper;
@@ -43,20 +44,40 @@ public Thingifier loadThingifier(final Path path) throws IOException {
return assemble(loadDefinition(path));
}
+ public Thingifier loadThingifier(final Path path, final ThingStoreProvider storeProvider)
+ throws IOException {
+ return assemble(loadDefinition(path), storeProvider);
+ }
+
public Thingifier loadThingifier(final InputStream input) {
return assemble(loadDefinition(input));
}
+ public Thingifier loadThingifier(
+ final InputStream input, final ThingStoreProvider storeProvider) {
+ return assemble(loadDefinition(input), storeProvider);
+ }
+
public Thingifier loadThingifier(final String yamlText) {
return assemble(loadDefinition(yamlText));
}
+ public Thingifier loadThingifier(
+ final String yamlText, final ThingStoreProvider storeProvider) {
+ return assemble(loadDefinition(yamlText), storeProvider);
+ }
+
private Thingifier assemble(final ThingifierModelDefinition definition) {
+ return assemble(definition, null);
+ }
+
+ private Thingifier assemble(
+ final ThingifierModelDefinition definition, final ThingStoreProvider storeProvider) {
final SchemaDefinitionValidationReport report = assembler.validate(definition);
if (!report.isValid()) {
throw new ThingifierYamlException(report.combinedMessages());
}
- return assembler.assemble(definition);
+ return assembler.assemble(definition, storeProvider);
}
private YamlThingifierDocument loadDocument(final InputStream input) {
diff --git a/thingifier-yaml/src/test/java/uk/co/compendiumdev/thingifier/yaml/ThingifierProjectManifestYamlTest.java b/thingifier-yaml/src/test/java/uk/co/compendiumdev/thingifier/yaml/ThingifierProjectManifestYamlTest.java
index 4400c872..97e0bccd 100644
--- a/thingifier-yaml/src/test/java/uk/co/compendiumdev/thingifier/yaml/ThingifierProjectManifestYamlTest.java
+++ b/thingifier-yaml/src/test/java/uk/co/compendiumdev/thingifier/yaml/ThingifierProjectManifestYamlTest.java
@@ -33,6 +33,61 @@ void missingSchemaOrDataFileIsRejected() {
() -> yaml.load("formatVersion: 1\ndataFile: data.json\n"));
}
+ @Test
+ void sqliteFileBackedManifestRoundTripsThroughYamlWithDataFile() {
+ ThingifierProjectManifest manifest =
+ ThingifierProjectManifest.sqliteFileBackedFor(
+ "SQLite Project", "Project data lives in a DB file");
+ ThingifierProjectManifestYaml yaml = new ThingifierProjectManifestYaml();
+
+ String text = yaml.export(manifest);
+ ThingifierProjectManifest loaded = yaml.load(text);
+
+ Assertions.assertTrue(text.contains("dataFile: data.sqlite"));
+ Assertions.assertFalse(text.contains("storage:"));
+ Assertions.assertEquals("sqlite-file", loaded.storageMode());
+ Assertions.assertEquals("data.sqlite", loaded.sqliteFile());
+ Assertions.assertEquals("data.sqlite", loaded.dataFile());
+ }
+
+ @Test
+ void sqliteDataFileWithoutStorageBlockIsDetectedAsSqliteFileStorage() {
+ ThingifierProjectManifest loaded =
+ new ThingifierProjectManifestYaml()
+ .load(
+ "formatVersion: 1\n"
+ + "schemaFile: schema.yaml\n"
+ + "dataFile: todomanager.sqlite\n");
+
+ Assertions.assertEquals("sqlite-file", loaded.storageMode());
+ Assertions.assertEquals("todomanager.sqlite", loaded.sqliteFile());
+ Assertions.assertEquals("todomanager.sqlite", loaded.dataFile());
+ }
+
+ @Test
+ void sqliteFileBackedManifestRejectsEscapingSqliteFile() {
+ ThingifierProjectManifestYaml yaml = new ThingifierProjectManifestYaml();
+
+ Assertions.assertThrows(
+ ThingifierYamlException.class,
+ () ->
+ yaml.load(
+ "formatVersion: 1\n"
+ + "schemaFile: schema.yaml\n"
+ + "storage:\n"
+ + " mode: sqlite-file\n"
+ + " sqliteFile: ../data.sqlite\n"));
+ Assertions.assertThrows(
+ ThingifierYamlException.class,
+ () ->
+ yaml.load(
+ "formatVersion: 1\n"
+ + "schemaFile: schema.yaml\n"
+ + "storage:\n"
+ + " mode: sqlite-file\n"
+ + " sqliteFile: C:\\\\data.sqlite\n"));
+ }
+
@Test
void absoluteAndEscapingPathsAreRejected() {
ThingifierProjectManifestYaml yaml = new ThingifierProjectManifestYaml();
diff --git a/thingifier-yaml/src/test/java/uk/co/compendiumdev/thingifier/yaml/ThingifierYamlLoaderTest.java b/thingifier-yaml/src/test/java/uk/co/compendiumdev/thingifier/yaml/ThingifierYamlLoaderTest.java
index 88e8cd20..7e1f5a45 100644
--- a/thingifier-yaml/src/test/java/uk/co/compendiumdev/thingifier/yaml/ThingifierYamlLoaderTest.java
+++ b/thingifier-yaml/src/test/java/uk/co/compendiumdev/thingifier/yaml/ThingifierYamlLoaderTest.java
@@ -20,8 +20,10 @@
import uk.co.compendiumdev.thingifier.application.schema.definition.SchemaDefinitionValidationReport;
import uk.co.compendiumdev.thingifier.application.schema.definition.ThingifierModelAssembler;
import uk.co.compendiumdev.thingifier.application.schema.definition.ThingifierModelDefinition;
+import uk.co.compendiumdev.thingifier.core.EntityRelModel;
import uk.co.compendiumdev.thingifier.core.domain.definitions.EntityDefinition;
import uk.co.compendiumdev.thingifier.core.query.QueryFilterParams;
+import uk.co.compendiumdev.thingifier.core.repository.sqlite.SqliteThingStoreProvider;
class ThingifierYamlLoaderTest {
@@ -59,6 +61,18 @@ void loaderBuildsThingifierFromPath() throws Exception {
"id", thingifier.getDefinitionNamed("todo").getPrimaryKeyField().getName());
}
+ @Test
+ void loaderBuildsThingifierWithSuppliedStoreProvider() {
+ try (SqliteThingStoreProvider provider = SqliteThingStoreProvider.inMemory()) {
+ Thingifier thingifier =
+ new ThingifierYamlLoader()
+ .loadThingifier(resource("minimal-todo.yaml"), provider);
+
+ Assertions.assertNotNull(thingifier.getStore(EntityRelModel.DEFAULT_DATABASE_NAME));
+ Assertions.assertNotNull(thingifier.getDefinitionNamed("todo"));
+ }
+ }
+
@Test
void invalidSemanticYamlReportsValidationErrors() {
ThingifierYamlException error =
diff --git a/thingifier/src/main/java/uk/co/compendiumdev/thingifier/application/schema/definition/ThingifierModelAssembler.java b/thingifier/src/main/java/uk/co/compendiumdev/thingifier/application/schema/definition/ThingifierModelAssembler.java
index 25e8cee2..243cd7aa 100644
--- a/thingifier/src/main/java/uk/co/compendiumdev/thingifier/application/schema/definition/ThingifierModelAssembler.java
+++ b/thingifier/src/main/java/uk/co/compendiumdev/thingifier/application/schema/definition/ThingifierModelAssembler.java
@@ -6,6 +6,7 @@
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
import uk.co.compendiumdev.thingifier.Thingifier;
+import uk.co.compendiumdev.thingifier.core.EntityRelModel;
import uk.co.compendiumdev.thingifier.core.domain.definitions.Cardinality;
import uk.co.compendiumdev.thingifier.core.domain.definitions.EntityDefinition;
import uk.co.compendiumdev.thingifier.core.domain.definitions.field.definition.Field;
@@ -14,6 +15,7 @@
import uk.co.compendiumdev.thingifier.core.domain.definitions.relationship.RelationshipDefinition;
import uk.co.compendiumdev.thingifier.core.domain.definitions.relationship.RelationshipVectorDefinition;
import uk.co.compendiumdev.thingifier.core.domain.definitions.validation.VRule;
+import uk.co.compendiumdev.thingifier.core.repository.ThingStoreProvider;
public final class ThingifierModelAssembler {
@@ -33,12 +35,20 @@ public SchemaDefinitionValidationReport validate(final ThingifierModelDefinition
}
public Thingifier assemble(final ThingifierModelDefinition definition) {
+ return assemble(definition, null);
+ }
+
+ public Thingifier assemble(
+ final ThingifierModelDefinition definition, final ThingStoreProvider storeProvider) {
final SchemaDefinitionValidationReport report = validate(definition);
if (!report.isValid()) {
throw new IllegalArgumentException(report.combinedMessages());
}
- final Thingifier thingifier = new Thingifier();
+ final Thingifier thingifier =
+ storeProvider == null
+ ? new Thingifier()
+ : new Thingifier(new EntityRelModel(storeProvider));
thingifier.setDocumentation(
emptyIfNull(definition.title()), emptyIfNull(definition.description()));
Apply to Workspace
Preview how current data will migrate before replacing the live workspace.