KOGITO-5541 Quarkus DEV UI: Form Service #1

bxf12315 · 2021-07-28T12:38:51Z

Many thanks for submitting your Pull Request ❤️!

Please make sure that your PR meets the following requirements:

You have read the contributors guide
Pull Request title is properly formatted: KOGITO-XYZ Subject
Pull Request title contains the target branch if not targeting master: [0.9.x] KOGITO-XYZ Subject
Pull Request contains link to the JIRA issue
Pull Request contains link to any dependent or related Pull Request
Pull Request contains description of the issue
Pull Request does not include fixes for issues other than the main ticket

How to retest this PR or trigger a specific build:

Pull Request
Please add comment: Jenkins retest this
Quarkus LTS checks
Please add comment: Jenkins run LTS
Native checks
Please add comment: Jenkins run native

...src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/FormsService.java

...src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/FormsStorage.java

pefernan · 2021-07-29T11:36:00Z

...java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImpl.java

    @PostConstruct
-    public void init() {
-        formsFolder = Thread.currentThread().getContextClassLoader().getResource(FORMS_STORAGE_PATH);
+    public void init() throws MalformedURLException, URISyntaxException {


Shouldn't throw, I'd catch exception and warn in case something wrong happens.

...java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImpl.java

...c/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/FormInfo.java

pefernan · 2021-07-29T12:25:02Z

...java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImpl.java

+    private Collection<File> readFormBaseList() {
+        if (formsFolder != null) {
+            File rootFolder = FileUtils.toFile(formsFolder);
+            return FileUtils.listFiles(rootFolder, new String[] { "html", "tsx", "config" }, false);


just list html/tsx, not config

I want to load the config file into formInfoCollection.

...java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImpl.java

...e/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/Form.java

pefernan · 2021-07-29T12:28:17Z

...java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImpl.java

+        File formConfig = getFormConfigFile(formName);
+        FormConfiguration formConfiguration = null;
+        if (formConfig != null && formConfig.exists()) {
+            formConfiguration = new FormConfiguration(IOUtils.toString(new FileInputStream(formConfig), Charset.forName("UTF-8")));


Use StandardCharsets.UTF_8

pefernan · 2021-07-30T14:24:33Z

...src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/FormsService.java

@@ -37,7 +50,46 @@ public FormsService(FormsStorage storage) {
    @GET
    @Path("/list")
    @Produces(MediaType.APPLICATION_JSON)
-    public Collection<FormInfo> getFormsList() {
-        return storage.getFormList();
+    public Response getFormsList(@QueryParam("names") FormFilter filter) {


Do we need QueryPAram("names")?

pefernan · 2021-07-30T14:29:13Z

...e/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/Form.java

+    public static String SOURCE_KEY = "source-content";
+
+    private String name;
+    private JsonObject source = new JsonObject();


Source must be String, it should be the raw content of the form file file (html/tsx),

pefernan · 2021-07-30T14:36:02Z

...va/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/FormConfiguration.java

+        this.put(RECOURCES_KEY, resources);
+    }
+
+    public void setSchema(String schema) {


I would remove the setters if possible.

pefernan · 2021-07-30T14:37:49Z

...java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImpl.java

+        try {
+            URL originURL = Thread.currentThread().getContextClassLoader().getResource(FORMS_STORAGE_PATH);
+            URI originUri = originURL.toURI();
+            String newPath = originUri.getPath().replace("target/classes", "src/main/resources");


I'd use the originURL, not this replace. We won't do the update operation for now

pefernan · 2021-07-30T14:39:36Z

...java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImpl.java

+    public Collection<FormInfo> getFormInfoList(FormFilter filter) {
+        final Collection<FormInfo> formInfoCollection = new ArrayList();
+        Collection<String> matchedNames = null;
+        if (filter != null && filter.getNames().size() > 0) {


here you could do return formInfoMap.entrySet().filter().map().collect(); instead of having this intermediate matchedNames collection.

pefernan · 2021-07-30T14:39:52Z

...java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImpl.java

+        if (filter != null && filter.getNames().size() > 0) {
+            matchedNames = formInfoMap.keySet().stream().filter(name -> filter.getNames().contains(name)).collect(Collectors.toList());
+        } else {
+            matchedNames = formInfoMap.keySet();


Here you could return the formInfoMap.values()

pefernan · 2021-07-30T14:42:14Z

...java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImpl.java


-        return forms.size();
+    private File getFormFile(String formName) {
+        if (formInfoMap != null) {


Don't store the File in FileInfo, load the file in the same way as in getconfigFile

pefernan · 2021-07-30T14:51:58Z

...java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImpl.java

-                .map(file -> new FormInfo(FilenameUtils.removeExtension(file.getName()), FilenameUtils.getExtension(file.getName()), new Date(file.lastModified())))
-                .collect(Collectors.toList());
+    public void updateFormContent(String formContent, String formName) throws IOException {
+        File formFile = getFormFile(formName);


We don't need update for now

* FAI-451: setup CF route, added initial components * FAI-451: added drawer for constraints side panel * FAI-451: switched to PF composable table * FAI-451: working on search domain editing * FAI-451: added results slider * FAI-451: improved table responsiveness * FAI-451: handling outcome selection state * FAI-451: handling input domain selection state * FAI-451: handling CF status inside state * FAI-451: handling CF execution phases * FAI-451: handling new CF creation and reset * FAI-451: analysis execution info improved * FAI-451: handling numeric constraints separate component and validation * FAI-451: handling categorical constraints * FAI-451: handling string outcomes and boolean inputs * FAI-451: showing cf execution date * FAI-451: added success message * FAI-451: making inputs constraints mandatory (except for booleans) * FAI-451: added coherent random values to CF results switched to light background displying CF results changed values with background highlight * FAI-451: styles tweaks * FAI-451: added horizontal scrolling to cf results columns * FAI-451: fixed table rows borders, added tooltips, fixed copy * FAI-451: fixed counterfactual section flex direction + minor tweaks * FAI-451: removed checkboxes to enable outcomes modification * FAI-451: added loading status, refactored reducer * FAI-451: fixed horz scroll issue, added CF results IDs row * FAI-452: mocked apis * FAI-452: plugged UI to mocked apis * FAI-452: changed input requirements logic * FAI-452: making counterfactual section hidden by default * FAI-452: improved table rezing logic * FAI-452: improved mocked apis response * FAI-452: adding tests * FAI-452: improving sizes custom hook and cf reducer * FAI-452: updates following api changes * FAI-452: work in progress * FAI-452: handling errors in counterfactual analysis executions * Fix parenthesis for CounterfactualToolbar when CF have completed. (#1) Co-authored-by: Michael Anstis <[email protected]> * FAI-517: Counterfactual: Add support for "partial" goals in Trusty UI * More to <React.Fragment>.. to support keys * Refactor following first review. * Fix CF request. * FAI-532: Update CF UI to use 'fixed' property * FAI-539: Counterfactual: Refactor support for "partial" goals in Trusty UI (#4) * FAI-539: Counterfactual: Refactor support for "partial" goals in Trusty UI * Further updates for partial goals * Revised wording based in Missy's latest design. * Final(?) wording from Missy's design. * Updates following peer review. Co-authored-by: Michael Anstis <[email protected]> * FAI-549: fix CF results table layout issues * FAI-552: rounding properties values of CF solutions * FAI-553: sorting CF results from latest to oldest * FAI-550: managing "no solutions found" scenario * FAI-452: adjusting progress bar time limit to 69 seconds * FAI-563: added a blink animation to new CF results when they are added * FAI-452: updated env variable configuration * FAI-452: lowering progress bar countdown to 20 secs * FAI-452: enabling CF section by default * FAI-452: keeping only succeeded outcomes in the CF initial state * FAI-452: disabling CF by default and restoring progress bar to 60s * FAI-452: updating yarn.lock * FAI-452: fixes and cleanup * FAI-452: improving test coverage * FAI-452: improving test coverage Co-authored-by: Michael Anstis <[email protected]> Co-authored-by: Michael Anstis <[email protected]>

bxf12315 force-pushed the quarkus-dev-ui-extension-forms branch from 48cb3f5 to ae8ee21 Compare July 29, 2021 10:57

pefernan requested changes Jul 29, 2021

View reviewed changes

bxf12315 force-pushed the quarkus-dev-ui-extension-forms branch 7 times, most recently from a33c5ea to 3b3c99c Compare July 30, 2021 13:11

pefernan requested changes Jul 30, 2021

View reviewed changes

paulovmr self-requested a review July 30, 2021 15:10

KOGITO-5541 Quarkus DEV UI: Form Service

11938f0

bxf12315 force-pushed the quarkus-dev-ui-extension-forms branch from 3b3c99c to 11938f0 Compare August 2, 2021 13:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

KOGITO-5541 Quarkus DEV UI: Form Service #1

KOGITO-5541 Quarkus DEV UI: Form Service #1

bxf12315 commented Jul 28, 2021

pefernan Jul 29, 2021

bxf12315 Jul 29, 2021

pefernan Jul 29, 2021

bxf12315 Jul 29, 2021

pefernan Jul 29, 2021

pefernan Jul 30, 2021

pefernan Jul 30, 2021

pefernan Jul 30, 2021

pefernan Jul 30, 2021

pefernan Jul 30, 2021

pefernan Jul 30, 2021

pefernan Jul 30, 2021

pefernan Jul 30, 2021

KOGITO-5541 Quarkus DEV UI: Form Service #1

Are you sure you want to change the base?

KOGITO-5541 Quarkus DEV UI: Form Service #1

Conversation

bxf12315 commented Jul 28, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment