Check group type before showing dialog in edit group #8909

LIM0000 · 2022-06-19T07:22:54Z

Previous discussion about when changing a group color, no dialog should appear #8189

Expected behavior: No dialog appears, just the group color should change

Proposed solution

Fixes #8189
Create 2 functions compareGroupType() and compareGroupFields() in GroupTreeViewModel.java to compare

both oldGroup and newGroup group types
groups' fields/properties between oldGroup and newGroup

Warning dialog only appears:

user changes group type (change Collect by)
user modifies any field/property that corresponds to Collect by

Warning dialog does not appear if user modifies:

user changing the name of a group using explicit selection. --> could be fixed in a follow up pull-request
Description
Icon
Color
Hierarchical context

PR checklist:

Change in CHANGELOG.md described in a way that is understandable for the average user (if applicable)
Tests created for changes (if applicable)
Manually tested changed features in running JabRef (always required)
Screenshots added in PR description (for UI changes)
Checked developer's documentation: Is the information available and up to date? If not, I outlined it in this pull request.
Checked documentation: Is the information available and up to date? If not, I created an issue at https://github.com/JabRef/user-documentation/issues or, even better, I submitted a pull request to the documentation repository.

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

…ithout resetting to ExplitGroup

…nctions

…-issue-8189

koppor · 2022-07-11T19:59:06Z

@LIM0000 Thank you for your ongoing work.

We are a project aiming to train software engineering skills. In the concrete PR, we miss test cases. Could you please add test cases for the view model to check the new functionality?

Would it be possible to add an entry to CHANGELOG.md?

