[Conflict Resolver] Reactify + DataFramework #5140

xlecours · 2019-08-26T20:24:17Z

The frontend and the backend follows the same structure; There is a Conflict_resolver React app that renders a <FilterableDatatable> for unresolved or resolved conflict according to the selected tab.
This React app is provided by the conflict_resolver.class.inc php file along with all the CSS and other JS. The rendered <FilterableDatatable> will the make a fetch (GET) call to either conflict_resolver/unresolved or conflict_resolver/resolved that correspond to 2 RequestHandlers with the same name. Each handler will then process the request and return the data and the filterOptions.

The conflict_resolver/unresolved endpoint also support POST request with conflict_id and correct_answer to resolve a conflict. As long as the page is not refreshed, it is possible to fix a conflict multiple time; each time changing the values in the "wrong" instrument, recalculate score, inserting/replacing the row in conflicts_resolved and removing the row in conflicts_unresolved if not already removed.

A UNIQUE constraint is added on ConflictID in conflicts_resolved table to allow REPLACE sql statement to work when a conflict is resolved then corrected.

Still missing:

Feedback to user when a conflict is fixed. "Saved" tooltip or label which fades after 1 second or something like that.
Integration test needs to be adapted

Bonus:
This provide a new database provisioner, src/Data/Provisioners/DBObjectProvisioner.php, that returns a Traversable of objects of a given class by using PDOStatement::setFetchMode( PDO::FETCH_CLASS). Basically, each rows are transformed from an associative array to an object with column names as properties. (see unresolveddto.class.inc and resolveddto.class.inc)

This also adds a open-api spec schema.yml file in the static directory of the module to view the endpoitns in swagger-ui.

maltheism · 2019-09-09T16:34:44Z

Hi @xlecours I'm manually testing right now and I'm confused on how to save the Correct Answer in the Unresolved Conflicts panel. As an example I changed one of the values for the Correct Answer and I see the green checkbox but I don't see how to save it. Then after I visit the Resolved panel and I'm not seeing it when filtering for most recent Timestamp.

xlecours · 2019-09-09T16:58:45Z

@maltheism The save happen onChange automatically. The "Resolved" tab should update when you change tabs so the newly resolved conflict should appear right away.
Can you see the new entry in the conflicts_resolved table? Is it removed from the conflicts_unresolved?

ridz1208

in modules/conflict_resolver/php/conflict_resolver.class.inc line 404: PhanUndeclaredStaticMethod Static call to undeclared method \NDB_Page::toArray

After fixing the requested changes locally, the module seemed to load and function normally.

A UI improvement could be done for the autosaved select elements, they show up like this on my chrome

modules/conflict_resolver/php/provisioners/resolvedprovisioner.class.inc

modules/conflict_resolver/php/provisioners/unresolvedprovisioner.class.inc

modules/conflict_resolver/test/conflict_resolverTest.php

ridz1208 · 2020-02-12T18:07:05Z

modules/conflict_resolver/php/models/resolveddto.class.inc

+    public function getCenterID(): int
+    {
+        return (int) $this->centerid;
+    }


get projectId function should be added

To filter out other projects data, just like centerid

@ridz1208 So what you are asking is for me to add the UserProjectMatch to the data provisioners here : https://github.com/aces/Loris/pull/5140/files#diff-8c4f9a1ba1e40de58508d6300ab817fcR136 and there : https://github.com/aces/Loris/pull/5140/files#diff-401ec2ff7b24354f8856d1462f4eb1f6R148
right?

@ridz1208 Done

fix tests

@ridz

@ridz suggestions Co-Authored-By: Rida Abou-Haidar <[email protected]>

xlecours · 2020-03-10T17:10:35Z

@driusan This is passing Travis now. Ready for review

ridz1208 · 2020-03-10T17:22:27Z

modules/conflict_resolver/php/models/resolveddto.class.inc

+    public function getCenterID(): int
+    {
+        return (int) $this->centerid;
+    }


