Story/vspc 196 #344

ajay3568yadav · 2024-06-05T22:18:16Z

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)

It should be possible to reuse link images

Anything else the reviewer needs to know?

https://diging.atlassian.net/browse/VSPC-196?focusedCommentId=24055

diging-jenkins · 2024-06-05T22:18:19Z

Can one of the admins verify this patch?

jdamerow · 2024-06-10T15:59:28Z

please reopen existing pr so the comment history is kept

jdamerow · 2024-11-08T21:02:04Z

Resolve conflicts please

jdamerow

I'll stop here. There seem to be a bunch of wrong formatting and indentation changes, and in general unnecessary changes. Please fix first before I review.

jdamerow · 2024-11-08T21:02:46Z

vspace/pom.xml

-        <javers.version>5.15.0</javers.version>
+        <spring-security-version>5.3.3.RELEASE</spring-security-version>
+        <thymeleaf.version>3.0.11.RELEASE</thymeleaf.version>
+        <javers.version>5.11.1</javers.version>


is there are reason these are being downgraded?

jdamerow · 2024-11-08T21:02:52Z

vspace/pom.xml

+        <db.url>jdbc:mysql://localhost:3306/vspace?serverTimezone=UTC</db.url>
+        <db.user>root</db.user>
+        <db.password>Metroplaza@2023</db.password>
+        <uploaded.files.path>/Users/ajayyadav/Downloads/Vpsace_images</uploaded.files.path>


should not be changed

jdamerow · 2024-11-08T21:03:03Z

vspace/pom.xml

+    		<groupId>javax.xml.bind</groupId>
+    		<artifactId>jaxb-api</artifactId>
+    		<version>2.3.1</version>
+		</dependency>


jdamerow · 2024-11-08T21:03:14Z

vspace/pom.xml

+			<artifactId>thymeleaf-extras-springsecurity5</artifactId>
+			<version>3.0.3.RELEASE</version>
+		</dependency>
+		


jdamerow · 2024-11-08T21:03:35Z

vspace/pom.xml

@@ -424,4 +406,5 @@
            </plugin>
        </plugins>
    </build>
-</project>
+
+</project>


there are a bunch of versions being downgraded here which they shouldn't

vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManager.java

jdamerow · 2024-11-08T21:06:17Z

vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java

+    protected abstract T getTarget(String linkedId);
+
+    protected abstract U createDisplayLink(L link);
+


I'm so confused, why is this here? I this needed for this ticket?

ah I see, this should not be moved

This came from merging changes from the main branch

jdamerow · 2024-11-08T21:08:27Z

vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddModuleLinkController.java