* upstream/main: (28 commits) [Bot] Update CSL styles (JabRef#8978) New Crowdin updates (JabRef#8972) New Crowdin updates (JabRef#8969) Fix .bat errorlevel handling with pwsh.exe check (JabRef#8965) revert jsoup version upgrade Fix charset detection with utf16 and others (JabRef#8947) Bump classgraph from 4.8.147 to 4.8.149 (JabRef#8968) Bump jsoup from 1.15.1 to 1.15.2 (JabRef#8967) Keep UTF-8 encoding header if present (JabRef#8964) Cleanup index when opening a library (JabRef#8962) Refactor context menu entry types changing (JabRef#8957) Improvement on check for missing commas when importing or opening a .bib file (JabRef#8840) Disable ResearchGateTest on CI (JabRef#8955) Bump checkstyle from 10.1 to 10.3.1 (JabRef#8950) Bump checkstyle from 10.1 to 10.3.1 (JabRef#8950) Bump mariadb-java-client from 2.7.5 to 2.7.6 (JabRef#8953) Add notification when adding previous entries to new group configuration (JabRef#8919) Remember Sidepane width after restart (JabRef#8936) move "Warn about duplicates on import" preferences option (JabRef#8937) Fix theme switching exception (JabRef#8939) ... # Conflicts: # src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java

* upstream/main: (111 commits) Fix link and remove obsolete FAQ Rename 'Close' to 'Cancel' in the External Changes Resolver dialog (JabRef#9130) Tiny rephrasing Linked files with an absolute path can be opened again (JabRef#9129) Oberservable Preferences M (CleanupPreferences) (JabRef#9126) fix broken link Fix broken link Fix old JabRef linked files containing the file directory as element in the filename (JabRef#9046) PDFs are not stored next to .bib file if file directory is configured (JabRef#9113) Remove double stateManager.activeDatabaseProperty() (JabRef#9127) Don't show the info button when the authors field content is identical (JabRef#9128) "study.yml" is static now (JabRef#9125) fix l10n Compile fix Fix parsing of JabRef v5.7 study.yml files (JabRef#9124) Fix integrity check for tilde accents in author names (JabRef#9097) Rework the Define study parameters dialog (JabRef#9123) Fix parsing of save actions (JabRef#9122) Fix exception that occurs when saving name formatters (JabRef#9121) Refine code for BibEntry#replaceDownloadedFile (JabRef#9118) ...

ThiloteE · 2022-09-04T16:30:50Z

👍

add tests

* upstream/main: Anomaly with Title case and Sentence case JabRef#9112 (JabRef#9142) Fixed save order config (JabRef#9148) Update devdocs about fetchers (JabRef#9146) Set 'Update refused' dialog title (JabRef#9143) Bump jackson-datatype-jsr310 from 2.13.3 to 2.13.4 (JabRef#9136) Bump jackson-dataformat-yaml from 2.13.3 to 2.13.4 (JabRef#9138) Observable Preferences N (PushToApplicationPreferences, ExternalApplicationPreferences) (JabRef#9135) Resimplify Action interface (JabRef#9133) Fix issue with empty fallback directory (JabRef#9134) Fix indexing (JabRef#9132) SLR data is now editable (JabRef#9131)

not really sure what happns when you have more than 2 groups

* upstream/main: Fix missing CSS for some dialogs (JabRef#9150) Bump org.eclipse.jgit from 6.2.0.202206071550-r to 6.3.0.202209071007-r (JabRef#9152) Bump mockito-core from 4.7.0 to 4.8.0 (JabRef#9151) [GSOC22] - D - Test the Three Way Merge UI (JabRef#9069)

* upstream/main: Update to jfx 19 (JabRef#9155) Squashed 'buildres/csl/csl-styles/' changes from 8d69f16..201e022 Clarify the duplicates resolver dialog actions (JabRef#9140)

rename methods

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

src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java

* upstream/main: (27 commits) Bump slf4j-api from 2.0.2 to 2.0.3 (JabRef#9207) Bump slf4j-api from 2.0.2 to 2.0.3 in /buildSrc (JabRef#9211) Add mappings on ModsImporter.java (JabRef#9193) Improve installation of java 18 in devcontainer (JabRef#9197) Fix missing title for "customize entry types" (JabRef#9198) (JabRef#9201) Squashed 'buildres/csl/csl-locales/' changes from b2afeb4d87..cb98d36691 Squashed 'buildres/csl/csl-styles/' changes from 201e022..7bde3e4 "Capitalize" capitalizes words after hyphens (JabRef#9186) Observable Preferences O (Language and FileHistory) (JabRef#9173) Fix jakarta annotation missing (JabRef#9183) Bump junit-platform-launcher from 1.9.0 to 1.9.1 (JabRef#9177) Bump WyriHaximus/github-action-wait-for-status from 1.6 to 1.7.1 (JabRef#9178) Bump junit-jupiter from 5.9.0 to 5.9.1 (JabRef#9180) Bump checkstyle from 10.3.3 to 10.3.4 (JabRef#9179) Bump slf4j-api from 2.0.1 to 2.0.2 (JabRef#9181) Bump slf4j-api from 2.0.1 to 2.0.2 in /buildSrc (JabRef#9182) Remove Java Flight Recorder (JabRef#9174) Fixes fetcher tests (JabRef#9175) Update afterburner to jakarta (JabRef#9168) Improve startup-behavior of pdf indexer (JabRef#9166) ...

Siedlerchr · 2022-10-10T08:46:40Z

I merge now.

* upstream/main: Check group type before showing dialog in edit group (JabRef#8909) Fix unexpected closing of preferences dialog (JabRef#9225) Fix typo in connection error message (JabRef#9226) # Conflicts: # src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java

* upstream/main: (42 commits) Place subgroups w.r.t. alphabetical ordering (#9228) DOAB Fetcher now fetches ISBN and imprint fields where possible (#9229) ISSUE-9145: implement isbn fetcher (#9205) Remove explicit javafx jmod stuff (#9245) New Crowdin updates (#9239) Support Arabic language (#9243) Process CLI arguments before starting gui (#9217) Update README Decision Records link (#9241) Opening a file removes duplicate keywords and triggers lib changed (#9216) New Crowdin updates (#9237) Add Ukrainian as language (#9236) Add ADR-0026 on using Swing's FileChooser (#9235) Log exception (#9227) Fix archunit (#9234) Bump tika-core from 2.4.1 to 2.5.0 (#9232) Check group type before showing dialog in edit group (#8909) Fix unexpected closing of preferences dialog (#9225) Fix typo in connection error message (#9226) Improve VSCode config (#9218) Searching for an entry on the web shouldn't take forever (#9199) ... # Conflicts: # build.gradle # lib/afterburner.fx.jar # src/main/java/org/jabref/cli/Launcher.java # src/main/java/org/jabref/gui/EntryTypeView.java # src/main/java/org/jabref/gui/auximport/FromAuxDialog.java # src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java # src/main/java/org/jabref/gui/collab/ExternalChangesResolverDialog.java # src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.java # src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java # src/main/java/org/jabref/gui/customentrytypes/CustomizeEntryTypeDialogView.java # src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java # src/main/java/org/jabref/gui/edit/ManageKeywordsDialog.java # src/main/java/org/jabref/gui/entryeditor/EntryEditor.java # src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java # src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java # src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java # src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java # src/main/java/org/jabref/gui/help/AboutDialogView.java # src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialog.java # src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java # src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java # src/main/java/org/jabref/gui/libraryproperties/AbstractPropertiesTabView.java # src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesView.java # src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesView.java # src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesView.java # src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesView.java # src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesView.java # src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java # src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java # src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java # src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java # src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java # src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.java # src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java # src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.java # src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java # src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java # src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.java # src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java # src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java # src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java # src/main/java/org/jabref/gui/texparser/ParseLatexDialogView.java # src/main/java/org/jabref/gui/texparser/ParseLatexResultView.java

Fix JabRef#8189 by checking group type

4160f51

ThiloteE added the groups label Jun 19, 2022

Siedlerchr reviewed Jun 20, 2022

View reviewed changes

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

LIM0000 added 3 commits June 21, 2022 17:29

Update different solution that is capable to prevent warning dialog w…

ba4e486

…ithout resetting to ExplitGroup

Split groupType checking and groupFields checking into 2 different fu…

556e954

…nctions

Merge branch 'main' of https://github.com/LIM0000/jabref into fix-for…

a4643e8

…-issue-8189

ThiloteE added this to the v5.7 milestone Jul 14, 2022

koppor modified the milestones: v5.7, v5.8 Aug 8, 2022

Siedlerchr added 3 commits September 4, 2022 12:30

add check before dialog

eaac2e9

write groups always

c7c085a

Siedlerchr marked this pull request as ready for review September 4, 2022 11:05

Siedlerchr added 7 commits September 4, 2022 13:21

refersh

a618152

store group changes

56c1c86

rfactor code

e5b0c90

refactor with intanceof

e6a105c

refactor

3c1e409

fix stupid instanceof error^^

cea4e2b

checkstyle

69b03ec

Siedlerchr added 4 commits September 4, 2022 21:43

use getclass everywhere add comment

8f4849e

Change or to and, only return true if no changes

b80d878

add tests

fuu checkstyle

ff18bb5

javadoc checkstyle

898e1fc

Siedlerchr self-assigned this Sep 5, 2022

Siedlerchr added 2 commits September 10, 2022 19:32

TODO: clarifiy behavior when changing the groups name

9150938

not really sure what happns when you have more than 2 groups

Siedlerchr added 7 commits September 12, 2022 20:06

automatically assign when more than one group

78a3cd7

use new name

a1fad49

todo

860b749

Merge remote-tracking branch 'upstream/main' into fix-for-issue-8189

5436087

* upstream/main: Update to jfx 19 (JabRef#9155) Squashed 'buildres/csl/csl-styles/' changes from 8d69f16..201e022 Clarify the duplicates resolver dialog actions (JabRef#9140)

we need to check old group name

b5a340c

rename methods

checkstyle

2d45980

calixtus reviewed Sep 26, 2022

View reviewed changes

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

calixtus reviewed Sep 26, 2022

View reviewed changes

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

calixtus reviewed Sep 26, 2022

View reviewed changes

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

calixtus reviewed Sep 26, 2022

View reviewed changes

src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java Show resolved Hide resolved

Siedlerchr added 2 commits October 3, 2022 17:56

Only check for minor mods if group types are equal

fa69ec7

Siedlerchr added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Oct 4, 2022

Siedlerchr merged commit 052fdf5 into JabRef:main Oct 10, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Check group type before showing dialog in edit group #8909

Check group type before showing dialog in edit group #8909

LIM0000 commented Jun 19, 2022 •

edited by ThiloteE

koppor commented Jul 11, 2022

ThiloteE commented Sep 4, 2022

Siedlerchr commented Oct 10, 2022

Check group type before showing dialog in edit group #8909

Check group type before showing dialog in edit group #8909

Conversation

LIM0000 commented Jun 19, 2022 • edited by ThiloteE

Previous discussion about when changing a group color, no dialog should appear #8189

Proposed solution

PR checklist:

koppor commented Jul 11, 2022

ThiloteE commented Sep 4, 2022

Siedlerchr commented Oct 10, 2022

LIM0000 commented Jun 19, 2022 •

edited by ThiloteE