Story/vspc 190 A user should be able to define the order spaces appear in the site menu of the public page #277

glend17 · 2022-02-09T20:55:26Z

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)

...Put description here...

Right now, on the public site, the menu simply lists all published spaces. The user has no control over the order. For this ticket two things should be implemented:

by default the spaces should be ordered alphabetically by name

a user should be able to switch between alphabetically ordered, ordered by creation date, and a custom order.

For the custom order, there should be a page (on the staff side) that lists all spaces and the user can simply arrange them in the order they should be shown.

Anything else the reviewer needs to know?

User can choose if they have to arrange spaces alphabetically or through creation date or a custom order in spaces on the staff site.
They can create custom orders in the custom order page on the staff site. Alphabetical is default, if user chooses custom but does not select an order it will fall back to alphabetical order.

…y user instead of drag and drop

…nges

vspace/src/main/java/edu/asu/diging/vspace/core/model/ExhibitionSpaceOrderMode.java

jdamerow · 2024-08-20T19:40:45Z

vspace/src/main/java/edu/asu/diging/vspace/core/model/ExhibitionSpaceOrderMode.java

+        return value;
+    }
+
+    public static List<String> getAllValues() {


you can probably just get rid of the values, and simply pass ALPHABETICAL or CREATION_DATE as request parameter. Then you can use the valueOf method to get an enum.

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

jdamerow · 2024-08-20T19:44:43Z

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

+     * @param publishedSpaces
+     * @return list of {@link ISpace}
+     */
+    private List<ISpace> sortSpacesOnCreationDate(List<ISpace> publishedSpaces){


jdamerow · 2024-08-20T20:03:54Z

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

+            attributes.addFlashAttribute("alertType", "danger");
+            attributes.addFlashAttribute("message", "Custom order could not be updated. The title field is empty.");
+            attributes.addFlashAttribute("showAlert", "true");
+            return "redirect:/staff/space/order/"+spacesCustomOrderId;


same as before, data should not be lost.

jdamerow · 2024-08-20T20:04:09Z

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

+    @Autowired
+    private ISpacesCustomOrderManager spacesCustomOrderManager;
+
+    @RequestMapping(value = "/staff/space/order/{customOrderId}/edit/info", method = RequestMethod.POST)


and then this url can just be /staff/space/order/{customOrderId}

jdamerow · 2024-08-20T20:05:01Z

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

+    }
+
+    @RequestMapping(value = "/staff/space/order/{customOrderId}/edit/spaceorders", method = RequestMethod.POST)
+    public String saveOrder(


is there are reason, name/description and order are not stored together in one call?

right now, only the order can be changed on the edit page, and on the same page, there is a separate option to edit the name/description, which opens a popup to edit and save only the name/description.

Should we keep it all together (name, description and order) in one page?

yes, I don't see a reason not to

jdamerow · 2024-08-20T20:07:12Z

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

+ */
+
+@Controller
+public class StaffSpaceCustomOrderController {


name should make clear what this controller is for

jdamerow · 2024-08-20T20:08:37Z

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

+import edu.asu.diging.vspace.core.services.ISpacesCustomOrderManager;
+
+@Controller
+public class UpdateStaffSpaceOrderModeController {


why is this called ...StaffSpace... not just ...Space...? There is not equivalent for the public page, right? This controller does not need to be contrasted with another one for the public site?

jdamerow · 2024-09-27T17:55:58Z

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

+                .getSpacesCustomOrder();
+        if(spaceCustomOrder!=null && spaceCustomOrder.getId().equals(id)) {
+            exhibition.setSpacesCustomOrder(null);
+            exhibitionManager.storeExhibition((Exhibition)exhibition);


jdamerow · 2024-09-27T17:59:53Z

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

+            attributes.addFlashAttribute("alertType", "danger");
+            attributes.addFlashAttribute("message", "Custom order could not be saved. Please enter the name of the order.");
+            attributes.addFlashAttribute("showAlert", "true");
+            return "redirect:/staff/space/order/add";


jdamerow · 2024-09-27T18:00:11Z

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

+            attributes.addFlashAttribute("alertType", "danger");
+            attributes.addFlashAttribute("message", "Custom order could not be updated. The title field is empty.");
+            attributes.addFlashAttribute("showAlert", "true");
+            return "redirect:/staff/space/order/"+spacesCustomOrderId;


jdamerow · 2024-09-27T18:15:08Z

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

+    }
+
+    @RequestMapping(value = "/staff/space/order", method = RequestMethod.GET)
+    public String displayCustomOrders(Model model) {


jdamerow · 2024-09-27T18:15:58Z

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

+    }
+
+    @RequestMapping(value = "/staff/space/order/setExhibitionCustomOrder", method = RequestMethod.POST)
+    public String setExhibitionSpacesCustomOrder(Model model,


this should be in the same class as the one to show the page for a specific order, but url should be /staff/space/order/{orderId}.

jdamerow · 2025-01-06T16:34:02Z

Resolve conflicts please

# Conflicts: # vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpaceManager.java # vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpaceManager.java

jdamerow · 2025-01-22T16:27:09Z

vspace/src/main/java/edu/asu/diging/vspace/core/aspects/ExhibitionDataAspect.java

@@ -69,6 +69,7 @@ public void setExhibition(JoinPoint jp) {
                         * spaces with null space status
                         */
                        publishedSpaces.addAll(spaceManager.getSpacesWithStatus(null));
+                        publishedSpaces = spaceManager.sortPublishedSpacesByGivenOrder(publishedSpaces);


since sortPublishedSpacesByGivenOrder returns a list, there is really no need to add all spaces to publishedSpaces first, is there? Can't this be replaced with:

publishedSpaces = spaceManager.sortPublishedSpacesByGivenOrder(spaceManager.getSpacesWithStatus(null));

publishedSpaces has spaces with spaceStatus null and PUBLISHED, did not change it as I thought both the type of spaces are needed. Should I change the existing logic?

ah, GitHub hid the the other line above before, so I missed it. The way it was was correct

jdamerow · 2025-01-22T16:29:01Z

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

+    private  IExhibitionManager exhibitionManager;
+
+    /**
+     * This method sorts the spaces in alphabetical order.


There should probably be a comment that this method orders spaces in place, so that the passed in list of spaces will be sorted after the method is done.

jdamerow · 2025-01-22T16:29:07Z

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

+    }
+
+    /**
+     * This method sorts the spaces based on the space creation date.


jdamerow · 2025-01-22T16:29:51Z

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

+
+
+    /**
+     * This method sorts the spaces based on user defined order.


here on the other hand, this is only the case if the space custom order is null. Otherwise, the space list passed will stay the way it was.

jdamerow · 2025-01-22T16:35:00Z

Make it so, Jenkins.

jdamerow · 2025-01-22T16:38:08Z

After that should be good.

glend17 added 30 commits September 30, 2021 16:30

[VSPC-190] Added sorting functionality for space

df573df

[VSPC-190] added custom ordering layout page

89b4f23

[VSPC-190] Changed the logic for custom order to input values given b…

cead54f

…y user instead of drag and drop

[VSPC-190] Added custom order logic for spaces

2a4e021

[VSPC-190] Added controller to adjust content order and front end cha…

1ac9e32

…nges

[VSPC-190] Spaces custom order controller related changes

bd2eeb0

[VSPC-190] Front-end changes

16fa151

[VSPC-190] Front-end space list implementation and back end bug fixes

8a5f860

[VSPC-190] Added re-ordering of spaces

0af04b2

[VSPC-190] Space ordering option on staff page integrated to backend

0f0fcdb

[VSPC-190] Dropdown will show current selected element

04c4946

[VSPC-190] Unit test

d1b6405

[VSPC-190] Unit Test

2a4cdfc

[VSPC-190] Unit tests

e0a9a54

[VSPC-190] Cleanup

3aea6df

[VSPC-190] Code documentation

b94a0d0

Update SpacesCustomOrderManagerTest.java

d513eba

Update SpaceController.java

ac362db

Update SpacesCustomOrderingController.java

87ec41c

[VSPC-190] Removing SpaceOrderTypeFrom as unused code

eec41be

[VSPC-190] Review Comment, reusing method getStartExhibition()

bc61545

[VSPC-190] allowing scope for multiple custom order

a585211

[VSPC-190] Added logic to support multiple custom orders

fa48ecf

[VSPC-190] Space custom order changes

ad4271d

[VSPC-190] Custom order html pages

f546ebc

[VSPC-190] displaying the space orders

bf06c53

[VSPC-190] enabled drag and drop for space ordering

4d5ea90

[VSPC-190] staff side display custom order

137a2fc

[VSPC-190] findBySpaceCustomOrderName

5a5fc21

[VSPC-190] List space orders

23f348d

pooja-thalur added 3 commits August 12, 2024 16:32

[VSPC-190] addressed review comments

743dab4

[VSPC-190] addressed review comment

48d75cb

[VSPC-190] codefactor issue fixed

53212f5

jdamerow requested changes Aug 20, 2024

View reviewed changes

jdamerow closed this Aug 20, 2024

pooja-thalur added 5 commits August 21, 2024 12:03

[VSPC-190] addressed pr comments

9813163

[VSPC-190] addressed pr comments

780df95

[VSPC-190] addressed review comments

341fec2

[VSPC-190] code cleanup

a073f66

[VSPC-190] changed UI of edit page for custom ordering of spaces

5344d3f

pooja-thalur reopened this Aug 30, 2024

jdamerow requested changes Sep 27, 2024

View reviewed changes

jdamerow closed this Sep 27, 2024

pooja-thalur added 3 commits October 1, 2024 16:39

[VSPC-190] addressed review comments

f252c4f

[VSPC-190] adding validation

9b383fe

[VSPC-190] addressed review comments

6635426

pooja-thalur reopened this Oct 4, 2024

[VSPC-190] addressed review comments

b5a0ff5

jdamerow closed this Jan 6, 2025

Merge branch 'develop' into story/vspc-190

c7c8bd7

# Conflicts: # vspace/src/main/java/edu/asu/diging/vspace/core/services/ISpaceManager.java # vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SpaceManager.java

pooja-thalur reopened this Jan 7, 2025

jdamerow requested changes Jan 22, 2025

View reviewed changes

jdamerow closed this Jan 22, 2025

pooja-thalur added 2 commits January 28, 2025 12:01

[VSPC-190] review comments addressed

e23d325

[VSPC-190] review comments addressed

6ac37a5

pooja-thalur reopened this Jan 29, 2025

jdamerow closed this Feb 7, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Story/vspc 190 A user should be able to define the order spaces appear in the site menu of the public page #277

Story/vspc 190 A user should be able to define the order spaces appear in the site menu of the public page #277

glend17 commented Feb 9, 2022

jdamerow Aug 20, 2024

jdamerow Aug 20, 2024

jdamerow Aug 20, 2024

jdamerow Sep 27, 2024

jdamerow Aug 20, 2024

jdamerow Aug 20, 2024

pooja-thalur Aug 27, 2024

jdamerow Aug 27, 2024

jdamerow Aug 20, 2024

jdamerow Aug 20, 2024

jdamerow Sep 27, 2024

jdamerow Sep 27, 2024

jdamerow Sep 27, 2024

jdamerow Sep 27, 2024

jdamerow Sep 27, 2024

jdamerow commented Jan 6, 2025

jdamerow Jan 22, 2025

pooja-thalur Jan 29, 2025

jdamerow Feb 7, 2025

jdamerow Jan 22, 2025

jdamerow Jan 22, 2025

jdamerow Jan 22, 2025

jdamerow commented Jan 22, 2025

jdamerow commented Jan 22, 2025



		/**
		* This method sorts the spaces based on user defined order.

Story/vspc 190 A user should be able to define the order spaces appear in the site menu of the public page #277

Story/vspc 190 A user should be able to define the order spaces appear in the site menu of the public page #277

Conversation

glend17 commented Feb 9, 2022

Guidelines for Pull Requests

Please provide a brief description of your ticket

Anything else the reviewer needs to know?

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

jdamerow commented Jan 6, 2025

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

jdamerow commented Jan 22, 2025

jdamerow commented Jan 22, 2025