-            @RequestParam("moduleLinkLabel") String moduleLinkLabel, @RequestParam("moduleType") String displayType,
-            @RequestParam("moduleLinkImage") MultipartFile file)
-            throws NumberFormatException, SpaceDoesNotExistException, IOException, ImageCouldNotBeStoredException {
+	public ResponseEntity<String> createModuleLink(@PathVariable("id") String id, @RequestParam("x") String x,


Indentation is wrong I believe

This reverts commit fda3666. revert

This reverts commit 8f67f83. changeing it back

jdamerow · 2024-11-28T03:00:12Z

vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java

+    protected abstract T getTarget(String linkedId);
+
+    protected abstract U createDisplayLink(L link);
+


jdamerow · 2024-11-28T03:01:03Z

vspace/src/main/resources/exhibitionLanguages.properties

@@ -119,7 +119,7 @@
  { "code": "na", "label": "Nauru" },
  {
    "code": "nb",
-    "label": "Bokm�l, Norwegian; Norwegian Bokm�l"
+    "label": "BokmÂl, Norwegian; Norwegian BokmÂl"


why is this being changed?

jdamerow · 2024-11-28T03:01:25Z

vspace/src/main/resources/exhibitionLanguages.properties

@@ -184,7 +184,7 @@
  { "code": "uz", "label": "Uzbek" },
  { "code": "ve", "label": "Venda" },
  { "code": "vi", "label": "Vietlabelse" },
-  { "code": "vo", "label": "Volap�k" },
+  { "code": "vo", "label": "Volap¸k" },


jdamerow · 2024-11-28T03:01:52Z

vspace/src/main/java/edu/asu/diging/vspace/web/staff/StaffSpaceSearchController.java

+     * @param search This is the search term used to find spaces by name.
+     * @return A ResponseEntity containing a JSON array of spaces (ID and name) and HTTP status OK.
+     */
+


remove empty line

actually what is this javaodc for?

jdamerow · 2024-11-28T03:02:13Z

vspace/src/main/java/edu/asu/diging/vspace/web/staff/StaffSpaceSearchController.java

+
+
+
+


too many empty lines

jdamerow · 2024-11-28T03:02:52Z

vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditExternalLinkController.java

-                display.getPositionY(), display.getRotation(), display.getExternalLink().getExternalLink(), title,
-                displayType, null, null);
+				display.getPositionY(), display.getRotation(), display.getExternalLink().getExternalLink(), title,
+				displayType, null, null);


a lot of wrong indentation in this file

…aces-2.0 into story/vspc-196 merge changes

ajay3568yadav · 2024-12-13T21:47:10Z

there are some code factor issues but I believe they are not currently affecting the app's functionality.

jdamerow · 2024-12-16T19:50:16Z

Make it so, Jenkins.

jdamerow · 2024-12-16T19:52:53Z

there are test failures.

ajay3568yadav added 4 commits May 30, 2024 16:09

VSPC-196 new branch

bc5fd0b

VSPC-196 minor space issue fixed

53ed254

replicating form VSPC-172

0466d24

[VSPC-196] CSS fix for choose from existing

abb5e86

ajay3568yadav closed this Jun 5, 2024

ajay3568yadav added 2 commits June 5, 2024 16:31

VSPC-196 edit module link fixed

8570989

[VSPC-196] fixed edit link

e88f51c

ajay3568yadav reopened this Jun 6, 2024

jdamerow closed this Jun 10, 2024

ajay3568yadav added 12 commits July 2, 2024 16:39

VSPC-196 merge

b4f181d

VSPC-196 added choose from exisitng images option to spaces

83af595

VSPC-196 added choose from existing image to modules

eead7d2

VSPC-196 created custom formatTemplate

f0fb64f

VSPC-196 added choose from exisitng option to the external links

4eb3421

VSPC-196 fixed external module link

8d554ba

VSPC-196 fixed edit links

16e70d5

VSPC-196 external link images not showing

782bc9d

VSPC-196 testing

ac9881b

VSPC-196 edit external links fixed

6181c3c

VSPC-196 removed comments

f438063

VSPC-196 fixed edit module error

a3550c7

ajay3568yadav reopened this Jul 24, 2024

ajay3568yadav added 2 commits August 15, 2024 16:46

VSPC-196 css issue

931c1c7

VSPC-196 undo changes

56ec6cc

ajay3568yadav requested a review from jdamerow November 6, 2024 15:58

jdamerow requested changes Nov 8, 2024

View reviewed changes

jdamerow closed this Nov 8, 2024

Merge branch 'develop' into story/vspc-196

1103247

ajay3568yadav closed this Nov 15, 2024

ajay3568yadav reopened this Nov 20, 2024

Revert "VSPC-196 fixed broken link"

8f67f83

This reverts commit fda3666. revert

ajay3568yadav closed this Nov 20, 2024

ajay3568yadav reopened this Nov 20, 2024

ajay Yadav and others added 2 commits November 20, 2024 16:09

Revert "Revert "VSPC-196 fixed broken link""

574a8fe

This reverts commit 8f67f83. changeing it back

Update pom.xml

3664213

ajay3568yadav closed this Nov 20, 2024

ajay3568yadav reopened this Nov 20, 2024

jdamerow requested changes Nov 28, 2024

View reviewed changes

jdamerow closed this Nov 28, 2024

ajay Yadav added 2 commits December 4, 2024 16:53

VSPC-196 review commnets and other error fixes

b961df0

Merge branch 'story/vspc-196' of https://github.com/diging/virtual-sp…

d43c21c

…aces-2.0 into story/vspc-196 merge changes

ajay3568yadav reopened this Dec 5, 2024

ajay3568yadav closed this Dec 5, 2024

ajay Yadav added 2 commits December 6, 2024 12:54

VSPC-196 fixed test cases

62d4b17

VSPC-196 test fixed

5e06a9c

ajay3568yadav reopened this Dec 13, 2024

VSPC-196 indentation review comment

d836461

jdamerow closed this Dec 16, 2024

ajay3568yadav reopened this Dec 20, 2024

ajay3568yadav closed this Dec 20, 2024

VSPC-196 conflict resolution

0b28067

ajay3568yadav reopened this Dec 20, 2024

ajay3568yadav closed this Jan 2, 2025

ajay3568yadav reopened this Jan 2, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Story/vspc 196 #344

Story/vspc 196 #344

ajay3568yadav commented Jun 5, 2024

diging-jenkins commented Jun 5, 2024

jdamerow commented Jun 10, 2024

jdamerow commented Nov 8, 2024

jdamerow left a comment

jdamerow Nov 8, 2024

jdamerow Nov 8, 2024

jdamerow Nov 8, 2024

jdamerow Nov 8, 2024

jdamerow Nov 8, 2024

jdamerow Nov 8, 2024

jdamerow Nov 8, 2024

jdamerow Nov 28, 2024

ajay3568yadav Dec 4, 2024

jdamerow Nov 8, 2024

jdamerow Nov 28, 2024

jdamerow Nov 28, 2024

jdamerow Nov 28, 2024

jdamerow Nov 28, 2024

jdamerow Nov 28, 2024

jdamerow Nov 28, 2024

jdamerow Nov 28, 2024

ajay3568yadav commented Dec 13, 2024

jdamerow commented Dec 16, 2024

jdamerow commented Dec 16, 2024

		protected abstract T getTarget(String linkedId);

		protected abstract U createDisplayLink(L link);

Story/vspc 196 #344

Are you sure you want to change the base?

Story/vspc 196 #344

Conversation

ajay3568yadav commented Jun 5, 2024

Guidelines for Pull Requests

Please provide a brief description of your ticket

Anything else the reviewer needs to know?

diging-jenkins commented Jun 5, 2024

jdamerow commented Jun 10, 2024

jdamerow commented Nov 8, 2024

jdamerow 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

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ajay3568yadav commented Dec 13, 2024

jdamerow commented Dec 16, 2024

jdamerow commented Dec 16, 2024