[CITE-162] Implemented a new View Modal for Giles uploaded and Extracted #178

Charishma0249 · 2021-10-08T20:59:27Z

Files

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)

Right now, if a user has uploaded a file to Citesphere, they can download the originally uploaded file. However, all the files that Giles creates (extracted text, OCR, individual pages) can't be downloaded. Basically, the user should be able to do that. Maybe a new modal opens or a new page if the user clicks on a file and it shows all the files that belong to the upload. The user can then choose a file to download.

Anything else the reviewer needs to know?

... describe here ...

Files

diging-jenkins · 2021-10-08T20:59:29Z

Can one of the admins verify this patch?

jdamerow · 2022-01-05T20:10:11Z

Make it so, Jenkins.

diging-jenkins · 2022-01-05T20:11:23Z

Jenkins successfully deployed Citesphere to be reviewed!

jdamerow · 2022-01-05T21:03:07Z

clicking on the extracted text throws a not found error (pdf works)
and also, all the extracted pages are missing, e.g. for the pdf I've uploaded:

Charishma0249 · 2022-03-03T15:54:53Z

Addressed review comments

diging-jenkins · 2022-03-03T15:58:26Z

Jenkins successfully deployed Citesphere to be reviewed!

jdamerow · 2022-03-17T17:10:44Z

citesphere/src/main/java/edu/asu/diging/citesphere/web/user/GilesDocumentController.java


        ICitation citation = citationManager.getCitation(itemId);
-        Optional<IGilesUpload> uploadOptional = citation.getGilesUploads().stream().filter(u -> u.getUploadedFile() != null).filter(g -> g.getUploadedFile().getId().equals(fileId)).findFirst();
+        Optional<IGilesUpload> uploadOptional = citation.getGilesUploads().stream().filter(u -> u.getUploadedFile() != null).filter(g -> g.getUploadedFile().getId().equals(fileId) || g.getExtractedText().getId().equals(fileId) || g.getPages().stream().filter(p -> p!=null).anyMatch(a -> a.getImage().getId().equals(fileId) || a.getText().getId().equals(fileId) || a.getOcr().getId().equals(fileId) || a.getAdditionalFiles().stream().filter(f -> f!=null).anyMatch(f -> f.getId().equals(fileId)))).findFirst();


at the minimum this line needs to be reformatted (it's way too long). Even better would be to rewrite it so it's clearer what it does.

jdamerow · 2022-03-17T17:11:05Z

Make it so, Jenkins.

diging-jenkins · 2022-03-17T17:13:23Z

Jenkins successfully deployed Citesphere to be reviewed!

jdamerow · 2022-03-17T17:18:19Z

On the front end, the module should have the structure:

Uploaded file: filename
Extracted text: filename
Page 1
- Image: filename
- Extracted text: filename
- OCR: filename
Page 2
- ...

etc.

…odal

diging-jenkins · 2023-10-10T18:34:06Z

Jenkins successfully deployed Citesphere to be reviewed!

jdamerow · 2024-04-02T14:14:37Z

citesphere/src/main/java/edu/asu/diging/citesphere/web/user/GilesDocumentController.java

    }
+
+
+    private static Stream<IGilesFile> generateStream(List<IGilesUpload> uploadOptionalList) {


why is this method static?

jdamerow · 2024-04-02T14:15:52Z

citesphere/src/main/webapp/WEB-INF/views/auth/group/item.html

+	        
+	        $("#viewUploadBody modal-body page-title").empty();
+	        $("#viewUploadBody modal-body page-list").empty();
+	    }); */


delete if not needed

jdamerow · 2024-04-02T14:16:00Z

citesphere/src/main/webapp/WEB-INF/views/auth/group/item.html

+	    /* $(uploadItem).children().each(function() {
+	        // Clear content of each child element
+	    	$('#page-list').empty();
+	    }); */


delete if not needed

jdamerow · 2024-04-02T14:16:43Z

citesphere/src/main/webapp/WEB-INF/views/auth/group/item.html