To filter out other projects data, just like centerid

stale

…el project

xlecours · 2020-03-13T17:47:03Z

@ridz1208 Done. Please re-review

HenriRabalais · 2020-03-23T17:52:26Z

modules/conflict_resolver/jsx/fix_conflict_form.js

+   *
+   * @param {Event} e - The onChange event.
+   */
+  fix(e) {


I would suggest having this function alter the DOM via a state change, rather than altering the element directly. That way you can also use the LORIS SelectElement rather than a custom element.

Would you care to propose something?

You suggestion must:

send a post request to /conflict_resolver/unresolved with {conflictid: conflictid, correctanswer: correctanswer}

display feedback to the user for each resolved conflict.

remove the empty option in the select options when a conflict is resolved because it can be re-resolved with an other answer but not bring back as unresolved.

Sure.

This wouldn't have to change. The fix function could still post the request the same way you are currently doing it.

The fix function would call a function that will have been passed by the parent via props and pass an id that indicates which row of the datatable it corresponds to. This callback function would then trigger a state change in the parent indexed by the row id which would display the appropriate feedback to the user for that given datatable row in the formatColumn function of unresolved_filterabledatatable.js.

You could use the same state from (2) to conditionally remove the empty option when a conflict has been resolved. There's a prop you can pass to SelectElements called emptyOption that determines whether there is an empty option or not.

@HenriRabalais Would you care to propose something? (I mean code)

Do you want me to commit code to your PR? I don't think pasting code here would do much good since it's out of the context of the PR, and my previous response are instructions for the code I'm proposing.

Sending a PR to my branch would do the trick.

ridz1208 · 2020-06-30T16:50:02Z

@HenriRabalais @xlecours do we know how close this is to being mergeable ? other than conflicts and travis ?

xlecours · 2020-06-30T19:47:22Z

@ridz1208 I completely agree with @HenriRabalais but I don't have time at the moment to look into it. The current state is working but it is not following React best practices.

I will fix the conflicts

If @HenriRabalais can send a PR to my branch with his requested changes implemented, I will gladly merge it.

ridz1208 · 2020-07-23T13:30:56Z

This PR was 90% there, a new PR has been issued. May it RIP

xlecours · 2020-08-11T18:44:32Z

I sent HenriRabalais#7 to fix the thing. There is still an issue with the selected option after the fix.

implements the auto-saving of conflict resolution Add 2 endpoints (/conflict_resolver/unresolved and /conflict_resolver/resolved) Adds a schema.yml file PR #6862 PR #5140

Reactify

2f02a18

xlecours added the State: Needs work PR awaiting additional work by the author to proceed label Aug 26, 2019

xlecours added 3 commits August 27, 2019 12:43

new handlers

7a53ddc

fix conflict

ae70eb2

fix filters

3dd7ad0

xlecours added Cleanup PR or issue introducing/requiring at least one clean-up operation Language: SQL PR or issue that update SQL code and removed State: Needs work PR awaiting additional work by the author to proceed labels Aug 28, 2019

xlecours added 3 commits August 28, 2019 10:20

missing file

e28caff

removed comments

a0fb629

removing unused file

ead809f

xlecours added the State: Needs work PR awaiting additional work by the author to proceed label Aug 28, 2019

xlecours added 7 commits September 3, 2019 10:01

working on tests

2f56b14

adding form feedback

635587f

adjusting tests

4f4ba52

fix phpcs

74d6b64

fix phan

3f140df

fix integration tests

7a3572a

fix again

5808cbd

xlecours removed the State: Needs work PR awaiting additional work by the author to proceed label Sep 6, 2019

xlecours added 4 commits September 6, 2019 10:43

adjusting help text

ebef50b

fighting with tests

c46ec79

fix an actual test failure

4b57d6d

plus one

0e46a91

xlecours requested a review from maltheism September 9, 2019 15:36

xlecours requested a review from driusan February 4, 2020 17:19

ridz1208 requested changes Feb 12, 2020

View reviewed changes

xlecours and others added 4 commits February 13, 2020 11:17

fix "rebase" mistakes

06817d6

fix tests

Merge branch 'master' into conflict_resolver_dataframwork

e62a60b

Apply suggestions from code review

a5ba399

@ridz suggestions Co-Authored-By: Rida Abou-Haidar <[email protected]>

calling wait as a function instead of a public attribute

797c8b1

ridz1208 self-assigned this Feb 29, 2020

rebase

209fe7f

ridz1208 previously requested changes Mar 10, 2020

View reviewed changes

add UserProjectMatch

bfe6f7e

xlecours added 2 commits March 13, 2020 13:43

had to adjust numebrs since UnitTester is only assiated to Pumpernick…

4f9be86

…el project

removing white spaces at end of lines

e29c545

fix test

23d83c0

HenriRabalais suggested changes Mar 23, 2020

View reviewed changes

ridz1208 removed their assignment Apr 27, 2020

johnsaigle added the State: Needs rebase PR that needs to be rebased to proceed (conflicts, wrong branch...) label May 26, 2020

driusan assigned HenriRabalais and unassigned xlecours Jul 7, 2020

HenriRabalais mentioned this pull request Jul 22, 2020

[conflict_resolver] reactify + dataframework #6862

Closed

ridz1208 closed this Jul 23, 2020

xlecours mentioned this pull request Aug 27, 2021

[conflict_resolver] api + dataframework (version 3) #7558

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Conflict Resolver] Reactify + DataFramework #5140

