Add disable/enable calculation of items in group (2) #6244

Gena928 · 2020-04-05T15:40:21Z

Additional code for issue 6042, based on comment from Tobiasdiez:
https://github.com/JabRef/jabref/pull/6233#issuecomment-609430247

Now GroupNodeViewModel will be responsible for checking user preferences. If user wants to see items count in group - it will be shown. Otherwise - no.

Change in CHANGELOG.md described (if applicable)
Tests created for changes (if applicable)
Manually tested changed features in running JabRef (always required)
Screenshots added in PR description (for bigger UI changes)
Checked documentation: Is the information available and up to date? If not: Issue created at https://github.com/JabRef/user-documentation/issues.

Now it's responsible for count if items in group (enable / disable, based on user preferences)

calixtus

Hi @Gena928, thanks for your quick follow-up and your effort.
I found a small problem about the injection of PreferencesService.
Also I would like to ask you to keep the checkboxes in the PR-description. They are just a little help for us to get a quick overview of the extent to which a PR is ready. I took the liberty to readd them by myself. 😉

src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java

tobiasdiez · 2020-04-05T23:02:10Z

src/main/java/org/jabref/gui/groups/GroupTreeView.java

-                    if (preferencesService.getDisplayGroupCount()) {
-                        text.textProperty().bind(group.getHits().asString());
-                    }
+                    text.textProperty().bind(group.getHits().asString());


Please leave this if check here, otherwise every group will have a 0 here.

Good day,
OK, adjusted in code. Will commit today, when we find solution about PreferencesService in GroupNodeViewModel (see comment from calixtus).

In case we can't use PreferencesService injection, I propose to create a property (displayItemsCount) and set this property from outside (from GroupTreeView) as True/False. True - need get count, False - NO need to get count of items. Also I found method "onDatabaseChanged" - it fires when you delete/add new items to group. So we need "displayItemsCount" to restrict calculation in this case also. By default displayItemsCount = False

src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java

Hugoo98 · 2020-04-21T15:47:47Z

@calixtus
Hello, I'm coming back to you regarding bug #6091. As we discussed on #6107, we agreed to start working on #6091 and download our draft in case of progress. Finally we managed to correct it with my colleagues, and now we don't know what the next step is, can you guide us please?
Thank you

calixtus · 2020-04-22T09:45:28Z

Hi @Hugoo98 ,
you can now commit your changes to a new branch and push this branch via git to your origin repository. Then you should be able ot create a new pull request to JabRef on GitHubs Web-UI. Then we should be able to review and discuss your changes.

calixtus · 2020-04-22T09:47:14Z

If you have general questions about JabRef development, please use the developers gitter chat, so we won't pollute this PR with our Off-Topic comments.

…ter is active

…abref into fix-for-issue-5891

tobiasdiez · 2020-05-21T10:47:57Z

@Gena928 did you already found the time to look at the issue with the preferences? Do you have questions concerning it?

Gena928 · 2020-05-21T17:43:47Z

@tobiasdiez
looks like we have misunderstanding. Sorry, but I was sure I don't have any unclosed issues.
Which one?

tobiasdiez · 2020-05-21T19:46:35Z

You are right, I guess this is indeed a misunderstanding.
I was referring to

Will commit today, when we find solution about PreferencesService in GroupNodeViewModel (see comment from calixtus).

So this is then ready for review? The build currently fails and there are merge conflicts. Could you have a look at this? Thanks!

Gena928 · 2020-05-21T20:04:32Z

@tobiasdiez
yes, it's ready for review. I'll look at the conflict.

tobiasdiez

Good!

The changes are fine with me except one thing were I guess a git merge conflict resulted in unnecessary code duplication.

tobiasdiez · 2020-05-21T20:06:57Z

src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java

