Skip to content

Story/vspc 196 #344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ajay3568yadav wants to merge 43 commits into
base: develop
Choose a base branch
from
Open

Story/vspc 196 #344

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
bc5fd0b
VSPC-196 new branch
ajay3568yadav May 30, 2024
53ed254
VSPC-196 minor space issue fixed
ajay3568yadav May 31, 2024
0466d24
replicating form VSPC-172
ajay3568yadav Jun 3, 2024
abb5e86
[VSPC-196] CSS fix for choose from existing
ajay3568yadav Jun 3, 2024
8570989
VSPC-196 edit module link fixed
ajay3568yadav Jun 5, 2024
e88f51c
[VSPC-196] fixed edit link
ajay3568yadav Jun 6, 2024
b4f181d
VSPC-196 merge
ajay3568yadav Jul 2, 2024
83af595
VSPC-196 added choose from exisitng images option to spaces
ajay3568yadav Jul 3, 2024
eead7d2
VSPC-196 added choose from existing image to modules
ajay3568yadav Jul 5, 2024
f0fb64f
VSPC-196 created custom formatTemplate
ajay3568yadav Jul 8, 2024
4eb3421
VSPC-196 added choose from exisitng option to the external links
ajay3568yadav Jul 10, 2024
8d554ba
VSPC-196 fixed external module link
ajay3568yadav Jul 11, 2024
16e70d5
VSPC-196 fixed edit links
ajay3568yadav Jul 12, 2024
782bc9d
VSPC-196 external link images not showing
ajay3568yadav Jul 18, 2024
ac9881b
VSPC-196 testing
ajay3568yadav Jul 19, 2024
6181c3c
VSPC-196 edit external links fixed
ajay3568yadav Jul 24, 2024
f438063
VSPC-196 removed comments
ajay3568yadav Jul 24, 2024
a3550c7
VSPC-196 fixed edit module error
ajay3568yadav Jul 24, 2024
931c1c7
VSPC-196 css issue
ajay3568yadav Aug 15, 2024
56ec6cc
VSPC-196 undo changes
ajay3568yadav Aug 16, 2024
bb8bab3
VSPC-196 review comments
Nov 13, 2024
757fd0b
VSPC-196 before merge
Nov 13, 2024
75e74b3
VSPC-196 revert
Nov 13, 2024
cd55e23
Merge branch 'develop' into story/vspc-196
Nov 13, 2024
fda3666
VSPC-196 fixed broken link
Nov 15, 2024
1103247
Merge branch 'develop' into story/vspc-196
ajay3568yadav Nov 15, 2024
8f67f83
Revert "VSPC-196 fixed broken link"
Nov 20, 2024
574a8fe
Revert "Revert "VSPC-196 fixed broken link""
Nov 20, 2024
3664213
Update pom.xml
ajay3568yadav Nov 20, 2024
b961df0
VSPC-196 review commnets and other error fixes
Dec 4, 2024
d43c21c
Merge branch 'story/vspc-196' of https://github.com/diging/virtual-sp…
Dec 4, 2024
62d4b17
VSPC-196 fixed test cases
Dec 6, 2024
5e06a9c
VSPC-196 test fixed
Dec 13, 2024
d836461
VSPC-196 indentation review comment
Dec 13, 2024
0b28067
VSPC-196 conflict resolution
Dec 20, 2024
3d1e014
VSPC-196 compilation errors fixed
Jan 6, 2025
628a36d
VSPC-196 added exception handler
Jan 8, 2025
6b5abca
VSPC-196 build failur fix added exceptions handlers
Jan 9, 2025
c881484
VSPC-196 build errors fixed
Jan 24, 2025
0ee7527
VSPC-196 review comments
Feb 7, 2025
9a8996e
VSPC-196 merge with develop
ajay3568yadav Jun 20, 2025
9a875e6
VSPC-196 bug fix attempt
ajay3568yadav Jun 26, 2025
939ee9b
VSPC-196 build fail fix
ajay3568yadav Jul 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions vspace/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
Expand All @@ -27,20 +29,12 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="test" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="target/generated-sources/annotations">
Expand All @@ -49,4 +43,4 @@
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
</classpath>
135 changes: 59 additions & 76 deletions vspace/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,24 @@

