SAK-50440 Rubrics remove sharing of public rubrics from other sites #12839

Aniii10 · 2024-09-03T07:08:44Z

In the rubrics section, the public rubrics that are displayed must be able to be unpublished or deleted from any site other than the original. This is important for institutions with hundreds of shared rubrics or when the original instructor no longer belongs to the institution.

The development has been sponsored by Hotelschool.

bgarciaentornos · 2024-09-03T07:13:17Z

Leaving this as a draft, as Christina requested that these actions should be shown only to superusers. We're working on that but we'd like to have this included in 25 so creating the PR before the freeze date.

bgarciaentornos · 2024-09-03T07:14:22Z

webcomponents/tool/src/main/frontend/packages/sakai-rubrics/src/SakaiRubricsSharedList.js

+  refreshPage() {
+    window.location.reload();
+  }


This method is no longer used and it could be removed

…n case they are superusers

bgarciaentornos · 2024-09-04T09:52:21Z

rubrics/api/src/main/bundle/rubrics_eu.properties

@@ -19,6 +19,7 @@ save=Gorde
 done=Egina
 total=Guztira
 confirm_remove=Ziur zaude kendu egin nahi duzula?
+confirm_remove_public=Ziur "{}" publikoki partekatutako errubriketatik eta webgunearen jatorritik kendu nahi duzula?


@PabloSanRoman can you check this, please?

Hi @bgarciaentornos!
Best with a little change:

confirm_remove_public= Ziur kendu nahi duzula errubrika hau, "{}", publikoki partekatutako errubriketatik eta gunetik bertatik?

bgarciaentornos · 2024-09-04T09:53:09Z

webcomponents/tool/src/main/frontend/packages/sakai-rubrics/src/SakaiRubricReadonly.js