-                .executeWith(taskExecutor);
+        if (preferencesService.getDisplayGroupCount()) {
+            BackgroundTask
+                    .wrap(() -> groupNode.calculateNumberOfMatches(databaseContext.getDatabase()))


I think this duplication of the code is a result from a merge conflict?

Looks like yes, this is a conflict.
the second BackgroundTask is not mine. My code is:

private void calculateNumberOfMatches() { // We calculate the new hit value // We could be more intelligent and try to figure out the new number of hits based on the entry change // for example, a previously matched entry gets removed -> hits = hits - 1 if (preferencesService.getDisplayGroupCount()) { BackgroundTask .wrap(() -> groupNode.calculateNumberOfMatches(databaseContext.getDatabase())) .onSuccess(hits::setValue) .executeWith(taskExecutor); } }

Sorry, I haven't worked with conflicts yet.
Looks like this is your correction as of 11.04.2020. Can I do something to resolve this GIT conflict?

No problem! I also often have problems with git ;-)

Here the solution is relatively simple. Just edit the code and remove the part that is duplicated / not correct. Then commit and push.

My method (calculateNumberOfMatches) is no longer valid and GroupNodeViewModel must use a new methods called "findMatches"

Gena928 · 2020-05-22T13:03:18Z

@tobiasdiez
OK, looks like my old method is no longer valid, because it was refactored.
I updated updateMatchedEntries and now it's using new method - findMatches, according to your commit as of 28.04.2020.

otherwise it will be interpreted as path which obiously fails Fixes JabRef#6507

Removed BIB file directory from search when preferences has option unchecked

Refactor main table preferences

Bumps [flexmark](https://github.com/vsch/flexmark-java) from 0.61.32 to 0.62.0. - [Release notes](https://github.com/vsch/flexmark-java/releases) - [Commits](https://github.com/vsch/flexmark-java/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Bumps [flexmark-ext-gfm-tasklist](https://github.com/vsch/flexmark-java) from 0.61.32 to 0.62.0. - [Release notes](https://github.com/vsch/flexmark-java/releases) - [Commits](https://github.com/vsch/flexmark-java/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Bumps [bcprov-jdk15on](https://github.com/bcgit/bc-java) from 1.65 to 1.65.01. - [Release notes](https://github.com/bcgit/bc-java/releases) - [Changelog](https://github.com/bcgit/bc-java/blob/master/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

…cycastle-bcprov-jdk15on-1.65.01 Bump bcprov-jdk15on from 1.65 to 1.65.01

…sch.flexmark-flexmark-0.62.0 Bump flexmark from 0.61.32 to 0.62.0

…sch.flexmark-flexmark-ext-gfm-tasklist-0.62.0 Bump flexmark-ext-gfm-tasklist from 0.61.32 to 0.62.0

Bumps [flexmark-ext-gfm-strikethrough](https://github.com/vsch/flexmark-java) from 0.61.32 to 0.62.0. - [Release notes](https://github.com/vsch/flexmark-java/releases) - [Commits](https://github.com/vsch/flexmark-java/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

…8-6042(2)

Now it's responsible for count if items in group (enable / disable, based on user preferences)

In case we can't use PreferencesService injection, I propose to create a property (displayItemsCount) and set this property from outside (from GroupTreeView) as True/False. True - need get count, False - NO need to get count of items. Also I found method "onDatabaseChanged" - it fires when you delete/add new items to group. So we need "displayItemsCount" to restrict calculation in this case also. By default displayItemsCount = False

calixtus · 2020-05-29T22:07:28Z

I originally wanted to merge current master into this branch and merge it, but I kinda messed up the git history in this one. Sorry about that. Took the commits to PR #6554 . Maybe someone more experienced with git (@koppor ) can take a quick look at it, and merge it then. 🙈

koppor · 2020-06-02T20:17:01Z

No clue. Good that you managed to create a "good PR" at #6554.

7a10e3f Bluebook: Remove small-caps for case short & legislation (#6305) ca4a92b Merge pull request #6244 from POBrien333/patch-1107 12743ad Create social-science-history.csl (#6233) f7c1d57 Update american-chemical-society.csl (#6231) aca6b23 ready: Update oil-shale.csl (#6225) aadae55 Create pallas.csl (#6204) cc7d016 Merge pull request #6253 from nschneid/patch-1 77fab39 Merge pull request #6282 from POBrien333/patch-1119 e2668eb Merge pull request #6263 from POBrien333/patch-1113 7f3244d move style to dependent folder 8584993 Create development-growth-differentiation.csl (#6226) dfe71ff Create biotechnology-and-bioprocess-engineering.csl (#6227) 0d91742 Create sn-computer-science.csl (#6228) a0d09b4 Create mots.csl (#6205) 47665e5 Update review-of-international-studies.csl d573b8b Create computer-supported-cooperative-work.csl cebec0e ACL: check if edition is ordinal before printing the word "edition" 03a0a39 Re-indent CSL styles 3c64906 fix self link 479c061 fix small issues after visual inspection a356e72 Create gnosis-journal-of-gnostic-studies.csl git-subtree-dir: buildres/csl/csl-styles git-subtree-split: 7a10e3f

Adjusted GroupNodeViewModel.java.

72c022e

Now it's responsible for count if items in group (enable / disable, based on user preferences)

calixtus requested changes Apr 5, 2020

View reviewed changes

src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java Outdated Show resolved Hide resolved

tobiasdiez reviewed Apr 5, 2020

View reviewed changes

Gena928 added 2 commits April 6, 2020 16:31

Update GroupNodeViewModel.java

ebd6284

tobiasdiez added the status: changes required Pull requests that are not yet complete label Apr 10, 2020

Siedlerchr reviewed Apr 11, 2020

View reviewed changes

src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java Outdated Show resolved Hide resolved

Injected PreferencesService using a constructor call.

c0990dc

koppor added this to the v5.1 milestone Apr 14, 2020

tobiasdiez and others added 8 commits April 28, 2020 08:56

Merge branch 'master' into 6042(2)

1b5d16d

Update GroupNodeViewModel.java

f6c12f4

Fixed an issue where a new entry is not shown in the library if a fil…

3f368e9

…ter is active

Partial fix for issue 5891

c8da256

Added more tests

ce33357

Added more tests

3df1342

Added more tests

5454a09

Merge branch 'fix-for-issue-5891' of https://github.com/silverhorse/j…

e066958

…abref into fix-for-issue-5891

tobiasdiez requested changes May 21, 2020

View reviewed changes

tobiasdiez added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label May 21, 2020

Small update to resolve GIT conflict

40541ad

My method (calculateNumberOfMatches) is no longer valid and GroupNodeViewModel must use a new methods called "findMatches"

Siedlerchr added 2 commits May 22, 2020 17:08

Return true in action helper if file is online link

9287490

otherwise it will be interpreted as path which obiously fails Fixes JabRef#6507

fix checkstyle

d4f23fa

tobiasdiez and others added 24 commits May 28, 2020 18:23

Fix links in the readme

526ba89

updating text

0ce7c8f

updating text

6a1940f

Merge pull request JabRef#6451 from silverhorse/fix-for-issue-5891

ffa07cd

Removed BIB file directory from search when preferences has option unchecked

Switch to upstream version of markdow-lint (JabRef#6544)

d43bcfa

Fixed merge error

c1867e5

Merge pull request JabRef#6518 from JabRef/refactor_tableprefs

41678ce

Refactor main table preferences

Merge pull request JabRef#6550 from JabRef/dependabot/gradle/org.boun…

8ff20f1

…cycastle-bcprov-jdk15on-1.65.01 Bump bcprov-jdk15on from 1.65 to 1.65.01

Merge pull request JabRef#6547 from JabRef/dependabot/gradle/com.vlad…

a852963

…sch.flexmark-flexmark-0.62.0 Bump flexmark from 0.61.32 to 0.62.0

Merge pull request JabRef#6548 from JabRef/dependabot/gradle/com.vlad…

5cb139c

…sch.flexmark-flexmark-ext-gfm-tasklist-0.62.0 Bump flexmark-ext-gfm-tasklist from 0.61.32 to 0.62.0

Restructure first paragraph

8b35b69

Fix html

2c30f20

Add authors

53e8c36

Merge branch '6042(2)' of git://github.com/Gena928/jabref into Gena92…

68f90c0

…8-6042(2)

Adjusted GroupNodeViewModel.java.

684abf6

Now it's responsible for count if items in group (enable / disable, based on user preferences)

Update GroupNodeViewModel.java

2155917

Injected PreferencesService using a constructor call.

30cb675

Update GroupNodeViewModel.java

5c1998f

Merge branch '6042(2)' of https://github.com/Gena928/jabref into 6042(2)

2da0d06

calixtus mentioned this pull request May 29, 2020

Fix Group hit counter calculation preferences #6554

Merged

5 tasks

calixtus approved these changes May 29, 2020

View reviewed changes

koppor closed this Jun 2, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add disable/enable calculation of items in group (2) #6244

Add disable/enable calculation of items in group (2) #6244

Gena928 commented Apr 5, 2020 •

edited

Loading

calixtus left a comment •

edited

Loading

tobiasdiez Apr 5, 2020

Gena928 Apr 6, 2020

Hugoo98 commented Apr 21, 2020 •

edited by koppor

Loading

calixtus commented Apr 22, 2020

calixtus commented Apr 22, 2020

tobiasdiez commented May 21, 2020

Gena928 commented May 21, 2020

tobiasdiez commented May 21, 2020 •

edited

Loading

Gena928 commented May 21, 2020

tobiasdiez left a comment

tobiasdiez May 21, 2020

Gena928 May 21, 2020

Gena928 May 21, 2020

tobiasdiez May 22, 2020

Gena928 commented May 22, 2020 •

edited

Loading

calixtus commented May 29, 2020

koppor commented Jun 2, 2020

Add disable/enable calculation of items in group (2) #6244

Add disable/enable calculation of items in group (2) #6244

Conversation

Gena928 commented Apr 5, 2020 • edited Loading

calixtus left a comment • edited Loading

Choose a reason for hiding this comment

tobiasdiez Apr 5, 2020

Choose a reason for hiding this comment

Gena928 Apr 6, 2020

Choose a reason for hiding this comment

Hugoo98 commented Apr 21, 2020 • edited by koppor Loading

calixtus commented Apr 22, 2020

calixtus commented Apr 22, 2020

tobiasdiez commented May 21, 2020

Gena928 commented May 21, 2020

tobiasdiez commented May 21, 2020 • edited Loading

Gena928 commented May 21, 2020

tobiasdiez left a comment

Choose a reason for hiding this comment

tobiasdiez May 21, 2020

Choose a reason for hiding this comment

Gena928 May 21, 2020

Choose a reason for hiding this comment

Gena928 May 21, 2020

Choose a reason for hiding this comment

tobiasdiez May 22, 2020

Choose a reason for hiding this comment

Gena928 commented May 22, 2020 • edited Loading

calixtus commented May 29, 2020

koppor commented Jun 2, 2020

Gena928 commented Apr 5, 2020 •

edited

Loading

calixtus left a comment •

edited

Loading

Hugoo98 commented Apr 21, 2020 •

edited by koppor

Loading

tobiasdiez commented May 21, 2020 •

edited

Loading

Gena928 commented May 22, 2020 •

edited

Loading