Story/q20 21 #38

pooja-thalur · 2025-02-05T15:55:46Z

Guidelines for Pull Requests

If you haven't yet read our code review guidelines, please do so, You can find them here.

Please confirm the following by adding an x for each item (turn [ ] into [x]).

I have removed all code style changes that are not necessary (e.g. changing blanks across the whole file that don’t need to be changed, adding empty lines in parts other than your own code)
I am not making any changes to files that don’t have any effect (e.g. imports added that don’t need to be added)
I do not have any sysout statements in my code or commented out code that isn’t needed anymore
I am not reformatting any files in the wrong format or without cause.
I am not changing file encoding or line endings to something else than UTF-8, LF
My pull request does not show an insane amount of files being changed although my ticket only requires a few files being changed
I have added Javadoc/documentation where appropriate
I have added test cases where appropriate
I have explained any part of my code/implementation decisions that is not be self-explanatory

Please provide a brief description of your ticket

(you can copy the ticket if it hasn't changed)
https://diging.atlassian.net/browse/Q20-21

...Put description here...
Implement layout for Quadriga 2.0

Anything else the reviewer needs to know?

... describe here ...
This has changes from [Q20-19 ](#23) as well, must be merged after merging Q20-19

…tests

….0 into story/Q20-18

# Conflicts: # quadriga/pom.xml # quadriga/src/main/java/edu/asu/diging/quadriga/core/model/Collection.java # quadriga/src/main/java/edu/asu/diging/quadriga/core/service/CollectionManager.java # quadriga/src/main/java/edu/asu/diging/quadriga/core/service/impl/EventGraphServiceImpl.java # quadriga/src/main/java/edu/asu/diging/quadriga/core/service/impl/MappedTripleGroupServiceImpl.java # quadriga/src/main/java/edu/asu/diging/quadriga/web/DisplayCollectionController.java

# Conflicts: # quadriga/src/main/java/edu/asu/diging/quadriga/api/v1/AddNetworkApiController.java # quadriga/src/main/java/edu/asu/diging/quadriga/core/data/neo4j/PredicateRepository.java # quadriga/src/main/java/edu/asu/diging/quadriga/core/model/Collection.java # quadriga/src/main/java/edu/asu/diging/quadriga/core/service/CollectionManager.java # quadriga/src/main/java/edu/asu/diging/quadriga/core/service/EventGraphService.java # quadriga/src/main/java/edu/asu/diging/quadriga/core/service/impl/CollectionManagerImpl.java # quadriga/src/main/java/edu/asu/diging/quadriga/core/service/impl/EventGraphServiceImpl.java # quadriga/src/main/java/edu/asu/diging/quadriga/legacy/service/impl/RepositoryManager.java # quadriga/src/main/java/edu/asu/diging/quadriga/web/DisplayCollectionController.java # quadriga/src/main/java/edu/asu/diging/quadriga/web/EditCollectionController.java # quadriga/src/main/java/edu/asu/diging/quadriga/web/ListCollectionController.java # quadriga/src/main/webapp/WEB-INF/views/auth/displayCollection.html # quadriga/src/main/webapp/WEB-INF/views/auth/showcollections.html # quadriga/src/test/java/edu/asu/diging/quadriga/core/service/impl/CollectionManagerImplTest.java # quadriga/src/test/java/edu/asu/diging/quadriga/core/service/impl/EventGraphServiceImplTest.java

# Conflicts: # quadriga/src/main/java/edu/asu/diging/quadriga/api/v1/AddNetworkApiController.java # quadriga/src/main/java/edu/asu/diging/quadriga/core/data/EventGraphRepository.java # quadriga/src/main/java/edu/asu/diging/quadriga/core/data/neo4j/PredicateRepository.java # quadriga/src/main/java/edu/asu/diging/quadriga/core/model/Collection.java # quadriga/src/main/java/edu/asu/diging/quadriga/core/model/EventGraph.java # quadriga/src/main/java/edu/asu/diging/quadriga/core/service/CollectionManager.java # quadriga/src/main/java/edu/asu/diging/quadriga/core/service/EventGraphService.java # quadriga/src/main/java/edu/asu/diging/quadriga/core/service/impl/CollectionManagerImpl.java # quadriga/src/main/java/edu/asu/diging/quadriga/core/service/impl/EventGraphServiceImpl.java # quadriga/src/main/java/edu/asu/diging/quadriga/legacy/service/impl/RepositoryManager.java # quadriga/src/main/java/edu/asu/diging/quadriga/web/DisplayCollectionController.java # quadriga/src/main/java/edu/asu/diging/quadriga/web/EditCollectionController.java # quadriga/src/main/java/edu/asu/diging/quadriga/web/ListCollectionController.java # quadriga/src/main/resources/config.properties # quadriga/src/main/webapp/WEB-INF/views/auth/displayCollection.html # quadriga/src/test/java/edu/asu/diging/quadriga/core/service/impl/EventGraphServiceImplTest.java

diging-jenkins · 2025-02-05T15:55:50Z

Can one of the admins verify this patch?

Pooja444 and others added 30 commits August 31, 2021 15:43

[story/Q20-11] completed edit collections implementation, added unit …

03e7120

…tests

[story/Q20-11] addressed review comments for edit collections

e4a5a8b

[story/Q20-11] addressed review comments

0a74117

[story/Q20-12] added collectionId param while submitting network

2ada5f9

[story/Q20-12] added collectionId to EventGraph

19f9069

[story/Q20-3] added token validity check

ba4267b

[Q20-7] Adding Citephere config

2167f2a

[story/Q20-3] added token validation logic

bd62381

[Q20-7] - Fetch apps from citesphere after registering quadriga

3d8be96

[story/Q20-3] completed check token dev, started unit tests

83e9aa8

[Q20-7] - Working on front-end for multiple app selection

df99e9e

[story/Q20-3] partially completed unit tests

a23bc9a

[story/Q20-3] added few more test cases

d31e504

[story/Q20-3] completed all unit tests

b1c48b8

[story/Q20-3] added required=true for authHeader

4b261e3

[Q20-7] - Replaced pop-up selection with list selection

a2a3ccf

[story/Q20-12] changed Objects.isNull to simple null check

5ead2a8

[story/Q20-3] changed Objects.isNull to simple null check

5e63e67

[Q20-7] - Completed front-end for add collections part

e6db79d

[Q20-7] - fixed test case

ecab67d

[story/Q20-18] added view to display collection info

d3cbe2a

[story/Q20-18] added creationTime to network graph

dc4c9c3

[story/Q20-18] added last network submission info

4ddadf0

[story/Q20-12] addressed review comments

27ed3e7

[story/Q20-12] resolved merge conflicts with story Q20-11

ad11972

[story/Q20-12] removed double test cases

82122dc

[story/Q20-12] caught IllegalArgumentException while finding collection

1425d51

[story/Q20-12] removed unnecessary null check

a6375e7

[story/Q20-18] Merge branch 'develop' of github.com:diging/quadriga-2…

f2f3873

….0 into story/Q20-18

[story/Q20-12] removed unncessary file changes

2035910

Prachi Kharge and others added 28 commits May 25, 2022 15:25

[Q20-19] added page and size as request param

5570d08

[Q20-19] pr review comments

6626db7

[Q20-19] review comment

ce57820

[Q20-19] refactor

050afff

[Q20-19] refactor

0a429ba

[Q20-19] Addressed review comments.

4f77dc2

[Q20-19] review comments addressed

2db6fc6

[Q20-19] fixing codefactor issue

7519a39

[Q20-19] codefactor issue

2527a8b

[Q20-19] indentation changes

6fe474e

[Q20-19] upgrading security core dependency

7edb536

[Q20-19] dependency upgrade

09d697f

[Q20-19] jackson dependency upgraded

4228f31

[Q20-19] reverting dependency update changes

c18e489

[Q20-19] unnecessary change removed

5cbc2a1

[Q20-19] resolving review comments

54f4fd2

[Q20-19] addressing review comments

76f159e

[Q20-19] review comments addressed

718301c

[Q20-19] fixed testcases

c361808

[Q20-19] codefactor issues resolved

2f7c527

[Q20-19] codefactor issues fixed

2e028dd

[Q20-19] reverted the config change

996f7d7

[Q20-21] code fix after merging

416ee4f

Merge branch 'develop' into story/Q20-19

34bc8d0

[Q20-21] reverted to new code from Q20-19

59f3c48

pooja-thalur marked this pull request as draft February 5, 2025 16:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Story/q20 21 #38

Story/q20 21 #38

Uh oh!

pooja-thalur commented Feb 5, 2025 •

edited by atlassian bot

Loading

Uh oh!

diging-jenkins commented Feb 5, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Story/q20 21 #38

Are you sure you want to change the base?

Story/q20 21 #38

Uh oh!

Conversation

pooja-thalur commented Feb 5, 2025 • edited by atlassian bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Guidelines for Pull Requests

Please provide a brief description of your ticket

Anything else the reviewer needs to know?

Uh oh!

diging-jenkins commented Feb 5, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

pooja-thalur commented Feb 5, 2025 •

edited by atlassian bot

Loading