<properties>
<org.slf4j-version>1.7.5</org.slf4j-version>
<spring.version>5.3.0</spring.version>
<spring.version>5.0.19.RELEASE</spring.version>
<spring-data.version>Kay-SR8</spring-data.version>
<spring-security-version>5.7.12</spring-security-version>
<thymeleaf.version>3.0.13.RELEASE</thymeleaf.version>
<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>

@jdamerow jdamerow Nov 8, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there are reason these are being downgraded?

<simple-users-version>0.5</simple-users-version>
<admin.username>admin</admin.username>
<admin.password>$2a$04$ug2wdYfAW8Ey/DwjUdPuLufgrMqbhNnTmr1QEUNZnoWF1xGitSBae</admin.password>
<staff.password>$2a$04$QhdsxRoZPJw/G06aDkP6COLARKtbdTxVvxtKPZUE0dFlNKFMZsXRe</staff.password>

<log.level>debug</log.level>

<db.driver>com.mysql.jdbc.Driver</db.driver>
<db.url>jdbc:mysql://localhost:3306/vspace?serverTimezone=UTC&amp;useEncoding=true</db.url>
<db.user>vspace</db.user>
<db.password>vspace</db.password>
<uploaded.files.path></uploaded.files.path>

<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>

@jdamerow jdamerow Nov 8, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should not be changed

<email.user></email.user>
<email.password></email.password>
<email.host></email.host>
Expand All @@ -37,7 +38,7 @@
<tomcat.deploy.path></tomcat.deploy.path>
<tomcat.app.name>vspace</tomcat.app.name>
<tomcat.server.id>TomcatServer</tomcat.server.id>

<hibernate.show_sql></hibernate.show_sql>
<buildNumber>v0.16.1</buildNumber>
</properties>
Expand Down Expand Up @@ -77,6 +78,17 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>

@jdamerow jdamerow Nov 8, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

formatting


<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
Expand All @@ -96,11 +108,6 @@
<version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>

<!-- Spring Security -->
<dependency>
Expand Down Expand Up @@ -191,55 +198,35 @@
</exclusions>
<scope>runtime</scope>
</dependency>

<!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.4.0-b180830.0359</version>
</dependency>
<!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-core -->
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>3.0.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-impl -->
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>3.0.2</version>
</dependency>



<!-- MarkDown -->
<dependency>
<groupId>com.atlassian.commonmark</groupId>
<artifactId>commonmark</artifactId>
<version>0.15.0</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.thymeleaf/thymeleaf-spring5 -->
<dependency>
<groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf-spring5</artifactId>
<version>${thymeleaf.version}</version>
</dependency>

<!-- https://mvnrepository.com/artifact/nz.net.ultraq.thymeleaf/thymeleaf-layout-dialect -->
<dependency>
<groupId>nz.net.ultraq.thymeleaf</groupId>
<artifactId>thymeleaf-layout-dialect</artifactId>
<version>2.4.0</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.thymeleaf.extras/thymeleaf-extras-springsecurity5 -->
<dependency>
<groupId>org.thymeleaf.extras</groupId>
<artifactId>thymeleaf-extras-springsecurity5</artifactId>
<version>3.0.3.RELEASE</version>
</dependency>

<dependency>
<groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf-spring5</artifactId>
<version>${thymeleaf.version}</version>
</dependency>

<!-- https://mvnrepository.com/artifact/nz.net.ultraq.thymeleaf/thymeleaf-layout-dialect -->
<dependency>
<groupId>nz.net.ultraq.thymeleaf</groupId>
<artifactId>thymeleaf-layout-dialect</artifactId>
<version>2.4.0</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.thymeleaf.extras/thymeleaf-extras-springsecurity5 -->
<dependency>
<groupId>org.thymeleaf.extras</groupId>
<artifactId>thymeleaf-extras-springsecurity5</artifactId>
<version>3.0.3.RELEASE</version>
</dependency>

@jdamerow jdamerow Nov 8, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

formatting

<!-- Testing -->
<!-- https://mvnrepository.com/artifact/junit/junit -->
<dependency>
Expand All @@ -254,8 +241,8 @@
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>


<!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
<dependency>
<groupId>org.mockito</groupId>
Expand Down Expand Up @@ -304,20 +291,20 @@