[Conflict Resolver] Reactify + DataFramework #5140

xlecours commented Aug 26, 2019 •

edited

Loading

maltheism commented Sep 9, 2019

xlecours commented Sep 9, 2019

ridz1208 left a comment

ridz1208 Feb 12, 2020

xlecours Feb 13, 2020

xlecours Mar 10, 2020

ridz1208 Mar 10, 2020

xlecours Mar 10, 2020

ridz1208 Mar 10, 2020

xlecours Mar 10, 2020

xlecours commented Mar 10, 2020

ridz1208 Mar 10, 2020

xlecours commented Mar 13, 2020

HenriRabalais Mar 23, 2020 •

edited

Loading

xlecours Mar 26, 2020

xlecours Mar 26, 2020 •

edited

Loading

HenriRabalais Mar 26, 2020 •

edited

Loading

xlecours Apr 1, 2020

HenriRabalais Apr 16, 2020 •

edited

Loading

xlecours Apr 16, 2020

ridz1208 commented Jun 30, 2020

xlecours commented Jun 30, 2020

ridz1208 commented Jul 23, 2020

xlecours commented Aug 11, 2020 •

edited

Loading

[Conflict Resolver] Reactify + DataFramework #5140

[Conflict Resolver] Reactify + DataFramework #5140

Conversation

xlecours commented Aug 26, 2019 • edited Loading

maltheism commented Sep 9, 2019

xlecours commented Sep 9, 2019

ridz1208 left a 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

xlecours commented Mar 10, 2020

Choose a reason for hiding this comment

xlecours commented Mar 13, 2020

HenriRabalais Mar 23, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

xlecours Mar 26, 2020 • edited Loading

Choose a reason for hiding this comment

HenriRabalais Mar 26, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

HenriRabalais Apr 16, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ridz1208 commented Jun 30, 2020

xlecours commented Jun 30, 2020

ridz1208 commented Jul 23, 2020

xlecours commented Aug 11, 2020 • edited Loading

xlecours commented Aug 26, 2019 •

edited

Loading

HenriRabalais Mar 23, 2020 •

edited

Loading

xlecours Mar 26, 2020 •

edited

Loading

HenriRabalais Mar 26, 2020 •

edited

Loading

HenriRabalais Apr 16, 2020 •

edited

Loading

xlecours commented Aug 11, 2020 •

edited

Loading