SAK-52355 Microsoft - Add the posibility to enable a new forced synchronization in Microsoft Team for the site

config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties

@@ -5341,6 +5341,18 @@
 #Default: false
 #scorm.config.showNavBar.default=true
 
+# ###############################
+# MICROSOFT TEAMS
+# ###############################
+
+#SAK-52355 Enable forced synchronization in Microsoft Teams
+#DEFAULT: none, use "all" for all sites or specify a list of site types to allow. Comma-separated list of sitetype: course,project,...
+#microsoft.forced.synchronization.sitetype=all
+
+#SAK-52355 Enable forced synchronization in Microsoft Teams
+#DEFAULT: microsoft.synchronized=true, use your own name and value property. IMPORTANT: The administrator should add this name and optional value in the Microsoft Admin Tool settings, in the corresponding "Site property" input.
+#microsoft.forced.synchronization.propertynameandoptionalvalue=microsoft.synchronized=true
+
 # ###############################
 # Content-Review
 # ###############################

library/src/skins/default/src/sass/modules/tool/sitemanage/_sitemanage.scss

@@ -494,7 +494,7 @@
   }
   #toolHolderWW {
     @include display-flex;
-    .mathJaxToggleArea, .subPageNavToggleArea {
+    .mathJaxToggleArea, .subPageNavToggleArea, .microsoftSynchronizationArea {
       @include display-flex;
       @include flex-direction(row-reverse);
       @include justify-content(flex-end);		// align to the left

microsoft-integration/admin-tool/src/main/java/org/sakaiproject/microsoft/controller/AutoConfigController.java

@@ -118,8 +118,8 @@ public String autoConfig(
 
 		if(!autoConfigSessionBean.isRunning()) {
 
-			//get all synchronizations
-			List<SiteSynchronization> ssList = microsoftSynchronizationService.getAllSiteSynchronizations(false);
+			//get all enabled synchronizations
+			List<SiteSynchronization> ssList = microsoftSynchronizationService.getAllEnabledSiteSynchronizations(false);
 
 			//get (filtered) sites
 			List<Site> sitesList = sakaiProxy.getSakaiSites(requestBody.getFilter());

microsoft-integration/admin-tool/src/main/java/org/sakaiproject/microsoft/controller/MainController.java

@@ -334,7 +334,24 @@ public AjaxResponse updateSiteSynchronizationForced(@PathVariable String id, @Re
 
 		return ret;
 	}
-
+
+	//called by AJAX - returns JSON
+	@PostMapping(path = {"/setDisabled-siteSynchronization/{id}"}, produces = MediaType.APPLICATION_JSON_VALUE)
+	@ResponseBody
+	public AjaxResponse updateSiteSynchronizationDisabled(@PathVariable String id, @RequestParam Boolean disabled, Model model) {
+		SiteSynchronization ss = microsoftSynchronizationService.getSiteSynchronization(SiteSynchronization.builder().id(id).build());
+		AjaxResponse ret = new AjaxResponse();
+		ret.setStatus(false);
+		ret.setError(rb.getString("error.changing_synchronization_status"));
+		if(ss != null) {
+			ss.setDisabled(disabled);
+			microsoftSynchronizationService.saveOrUpdateSiteSynchronization(ss);
+			ret.setStatus(true);
+			ret.setError("");
+		}
+		return ret;
+	}
+
 	//called by AJAX - returns JSON
 	@GetMapping(path = {"/setDate-siteSynchronization/{id}"}, produces = MediaType.APPLICATION_JSON_VALUE)
 	@ResponseBody

microsoft-integration/admin-tool/src/main/resources/Messages.properties

@@ -77,6 +77,8 @@ index.run.disabled=Run Disabled
 index.refresh=Refresh
 index.groups=Groups
 index.edit_groups=Edit Groups
+index.enable=Enable synchronization
+index.disable=Disable synchronization
 index.selected_id=Selected id
 index.delete_selected=Delete Selected
 index.remove_team_users=Remove Team Users
@@ -221,6 +223,7 @@ error.new_channel_empty=New channel name can not be empty
 error.new_channel_with_same_name= New channel name can not have the same name of one of the channels created
 error.delete_group_synchronization=Error removing selected Group Synchronization
 error.set_forced_synchronization=Error setting forced
+error.changing_synchronization_status=Error changing the synchronization status
 error.deleting_site_synchronizations=Error removing one or more selected synchronizations
 error.cleaning_team=Error cleaning one or more selected synchronizations
 error.set_dates=Error setting dates

microsoft-integration/admin-tool/src/main/resources/Messages_es.properties

@@ -77,6 +77,8 @@ index.run.disabled=Ejecutar Deshabilitado
 index.refresh=Refrescar
 index.groups=Grupos
 index.edit_groups=Editar Grupos
+index.enable=Habilitar sincronizaci\u00f3n
+index.disable=Deshabilitar sincronizaci\u00f3n
 index.selected_id=Id seleccionado
 index.delete_selected=Borrar seleccionado
 index.remove_team_users=Eliminar Usuarios de Teams
@@ -220,6 +222,7 @@ error.new_channel_empty=El nombre del nuevo canal no puede estar vac\u00edo
 error.new_channel_with_same_name=El nombre del nuevo canal no puede tener el mismo nombre que uno de los canales ya creados
 error.delete_group_synchronization=Error eliminando la sincronizaci\u00f3n de grupo seleccionada
 error.set_forced_synchronization=Error de configuraci\u00f3n forzado
+error.changing_synchronization_status=Error al cambiar el estado de la sincronizaci\u00f3n
 error.deleting_site_synchronizations=Error al eliminar una o varias sincronizaciones seleccionadas
 error.cleaning_team=Error al limpiar una o m\u00e1s sincronizaciones seleccionadas
 error.set_dates=Error al establecer las fechas

microsoft-integration/admin-tool/src/main/webapp/WEB-INF/templates/fragments/synchronizationRow.html

@@ -92,6 +92,12 @@
 		<a th:href="@{/editGroupSynchronization/{id}(id=${row.id})}" th:title="#{index.edit_groups}" th:classappend="${teamsMap[row.teamId]} == null ? 'hidden'" >
 			<i class="fa fa-users"></i>
 		</a>
+		<!-- Disable/Enable -->
+		<a href="#" onclick="toggleDisabled(this); return false;" th:title="${row.disabled} ? #{index.enable} : #{index.disable}"
+			th:aria-label="${row.disabled} ? #{index.enable} : #{index.disable}">
+			<i th:class="${row.disabled} ? 'fa fa-toggle-off' : 'fa fa-toggle-on'"></i>
+			<span class="sr-only" th:text="${row.disabled} ? #{index.enable} : #{index.disable}"></span>
+		</a>
 	</div>
 	<div class="col-lg-1 multi-button" th:if="${row.teamId == null || row.teamId == ''}">
 	</div>

microsoft-integration/admin-tool/src/main/webapp/WEB-INF/templates/index.html

@@ -113,6 +113,35 @@ <h1 th:text="#{index_title}"></h1>
 				}
 			}
 
+			async function toggleDisabled(elem) {
+				let baseURL = "[(@{/setDisabled-siteSynchronization/})]";
+				let rowId = elem.closest('.table-row').id.replace('row_', '');
+				let icon = elem.querySelector('i');
+				let isDisabled = icon.classList.contains('fa-toggle-off');
+
+				let url = baseURL + rowId + "?disabled=" + !isDisabled;
+
+				let response = await fetch(url, {
+					method: 'POST',
+					headers: {
+						'X-Requested-With': 'XMLHttpRequest'
+					}
+				});
+				let data = await response.json();
+
+				if (data.status == false) {
+					showAjaxError(data.error);
+				} else {
+					if (!isDisabled) {
+						icon.classList.replace('fa-toggle-on', 'fa-toggle-off');
+						elem.title = /*[[#{index.enable}]]*/ '';
+					} else {
+						icon.classList.replace('fa-toggle-off', 'fa-toggle-on');
+						elem.title = /*[[#{index.disable}]]*/ '';
+					}
+				}
+			}
+
 			var dateTimeout = null;
 			async function changeDate(input) {
 				if(dateTimeout != null){

microsoft-integration/api/src/java/org/sakaiproject/microsoft/api/MicrosoftCommonService.java

@@ -109,6 +109,8 @@ public static enum PermissionRoles { READ, WRITE }
 	void createTeamFromGroupAsync(String groupId) throws MicrosoftCredentialsException;
 
 	boolean deleteTeam(String teamId) throws MicrosoftCredentialsException;
+	boolean archiveTeam(String teamId) throws MicrosoftCredentialsException;
+	boolean unarchiveTeam(String teamId) throws MicrosoftCredentialsException;
 
 	MicrosoftMembersCollection getTeamMembers(String id, MicrosoftUserIdentifier key) throws MicrosoftCredentialsException;
 	MicrosoftUser checkUserInTeam(String identifier, String teamId, MicrosoftUserIdentifier key) throws MicrosoftCredentialsException;

microsoft-integration/api/src/java/org/sakaiproject/microsoft/api/MicrosoftSynchronizationService.java

@@ -28,7 +28,7 @@
 public interface MicrosoftSynchronizationService {
 
 	// ------------ Site Synchronization ---------------------------
-	List<SiteSynchronization> getAllSiteSynchronizations(boolean fillSite);
+	List<SiteSynchronization> getAllEnabledSiteSynchronizations(boolean fillSite);
 	List<SiteSynchronization> getFilteredSiteSynchronizations(boolean fillSite, SakaiSiteFilter filter, ZonedDateTime fromDate, ZonedDateTime toDate);
 
 	SiteSynchronization getSiteSynchronization(SiteSynchronization ss);

microsoft-integration/api/src/java/org/sakaiproject/microsoft/api/model/SiteSynchronization.java

@@ -74,8 +74,9 @@ public class SiteSynchronization {
 	@Convert(converter = JpaConverterSynchronizationStatus.class)
 	private SynchronizationStatus status = SynchronizationStatus.NONE;
 
-	@Column(name = "forced")
-	private boolean forced;
+	@Column(name = "forced", nullable = false)
+	@Builder.Default
+	private boolean forced = false;
 
 	@Column(name = "date_from")
 	private ZonedDateTime syncDateFrom;
@@ -86,6 +87,10 @@ public class SiteSynchronization {
 	@Column(name = "status_updated_at")
 	private ZonedDateTime statusUpdatedAt;
 
+	@Column(name = "disabled", nullable = false)
+	@Builder.Default
+	private boolean disabled = false;
+
 	@OneToMany(mappedBy = "siteSynchronization", fetch = FetchType.LAZY, orphanRemoval = true)
 	@Cascade(CascadeType.ALL)
 	@OnDelete(action = OnDeleteAction.CASCADE)

microsoft-integration/api/src/java/org/sakaiproject/microsoft/api/persistence/MicrosoftSiteSynchronizationRepository.java

@@ -24,6 +24,7 @@
 import org.sakaiproject.serialization.SerializableRepository;
 
 public interface MicrosoftSiteSynchronizationRepository extends SerializableRepository<SiteSynchronization, String> {
+	List<SiteSynchronization> findAllEnabled();
 	Optional<SiteSynchronization> findById(String id);
 	Optional<SiteSynchronization> findBySiteTeam(String siteId, String teamId);
 	List<SiteSynchronization> findBySite(String siteId);

microsoft-integration/impl/src/main/java/org/sakaiproject/microsoft/impl/MicrosoftCommonServiceImpl.java

@@ -45,6 +45,7 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import com.microsoft.graph.requests.GraphServiceClient;
 import com.microsoft.graph.requests.UserCollectionPage;
 import com.microsoft.graph.requests.GroupCollectionPage;
@@ -147,7 +148,9 @@
 import com.microsoft.graph.models.OnlineMeetingRole;
 import com.microsoft.graph.models.Permission;
 import com.microsoft.graph.models.PermissionGrantParameterSet;
+import com.microsoft.graph.models.Site;
 import com.microsoft.graph.models.Team;
+import com.microsoft.graph.models.TeamArchiveParameterSet;
 import com.microsoft.graph.models.TeamVisibilityType;
 import com.microsoft.graph.models.ThumbnailSet;
 import com.microsoft.graph.models.UploadSession;
@@ -1010,6 +1013,87 @@ public boolean deleteTeam(String teamId) throws MicrosoftCredentialsException {
 		return false;
 	}
 
+	public boolean archiveTeam(String teamId) throws MicrosoftCredentialsException {
+		try {
+			// 1. Archive team without shouldSetSpoSiteReadOnlyForMembers (no supported in app-only)
+			TeamArchiveParameterSet requestBody = TeamArchiveParameterSet
+				.newBuilder()
+				.withShouldSetSpoSiteReadOnlyForMembers(false)
+				.build();
+
+			getGraphClient().teams(teamId)
+				.archive(requestBody)
+				.buildRequest()
+				.post();
+
+			// 2. Obtain the associated SharePoint site to ensure the team is fully archived before setting it to read-only
+			Site site = getGraphClient().groups(teamId)
+				.sites("root")
+				.buildRequest()
+				.get();
+
+			if (site == null || site.id == null) {
+				log.error("Could not retrieve SharePoint site for team: {}, site will not be set to read-only", teamId);
+				return false;
+			}
+
+			// 3. Set SharePoint site to read-only (as a backup in case the archive operation did not set it correctly)
+			JsonObject jsonBody = new JsonObject();
+			jsonBody.addProperty("lockState", "readOnly");
+
+			getGraphClient().customRequest("/sites/" + site.id)
+				.buildRequest()
+				.patch(jsonBody);
+
+			log.info("Team archived and SharePoint site set to read-only: teamId={}", teamId);
+
+			return true;
+		} catch(MicrosoftCredentialsException e) {
+			throw e;
+		} catch(Exception ex){
+			log.error("Error archiving Microsoft team: id={}", teamId, ex);
+		}
+		return false;
+	}
+
+	public boolean unarchiveTeam(String teamId) throws MicrosoftCredentialsException {
+		try {
+			//1. Unarchive team
+			getGraphClient().teams(teamId)
+				.unarchive()
+				.buildRequest()
+				.post();
+
+			// 2. Obtain the associated SharePoint site to ensure the team is fully unarchived before returning
+			Site site = getGraphClient().groups(teamId)
+				.sites("root")
+				.buildRequest()
+				.get();
+
+			if (site == null || site.id == null) {
+				log.error("Could not retrieve SharePoint site for team: {}, site will remain read-only", teamId);
+				return false;
+			}
+
+			//3. Set SharePoint site to unlocked (as a backup in case the unarchive operation did not set it correctly)
+			JsonObject jsonBody = new JsonObject();
+			jsonBody.addProperty("lockState", "unlocked");
+
+			getGraphClient().customRequest("/sites/" + site.id)
+				.buildRequest()
+				.patch(jsonBody);
+
+			log.info("Team unarchived and SharePoint site unlocked: teamId={}", teamId);
+
+			return true;
+		} catch (MicrosoftCredentialsException e) {
+			throw e;
+		} catch (Exception ex) {
+			log.error("Error unarchiving Microsoft team: id={}", teamId, ex);
+		}
+		return false;
+	}
+
 	@Override
 	public MicrosoftMembersCollection getTeamMembers(String id, MicrosoftUserIdentifier key) throws MicrosoftCredentialsException {
 		MicrosoftMembersCollection ret = new MicrosoftMembersCollection();

microsoft-integration/impl/src/main/java/org/sakaiproject/microsoft/impl/MicrosoftSynchronizationServiceImpl.java

@@ -197,8 +197,8 @@ private boolean checkTeam(String teamId) throws MicrosoftCredentialsException {
 	}
 
 	@Override
-	public List<SiteSynchronization> getAllSiteSynchronizations(boolean fillSite) {
-		List<SiteSynchronization> result = StreamSupport.stream(microsoftSiteSynchronizationRepository.findAll().spliterator(), false)
+	public List<SiteSynchronization> getAllEnabledSiteSynchronizations(boolean fillSite) {
+		List<SiteSynchronization> result = StreamSupport.stream(microsoftSiteSynchronizationRepository.findAllEnabled().spliterator(), false)
 				.map(ss -> {
 					if(fillSite) {
 						ss.setSite(sakaiProxy.getSite(ss.getSiteId()));

microsoft-integration/impl/src/main/java/org/sakaiproject/microsoft/impl/jobs/RunSynchronizationsJob.java

@@ -81,7 +81,7 @@ public void execute(JobExecutionContext context) throws JobExecutionException {
 			session.setAttribute("origin", MicrosoftLogInvokers.JOB.getCode());
 			SakaiSiteFilter siteFilter = microsoftConfigurationService.getJobSiteFilter();
 
-			List<SiteSynchronization> list = microsoftSynchronizationService.getAllSiteSynchronizations(true);
+			List<SiteSynchronization> list = microsoftSynchronizationService.getAllEnabledSiteSynchronizations(true);
 			for(SiteSynchronization ss : list) {
 				int retryCount = 0;
 				while (retryCount < MAX_RETRIES) {
@@ -91,7 +91,7 @@ public void execute(JobExecutionContext context) throws JobExecutionException {
 						}
 
 						if(ss.getSite() == null || !siteFilter.match(ss.getSite())) {
-							log.debug("Site with id={} skipped due to filter restrinctions", ss.getSiteId());
+							log.debug("Site with id={} skipped due to filter restrictions", ss.getSiteId());
 							break;
 						}
 

microsoft-integration/impl/src/main/java/org/sakaiproject/microsoft/impl/persistence/MicrosoftSiteSynchronizationRepositoryImpl.java

@@ -46,6 +46,14 @@ public List<SiteSynchronization> findAll(){
 				.list();
 	}
 
+	@Override
+	public List<SiteSynchronization> findAllEnabled() {
+		return (List<SiteSynchronization>) startCriteriaQuery()
+				.addOrder(Order.asc("status"))
+				.add(Restrictions.eq("disabled", false))
+				.list();
+	}
+
 	@Override
 	public Optional<SiteSynchronization> findById(String id) {
 		SiteSynchronization siteSynchronization = (SiteSynchronization) startCriteriaQuery().add(Restrictions.eq("id", id)).uniqueResult();

site-manage/site-manage-tool/tool/pom.xml

@@ -176,6 +176,10 @@
             <groupId>org.sakaiproject.scheduler</groupId>
             <artifactId>scheduler-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.sakaiproject.microsoft</groupId>
+            <artifactId>microsoft-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties

@@ -1152,3 +1152,9 @@ sinfo.gradebookgroupvnav.site=A single site instance
 sinfo.gradebookgroupvnav.group=A different instance for the selected group(s)
 sinfo.gradebookgroupvnav.selectGroups=Select one or more groups
 sinfo.gradebookgroupvnav.noGroupsPresent=Note - There are currently no groups present in this site. Create groups in Site Info to enable additional options.
+
+# SAK-52355
+sinfo.synchronization.microsoft.name=Synchronization with Microsoft Teams
+sinfo.synchronization.microsoft.allowForSite=Enable <strong>forced synchronization with Microsoft Teams</strong> for this site.
+sinfo.synchronization.microsoft.confirmEnabled=You have enabled forced synchronization with Microsoft Teams for this site.
+sinfo.synchronization.microsoft.enabled=Enabled for the site

site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_es.properties

@@ -1124,3 +1124,9 @@ sinfo.gradebookgroupvnav.site=Una instancia de sitio
 sinfo.gradebookgroupvnav.group=Una instancia diferente para cada grupo seleccionado
 sinfo.gradebookgroupvnav.selectGroups=Nota - Debes seleccionar al menos un grupo
 sinfo.gradebookgroupvnav.noGroupsPresent=Nota - Actualmente no hay grupos en este sitio. Debe crear grupos antes de poder asignar la tarea a un grupo concreto.
+
+# SAK-52355
+sinfo.synchronization.microsoft.name=Sincronizaci\u00f3n con Microsoft Teams
+sinfo.synchronization.microsoft.allowForSite=Habilitar <strong>la sincronizaci\u00f3n forzada con Microsoft Teams</strong> para este sitio.
+sinfo.synchronization.microsoft.confirmEnabled=Has habilitado la sincronizaci\u00f3n forzada con Microsoft Teams para este sitio.
+sinfo.synchronization.microsoft.enabled=Activado para este sitio