<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>5.4.24.Final</version>
<artifactId>hibernate-entitymanager</artifactId>
<version>5.3.2.Final</version>
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.28</version>
<version>8.0.16</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.12.6.1</version>
<version>2.10.0.pr1</version>
</dependency>

<!-- Javers -->
Expand Down Expand Up @@ -349,7 +336,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.5</version>
<version>1.3.3</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Expand All @@ -360,12 +347,7 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<version>1.28.3</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>2.12.6</version>
<version>1.22</version>
</dependency>
</dependencies>

Expand All @@ -378,15 +360,14 @@
<excludes>
<exclude>**/*.woff</exclude>
<exclude>**/*.ttf</exclude>
<exclude>**/*.woff2</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.3.1</version>
<version>2.6</version>
<configuration>
<webResources>
<resource>
Expand All @@ -397,8 +378,9 @@
</includes>
<excludes>
<exclude>**/*.woff</exclude>
<exclude>**/*.ttf</exclude>
<exclude>**/*.woff2</exclude>
<exclude>**/*.ttf</exclude>
<exclude>**/*.eot</exclude>
</excludes>
</resource>

Expand All @@ -408,8 +390,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>11</source>
<target>11</target>
</configuration>
</plugin>
<plugin>
Expand All @@ -424,4 +406,5 @@
</plugin>
</plugins>
</build>
</project>

</project>

@jdamerow jdamerow Nov 8, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

1 change: 1 addition & 0 deletions vspace/src/main/java/edu/asu/diging/vspace/core/data/SpaceRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,5 @@ public interface SpaceRepository extends PagingAndSortingRepository<Space, Strin

Page<ISpace> findDistinctByNameContainingOrDescriptionContaining(Pageable requestedPage, String name,
String description);
List<Space> findByNameLike(String name);
}
13 changes: 7 additions & 6 deletions vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package edu.asu.diging.vspace.core.services;

import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
import edu.asu.diging.vspace.core.exception.ImageDoesNotExistException;
import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
import edu.asu.diging.vspace.core.model.IExternalLink;
Expand All @@ -12,11 +13,11 @@
public interface IExternalLinkManager extends ILinkManager<IExternalLink, ExternalLinkValue, IExternalLinkDisplay>{

IExternalLinkDisplay createLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename,ExternalLinkDisplayMode howToOpen)
throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, SpaceDoesNotExistException;
String linkLabel, String desc, DisplayType displayType, byte[] linkImage, String imageFilename,ExternalLinkDisplayMode howToOpen, String imageId)
throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, SpaceDoesNotExistException, ImageDoesNotExistException;

IExternalLinkDisplay updateLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
String imageFilename,ExternalLinkDisplayMode howToOpen)
throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException;
}
String linkLabel, String desc, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
String imageFilename, String existingImageId, ExternalLinkDisplayMode howToOpen)
throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException, ImageDoesNotExistException;
}
14 changes: 8 additions & 6 deletions vspace/src/main/java/edu/asu/diging/vspace/core/services/ILinkManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,28 @@
import java.util.List;

import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
import edu.asu.diging.vspace.core.exception.ImageDoesNotExistException;
import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
import edu.asu.diging.vspace.core.model.ILink;
import edu.asu.diging.vspace.core.model.IVSpaceElement;
import edu.asu.diging.vspace.core.model.display.DisplayType;
import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
import edu.asu.diging.vspace.core.model.display.ILinkDisplay;

public interface ILinkManager<L extends ILink<T>, T extends IVSpaceElement, U extends ILinkDisplay> {

U createLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename)
throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, SpaceDoesNotExistException;
String linkLabel, String linkDesc, DisplayType displayType, byte[] linkImage, String imageFilename, String existingImageId)
throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, SpaceDoesNotExistException, ImageDoesNotExistException;

U updateLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
String imageFilename)
throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException;
String linkLabel, String linkDesc, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
String imageFilename, String existingImageId)
throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException, ImageDoesNotExistException;

List<U> getLinkDisplays(String spaceId);

void deleteLink(String linkId);

}
}
2 changes: 2 additions & 0 deletions vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpaceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,6 @@ public interface ISpaceManager {
Iterable<Space> addIncomingLinkInfoToSpaces(Iterable<Space> spaces);

Page<ISpace> findByNameOrDescription(Pageable requestedPage,String searchText);

List<ISpace> findByName(String searchText);
}
Loading