+    this.fetchUserRoles();
+  }
+
+  async fetchUserRoles() {


Please rename this to checkSuperUser (we're not actually getting other roles)

bgarciaentornos · 2024-09-04T09:53:31Z

webapi/src/main/java/org/sakaiproject/webapi/controllers/UserController.java

+    @GetMapping("/user/roles")
+    public ResponseEntity<Map<String, Boolean>> getUserRoles() {


Please rename this to checkSuperUser (we're not actually getting other roles)

…etUserRoles() method to checkSuperUser()

bgarciaentornos · 2024-09-04T10:16:41Z

webcomponents/tool/src/main/frontend/packages/sakai-rubrics/src/SakaiRubricReadonly.js

+      const roles = await response.json();
+      this.isSuperUser = roles.isSuperUser;
+
+      console.log("Is SuperUser:", this.isSuperUser);


Suggested change

console.log("Is SuperUser:", this.isSuperUser);

console.debug("Is SuperUser:", this.isSuperUser);

bgarciaentornos

@adrianfish Can you take a look, please?

adrianfish · 2024-09-19T16:40:14Z

rubrics/api/src/main/bundle/rubrics.properties

@@ -21,6 +21,7 @@ save=Save
 done=Done
 total=Total
 confirm_remove=Are you sure you want to remove "{}" ?
+confirm_remove_public=Are you sure you want to remove "{}" both from publicly shared rubrics and from its site origin?


I'm not sure about the word "public". This implies that these rubrics are visible to people who are not Sakai users, the public.

adrianfish · 2024-09-19T16:41:06Z

rubrics/api/src/main/bundle/rubrics.properties

@@ -21,6 +21,7 @@ save=Save
 done=Done
 total=Total
 confirm_remove=Are you sure you want to remove "{}" ?
+confirm_remove_public=Are you sure you want to remove "{}" both from publicly shared rubrics and from its site origin?


Suggested change

confirm_remove_public=Are you sure you want to remove "{}" both from publicly shared rubrics and from its site origin?

confirm_remove_shared=Are you sure you want to remove "{}" both from shared rubrics and from its source site?

adrianfish · 2024-09-19T16:41:29Z

rubrics/api/src/main/bundle/rubrics_ca.properties

@@ -18,6 +18,7 @@ save=Desa
 done=Fet
 total=Total
 confirm_remove=Esteu segur de voler-ho eliminar
+confirm_remove_public=Esteu segur que voleu eliminar "{}" tant de les r\u00fabriques compartides p\u00fablicament com del seu origen del lloc?


Suggested change

confirm_remove_public=Esteu segur que voleu eliminar "{}" tant de les r\u00fabriques compartides p\u00fablicament com del seu origen del lloc?

confirm_remove_shared=Esteu segur que voleu eliminar "{}" tant de les r\u00fabriques compartides p\u00fablicament com del seu origen del lloc?

adrianfish · 2024-09-19T16:41:58Z

rubrics/api/src/main/bundle/rubrics_es.properties

@@ -20,6 +20,7 @@ save=Guardar
 done=Aceptar
 total=Total
 confirm_remove=\u00bfEst\u00e1s seguro de que deseas borrar "{}"?
+confirm_remove_public=\u00bfEst\u00e1s seguro de que deseas borrar "{}", tanto de las r\u00fabricas compartidas p\u00fablicamente como del sitio de origen?


Suggested change

confirm_remove_public=\u00bfEst\u00e1s seguro de que deseas borrar "{}", tanto de las r\u00fabricas compartidas p\u00fablicamente como del sitio de origen?

confirm_remove_shared=\u00bfEst\u00e1s seguro de que deseas borrar "{}", tanto de las r\u00fabricas compartidas p\u00fablicamente como del sitio de origen?

adrianfish · 2024-09-19T16:42:13Z

rubrics/api/src/main/bundle/rubrics_eu.properties

@@ -19,6 +19,7 @@ save=Gorde
 done=Egina
 total=Guztira
 confirm_remove=Ziur zaude kendu egin nahi duzula?
+confirm_remove_public=Ziur "{}" publikoki partekatutako errubriketatik eta webgunearen jatorritik kendu nahi duzula?


Suggested change

confirm_remove_public=Ziur "{}" publikoki partekatutako errubriketatik eta webgunearen jatorritik kendu nahi duzula?

confirm_remove_shared=Ziur "{}" publikoki partekatutako errubriketatik eta webgunearen jatorritik kendu nahi duzula?

adrianfish · 2024-09-19T16:43:54Z

webapi/src/main/java/org/sakaiproject/webapi/controllers/UserController.java

+        Map<String, Boolean> roles = new HashMap<>();
+        roles.put("isSuperUser", securityService.isSuperUser());
+
+        return ResponseEntity.ok()
+          .contentType(MediaType.APPLICATION_JSON)
+          .body(roles);


Suggested change

Map<String, Boolean> roles = new HashMap<>();

roles.put("isSuperUser", securityService.isSuperUser());

return ResponseEntity.ok()

.contentType(MediaType.APPLICATION_JSON)

.body(roles);

return ResponseEntity.ok()

.contentType(MediaType.APPLICATION_JSON)

.body(Map.of("isSuperUser", securityService.isSuperUser()));

adrianfish · 2024-09-19T16:50:18Z

webcomponents/tool/src/main/frontend/packages/sakai-rubrics/src/SakaiRubricReadonly.js

    this.enablePdfExport = false;
+    this.checkSuperUser();


This is a really bad idea. If we have 100 shared rubrics on a page, that's 100 fetch requests. Instead, you should think in terms of setting is-super-user on the actual tag as an attribute and supplying that once. Look in the RubricsController and look at how enablePdfExport is supplied from the controller. You will need to set that attribute on the list and shared list components so they can then set it on the readonly rubric tags. But, that is a lot better than firing off 100s of fetch requests.

SAK-50440: Public Rubrics - Unpublished and Deleted

1d8ac37

bgarciaentornos marked this pull request as draft September 3, 2024 07:11

bgarciaentornos requested changes Sep 3, 2024

View reviewed changes

[SAK-50440]Show icons of the public rubrics to delete and unpublish i…

f629190

…n case they are superusers

bgarciaentornos reviewed Sep 4, 2024

View reviewed changes

[SAK-50440] Delete refresh() method and change fetchUserRoles() and g…

d92b68a

…etUserRoles() method to checkSuperUser()

bgarciaentornos reviewed Sep 4, 2024

View reviewed changes

bgarciaentornos marked this pull request as ready for review September 4, 2024 10:17

bgarciaentornos approved these changes Sep 9, 2024

View reviewed changes

ern changed the title ~~SAK-50440: Public Rubrics - Unpublished and Deleted~~ SAK-50440 Rubrics remove sharing for public rubrics Sep 10, 2024

ern changed the title ~~SAK-50440 Rubrics remove sharing for public rubrics~~ SAK-50440 Rubrics remove sharing of public rubrics from other sites Sep 10, 2024

adrianfish self-requested a review September 19, 2024 16:37

adrianfish requested changes Sep 19, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

SAK-50440 Rubrics remove sharing of public rubrics from other sites #12839

SAK-50440 Rubrics remove sharing of public rubrics from other sites #12839

Aniii10 commented Sep 3, 2024

bgarciaentornos commented Sep 3, 2024

bgarciaentornos Sep 3, 2024

bgarciaentornos Sep 4, 2024

PabloSanRoman Sep 4, 2024

bgarciaentornos Sep 4, 2024

bgarciaentornos Sep 4, 2024

bgarciaentornos Sep 4, 2024

bgarciaentornos left a comment

adrianfish Sep 19, 2024

adrianfish Sep 19, 2024

adrianfish Sep 19, 2024

adrianfish Sep 19, 2024

adrianfish Sep 19, 2024

adrianfish Sep 19, 2024

adrianfish Sep 19, 2024

		@GetMapping("/user/roles")
		public ResponseEntity<Map<String, Boolean>> getUserRoles() {

	console.log("Is SuperUser:", this.isSuperUser);
	console.debug("Is SuperUser:", this.isSuperUser);

	confirm_remove_public=Are you sure you want to remove "{}" both from publicly shared rubrics and from its site origin?
	confirm_remove_shared=Are you sure you want to remove "{}" both from shared rubrics and from its source site?

	confirm_remove_public=Esteu segur que voleu eliminar "{}" tant de les r\u00fabriques compartides p\u00fablicament com del seu origen del lloc?
	confirm_remove_shared=Esteu segur que voleu eliminar "{}" tant de les r\u00fabriques compartides p\u00fablicament com del seu origen del lloc?

	confirm_remove_public=\u00bfEst\u00e1s seguro de que deseas borrar "{}", tanto de las r\u00fabricas compartidas p\u00fablicamente como del sitio de origen?
	confirm_remove_shared=\u00bfEst\u00e1s seguro de que deseas borrar "{}", tanto de las r\u00fabricas compartidas p\u00fablicamente como del sitio de origen?

	confirm_remove_public=Ziur "{}" publikoki partekatutako errubriketatik eta webgunearen jatorritik kendu nahi duzula?
	confirm_remove_shared=Ziur "{}" publikoki partekatutako errubriketatik eta webgunearen jatorritik kendu nahi duzula?

SAK-50440 Rubrics remove sharing of public rubrics from other sites #12839

Are you sure you want to change the base?

SAK-50440 Rubrics remove sharing of public rubrics from other sites #12839

Conversation

Aniii10 commented Sep 3, 2024

bgarciaentornos commented Sep 3, 2024

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

bgarciaentornos 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