+	function showFiles(modalName, item) {
+
+		var uploadItem = $(item);
+		var modalNameLCase = modalName.toLowerCase();


indentation

jdamerow · 2024-04-02T14:19:45Z

citesphere/src/main/webapp/WEB-INF/views/auth/group/item.html

+            </div>
+       </div>
+    </div>
+


I think all of these can be simplified by just creating a model for each upload and then show/hide those modals when the user clicks on an upload in the list. There is not javascript really needed (beyond opening/closing the modal).

diging-jenkins · 2025-09-10T15:53:12Z

Jenkins successfully deployed Citesphere to be reviewed!

[CITE-162] Implemented a new View Modal for Giles uploaded and Extracted

87cd872

Files

Charishma0249 requested review from MaulikLim, jdamerow and tjquinn1 October 8, 2021 21:00

Charishma0249 added 3 commits October 8, 2021 14:04

[CITE-162] Formatted indentations

5fe4766

[CITE-162] Formatted Indentations

25b280b

[CITE-162] Formatted indentations

2584f67

Charishma0249 requested a review from NarmadaRavali October 8, 2021 23:43

MaulikLim approved these changes Oct 11, 2021

View reviewed changes

jdamerow closed this Jan 5, 2022

Charishma0249 added 2 commits February 24, 2022 14:04

[CITE-162] Addressed review comments

54d6bb2

[CITE-162] Removed console logs

c3f4775

Charishma0249 reopened this Mar 3, 2022

Charishma0249 added 4 commits March 10, 2022 13:05

[CITE-162]Addressed review comments

d206620

[CITE-162]Fixed Indentation issues

0079897

[CITE-162] Fixed Indentation issues

257461b

[CITE-162] Fixed indentation issues

fbb42c8

jdamerow requested changes Mar 17, 2022

View reviewed changes

jdamerow closed this Mar 17, 2022

Charishma0249 added 2 commits March 22, 2022 16:36

[CITE-162] Address review comments

0794729

[CITE-162] Addressed review comments

ae1b349

Charishma0249 and others added 18 commits October 4, 2022 15:30

[CITE-162] Addressing review comments

e6a471c

[CITE-162] Address review comments

006b6f4

[CITE-162] Address review comments

4672273

[CITE-162] Addressing review comments - code clean up

8db3efc

[CITE-162] Addressing review comments

e99d13d

[CITE-162] Addressing review comments

02b3370

[CITE-162] Addressing review comments

2328453

[CITE-162] Addressing review comments

14fa940

[CITE-162] Addressing review comments

c965f81

[CITE-162] Addressing review comments

3f15692

[CITE-162] Addressing review comments

a789c5b

[CITE-162] Addressing review comments

b6eba77

Merge branch 'develop' into story/CITE-162

dd3554a

[CITE-162] Changes to UI and API change

09730c9

[GECO-162] Changing to stream

9a3df54

[CITE-162] Removing fileId check

9e5e88c

[CITE-162] Update to controller and view

bd7d499

[CITE:162] Fix duplication issue and files interleaving with upload m…

1b2955a

…odal

diya17 reopened this Oct 10, 2023

jdamerow requested changes Apr 2, 2024

View reviewed changes

jdamerow closed this Apr 2, 2024

diya17 and others added 6 commits April 19, 2024 13:05

[CITE-162] Making controller changes

df3b383

Merge branch 'develop' into story/CITE-162

28fdb53

[CITE-162] Uncomment showfile function

bc2e321

[CITE-162] Update giles document controller

4ec23db

[CITE-162] Add citation validations

9691892

[CITE-162] Fix file not found errors in GilesDocumentController

b1d3a9b

rajvi-patel-22 reopened this Sep 10, 2025

		}


		private static Stream<IGilesFile> generateStream(List<IGilesUpload> uploadOptionalList) {

[CITE-162] Implemented a new View Modal for Giles uploaded and Extracted #178

Are you sure you want to change the base?

[CITE-162] Implemented a new View Modal for Giles uploaded and Extracted #178

Conversation

Charishma0249 commented Oct 8, 2021 • edited 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 Oct 8, 2021

Uh oh!

jdamerow commented Jan 5, 2022

Uh oh!

diging-jenkins commented Jan 5, 2022

Uh oh!

jdamerow commented Jan 5, 2022

Uh oh!

Charishma0249 commented Mar 3, 2022

Uh oh!

diging-jenkins commented Mar 3, 2022

Uh oh!

jdamerow Mar 17, 2022

Choose a reason for hiding this comment

Uh oh!

jdamerow commented Mar 17, 2022

Uh oh!

diging-jenkins commented Mar 17, 2022

Uh oh!

jdamerow commented Mar 17, 2022

Uh oh!

diging-jenkins commented Oct 10, 2023

Uh oh!

jdamerow Apr 2, 2024

Choose a reason for hiding this comment

Uh oh!

jdamerow Apr 2, 2024

Choose a reason for hiding this comment

Uh oh!

jdamerow Apr 2, 2024

Choose a reason for hiding this comment

Uh oh!

jdamerow Apr 2, 2024

Choose a reason for hiding this comment

Uh oh!

jdamerow Apr 2, 2024

Choose a reason for hiding this comment

Uh oh!

diging-jenkins commented Sep 10, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Charishma0249 commented Oct 8, 2021 •

edited

Loading