From be64fa0780cb8daf34101917b3009c83a906b3f7 Mon Sep 17 00:00:00 2001 From: Adrian Kunz Date: Thu, 22 Feb 2024 11:10:11 +0100 Subject: [PATCH 1/4] fix: Remove all mentions of fulibMockups --- backend/build.gradle | 6 ------ backend/src/main/java/org/fulib/webapp/tool/Tools.java | 3 --- .../main/resources/org/fulib/webapp/projectzip/build.gradle | 3 --- .../src/main/resources/org/fulib/webapp/version.properties | 1 - .../fulib/webapp/projectzip/ProjectZipControllerTest.java | 3 --- .../src/app/components/feedback/feedback.component.html | 4 ---- frontend/src/app/services/changelog.service.ts | 1 - projects/fulib/build.gradle | 3 --- 8 files changed, 24 deletions(-) diff --git a/backend/build.gradle b/backend/build.gradle index 8b406f02f..e74ae3c7f 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -37,9 +37,6 @@ ext { // https://mvnrepository.com/artifact/org.fulib/fulibTools fulibToolsDependency = [ group: 'org.fulib', name: 'fulibTools', version: '1.5.1' ] - // https://mvnrepository.com/artifact/org.fulib/fulibMockups - fulibMockupsDependency = [ group: 'org.fulib', name: 'fulibMockups', version: '0.4.0' ] - // https://mvnrepository.com/artifact/org.fulib/fulibTables fulibTablesDependency = [ group: 'org.fulib', name: 'fulibTables', version: '1.4.0' ] @@ -68,7 +65,6 @@ dependencies { implementation fulibDependency implementation fulibScenariosDependency - implementation fulibMockupsDependency implementation fulibTablesDependency // --------------- Other Libraries --------------- @@ -110,7 +106,6 @@ processResources { def fulibTablesVersion = getDependencyVersion(config, 'org.fulib', 'fulibTables') def fulibScenariosVersion = getDependencyVersion(config, 'org.fulib', 'fulibScenarios') def fulibGradleVersion = getDependencyVersion(rootProject.buildscript.configurations.classpath, 'org.fulib', 'fulibGradle') - def fulibMockupsVersion = getDependencyVersion(config, 'org.fulib', 'fulibMockups') def junitVersion = getDependencyVersion(config, 'junit', 'junit') def slf4jVersion = getDependencyVersion(config, 'org.slf4j', 'slf4j-simple') @@ -131,7 +126,6 @@ processResources { it = it.replace('$$fulibYamlVersion$$', fulibYamlVersion) it = it.replace('$$fulibTablesVersion$$', fulibTablesVersion) it = it.replace('$$fulibScenariosVersion$$', fulibScenariosVersion) - it = it.replace('$$fulibMockupsVersion$$', fulibMockupsVersion) it = it.replace('$$fulibGradleVersion$$', fulibGradleVersion) it = it.replace('$$fulibWorkflowsVersion$$', fulibWorkflowsDependency.version) it = it.replace('$$junitVersion$$', junitVersion) diff --git a/backend/src/main/java/org/fulib/webapp/tool/Tools.java b/backend/src/main/java/org/fulib/webapp/tool/Tools.java index 3107f6bac..c6b73c085 100644 --- a/backend/src/main/java/org/fulib/webapp/tool/Tools.java +++ b/backend/src/main/java/org/fulib/webapp/tool/Tools.java @@ -1,6 +1,5 @@ package org.fulib.webapp.tool; -import org.fulib.mockups.FulibMockups; import org.fulib.scenarios.tool.ScenarioCompiler; import org.junit.runner.JUnitCore; import org.junit.runner.Result; @@ -64,8 +63,6 @@ public static int scenarioc( ) { final List finalArgs = new ArrayList<>(8 + args.length); - finalArgs.add("--classpath"); - finalArgs.add(FulibMockups.class.getProtectionDomain().getCodeSource().getLocation().getPath()); finalArgs.add("-m"); finalArgs.add(modelSrcDir.toString()); finalArgs.add("-t"); diff --git a/backend/src/main/resources/org/fulib/webapp/projectzip/build.gradle b/backend/src/main/resources/org/fulib/webapp/projectzip/build.gradle index fc40fc58e..5284e626e 100644 --- a/backend/src/main/resources/org/fulib/webapp/projectzip/build.gradle +++ b/backend/src/main/resources/org/fulib/webapp/projectzip/build.gradle @@ -25,9 +25,6 @@ dependencies { // https://mvnrepository.com/artifact/org.fulib/fulibTables testImplementation group: 'org.fulib', name: 'fulibTables', version: '$$fulibTablesVersion$$' - // https://mvnrepository.com/artifact/org.fulib/fulibMockups - testImplementation group: 'org.fulib', name: 'fulibMockups', version: '$$fulibMockupsVersion$$' - // https://mvnrepository.com/artifact/junit/junit testImplementation group: 'junit', name: 'junit', version: '$$junitVersion$$' diff --git a/backend/src/main/resources/org/fulib/webapp/version.properties b/backend/src/main/resources/org/fulib/webapp/version.properties index 4b983c61f..929df098c 100644 --- a/backend/src/main/resources/org/fulib/webapp/version.properties +++ b/backend/src/main/resources/org/fulib/webapp/version.properties @@ -4,6 +4,5 @@ fulibTools=$$fulibToolsVersion$$ fulibYaml=$$fulibYamlVersion$$ fulibTables=$$fulibTablesVersion$$ fulibScenarios=$$fulibScenariosVersion$$ -fulibMockups=$$fulibMockupsVersion$$ fulibGradle=$$fulibGradleVersion$$ fulibWorkflows=$$fulibWorkflowsVersion$$ diff --git a/backend/src/test/java/org/fulib/webapp/projectzip/ProjectZipControllerTest.java b/backend/src/test/java/org/fulib/webapp/projectzip/ProjectZipControllerTest.java index e6dbbd0d0..ae499d358 100644 --- a/backend/src/test/java/org/fulib/webapp/projectzip/ProjectZipControllerTest.java +++ b/backend/src/test/java/org/fulib/webapp/projectzip/ProjectZipControllerTest.java @@ -65,9 +65,6 @@ public class ProjectZipControllerTest \t// https://mvnrepository.com/artifact/org.fulib/fulibTables \ttestImplementation group: 'org.fulib', name: 'fulibTables', version: '1.4.0' - \t// https://mvnrepository.com/artifact/org.fulib/fulibMockups - \ttestImplementation group: 'org.fulib', name: 'fulibMockups', version: '0.4.0' - \t// https://mvnrepository.com/artifact/junit/junit \ttestImplementation group: 'junit', name: 'junit', version: '4.13.2' diff --git a/frontend/src/app/components/feedback/feedback.component.html b/frontend/src/app/components/feedback/feedback.component.html index 8aa9e1f67..476c2b6ed 100644 --- a/frontend/src/app/components/feedback/feedback.component.html +++ b/frontend/src/app/components/feedback/feedback.component.html @@ -19,10 +19,6 @@ href="https://github.com/fujaba/fulibWorkflows/issues/new/choose"> The workflows or generated files (fulibWorkflows) - - The HTML mockups (fulibMockups) - The generated model classes (fulib) diff --git a/frontend/src/app/services/changelog.service.ts b/frontend/src/app/services/changelog.service.ts index 8e4def03f..1fa3fe674 100644 --- a/frontend/src/app/services/changelog.service.ts +++ b/frontend/src/app/services/changelog.service.ts @@ -14,7 +14,6 @@ export const REPOS = [ 'fulibYaml', 'fulibTables', 'fulibScenarios', - 'fulibMockups', 'fulibGradle', 'fulibWorkflows' ] as const; diff --git a/projects/fulib/build.gradle b/projects/fulib/build.gradle index 35da7874f..b3e9412ad 100644 --- a/projects/fulib/build.gradle +++ b/projects/fulib/build.gradle @@ -18,9 +18,6 @@ dependencies { // https://mvnrepository.com/artifact/org.fulib/fulibTools testImplementation group: 'org.fulib', name: 'fulibTools', version: '1.5.1' - // https://mvnrepository.com/artifact/org.fulib/fulibMockups - testImplementation group: 'org.fulib', name: 'fulibMockups', version: '0.4.0' - // https://mvnrepository.com/artifact/org.fulib/fulibTables testImplementation group: 'org.fulib', name: 'fulibTables', version: '1.4.0' } From 7a52a92a002395853dd532df8c37aca650343352 Mon Sep 17 00:00:00 2001 From: Adrian Kunz Date: Thu, 22 Feb 2024 11:10:29 +0100 Subject: [PATCH 2/4] fix(frontend): Remove fulibMockups-related examples --- frontend/src/app/editor/examples.service.ts | 5 -- .../src/assets/examples/prototyping/UIs.md | 67 ------------------- .../assets/examples/testing/ObjectDiagrams.md | 4 -- 3 files changed, 76 deletions(-) delete mode 100644 frontend/src/assets/examples/prototyping/UIs.md diff --git a/frontend/src/app/editor/examples.service.ts b/frontend/src/app/editor/examples.service.ts index 92a474a60..099ac4ae1 100644 --- a/frontend/src/app/editor/examples.service.ts +++ b/frontend/src/app/editor/examples.service.ts @@ -40,11 +40,6 @@ export class ExamplesService { {name: 'Piecewise Definition'}, ], }, - { - name: 'Prototyping', examples: [ - {name: 'UIs'}, - ], - }, ]; constructor( diff --git a/frontend/src/assets/examples/prototyping/UIs.md b/frontend/src/assets/examples/prototyping/UIs.md deleted file mode 100644 index e9f5e12e4..000000000 --- a/frontend/src/assets/examples/prototyping/UIs.md +++ /dev/null @@ -1,67 +0,0 @@ -# HTML-based GUIs - -> fulib supports some simple HTML-based GUIs. -> The basic type is a UI element. -> A UI that represents a complete page just needs an id. - -There is a UI with id loginPage. - -> A UI that represents a line within that page needs an id, a description and a parent. - -There is a UI with id title and with description "login page" and with parent loginPage. - -> To generate the HTML file gui01.html and a screenshot guiO1.html (for the loginPage) write: - -![loginPage](gui01.html) - -> A simple description like "login page" becomes a label, i.e. a text centered in a line. -> To create an input field, use a description like "input ". - -There is a UI with id inputField and with description "input userName name?" and with parent loginPage. - -> "userName" is the key that will allow you to read and write the text within that input field. - -![loginPage](gui02.html) - -> Finally, there is a description like "button ok gui04.html" that creates a button -> with text "ok" and on click loads "gui04.html". - -There is a UI with id button and with description "button ok gui04.html" and with parent loginPage. - -![loginPage](gui03.html) - -> Let us have gui04.html - -There is a UI with id helloPage. -There is a UI with id greetings and with description "hello world" and with parent helloPage. -There is a UI with id backButton and with description "button back gui05.html" and with parent helloPage. - -![helloPage](gui04.html) - -> A page may have parameters which are key value pairs. -> If the key refers to an input field, we write the value into that field. - -There is a parameter with key userName and with value Bob. -LoginPage has parameters userName. - -> Let us also change the target of our ok button. - -Button has description "button ok gui06.html". - -> You may also have multiple elements in one line if you separate them with "|": - -Button has description "button ok gui06.html | or | button restart gui03.html". - -![loginPage](gui05.html) - -> To see the object structure of our login page write: - -![loginPage](loginPage.png) - -> Accordingly, lets change our helloPage: - -Greetings has description "hello Bob". - -![helloPage](gui06.html) - -> Overall you may create a sequence of pages that serve as a small slide show or mockup for your application. diff --git a/frontend/src/assets/examples/testing/ObjectDiagrams.md b/frontend/src/assets/examples/testing/ObjectDiagrams.md index 87ac2d189..92ecbcd9d 100644 --- a/frontend/src/assets/examples/testing/ObjectDiagrams.md +++ b/frontend/src/assets/examples/testing/ObjectDiagrams.md @@ -32,10 +32,6 @@ The Pumps has price 42.42. ![Sneakers, Pumps](images/products.txt) -> The .tables.html format shows nicely formatted tables: - -![Amazon](images/products.tables.html) - # More Info > The documentation goes into more depth about how to create diagrams and display data: From 6cfe26d57cba14671a6e126887718ca647497c87 Mon Sep 17 00:00:00 2001 From: Adrian Kunz Date: Thu, 22 Feb 2024 14:52:33 +0100 Subject: [PATCH 3/4] chore(backend): Update fulib dependencies --- backend/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/build.gradle b/backend/build.gradle index e74ae3c7f..12dde8182 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -29,19 +29,19 @@ repositories { ext { // https://mvnrepository.com/artifact/org.fulib/fulib - fulibDependency = [ group: 'org.fulib', name: 'fulib', version: '1.6.1' ] + fulibDependency = [ group: 'org.fulib', name: 'fulib', version: '1.6.2' ] // https://mvnrepository.com/artifact/org.fulib/fulibScenarios - fulibScenariosDependency = [ group: 'org.fulib', name: 'fulibScenarios', version: '1.7.0' ] + fulibScenariosDependency = [ group: 'org.fulib', name: 'fulibScenarios', version: '1.7.1' ] // https://mvnrepository.com/artifact/org.fulib/fulibTools - fulibToolsDependency = [ group: 'org.fulib', name: 'fulibTools', version: '1.5.1' ] + fulibToolsDependency = [ group: 'org.fulib', name: 'fulibTools', version: '1.6.0' ] // https://mvnrepository.com/artifact/org.fulib/fulibTables fulibTablesDependency = [ group: 'org.fulib', name: 'fulibTables', version: '1.4.0' ] // https://mvnrepository.com/artifact/org.fulib/fulibWorkflows - fulibWorkflowsDependency = [ group: 'org.fulib', name: 'fulibWorkflows', version: '0.5.6' ] + fulibWorkflowsDependency = [ group: 'org.fulib', name: 'fulibWorkflows', version: '0.6.0' ] // https://mvnrepository.com/artifact/junit/junit junitDependency = [ group: 'junit', name: 'junit', version: '4.13.2' ] From 488ef1ad4ba7f8240562a5d8ce916d519487d60b Mon Sep 17 00:00:00 2001 From: Adrian Kunz Date: Thu, 22 Feb 2024 14:59:08 +0100 Subject: [PATCH 4/4] fix(backend): Update ProjectZipControllerTest --- .../fulib/webapp/projectzip/ProjectZipControllerTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/test/java/org/fulib/webapp/projectzip/ProjectZipControllerTest.java b/backend/src/test/java/org/fulib/webapp/projectzip/ProjectZipControllerTest.java index ae499d358..0872f4b01 100644 --- a/backend/src/test/java/org/fulib/webapp/projectzip/ProjectZipControllerTest.java +++ b/backend/src/test/java/org/fulib/webapp/projectzip/ProjectZipControllerTest.java @@ -54,13 +54,13 @@ public class ProjectZipControllerTest dependencies { \t// https://mvnrepository.com/artifact/org.fulib/fulibScenarios - \tfulibScenarios group: 'org.fulib', name: 'fulibScenarios', version: '1.7.0' + \tfulibScenarios group: 'org.fulib', name: 'fulibScenarios', version: '1.7.1' \t// https://mvnrepository.com/artifact/org.slf4j/slf4j-simple \tfulibScenarios group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.36' \t// https://mvnrepository.com/artifact/org.fulib/fulibTools - \ttestImplementation group: 'org.fulib', name: 'fulibTools', version: '1.5.1' + \ttestImplementation group: 'org.fulib', name: 'fulibTools', version: '1.6.0' \t// https://mvnrepository.com/artifact/org.fulib/fulibTables \ttestImplementation group: 'org.fulib', name: 'fulibTables', version: '1.4.0' @@ -147,7 +147,7 @@ public void handle() throws IOException assertThat(files, hasItems(EXPECTED_FILES)); for (final Map.Entry entry : EXPECTED_CONTENT.entrySet()) { - assertEquals(entry.getKey(), contents.get(entry.getKey()), entry.getValue()); + assertEquals(entry.getKey(), entry.getValue(), contents.get(entry.getKey())); } } }