Merge 928e308 into 4e8f426

Portal/src/Datahub.Core/Components/Common/LanguageToggle.razor

@@ -15,14 +15,17 @@
 
     private static string Language => Thread.CurrentThread.CurrentCulture.Name.ToLower().Contains("fr") ? "en-CA" : "fr-CA";
     private static string LanguageDisplay => Thread.CurrentThread.CurrentCulture.Name.ToLower().Contains("fr") ? "English" : "Français";
+
+    private static List<string> UnauthenticatedPages = new() { "/login", "/register", "/terms-and-conditions", "account-setup" };
 
     private async void ChangeLanguage(string language)
     {
-        // if in register page, user still needs to be able to translate languages
+        // if in an unauthenticated page, user still needs to be able to translate languages
         var currentPage = NavManager.Uri;
-        if (currentPage.Contains(@"/register") || currentPage.Contains(@"/terms-and-conditions")){
-            _userInformationService.SetLanguage(language);
+        if (UnauthenticatedPages.Any(x => currentPage.Contains(x)))
+        {
             await _localStorage.SetItemAsStringAsync("language", language);
+            _userInformationService.SetLanguage(language);
         } else {
             await _userInformationService.RegisterUserLanguage(language);
             await _telemetryService.LogTelemetryEvent(TelemetryEvents.UserToggleCulture);

Portal/src/Datahub.Portal/Datahub.Portal.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
-		<Version>2.11.1</Version>
+		<Version>2.13.1</Version>
 		<TargetFramework>net7.0</TargetFramework>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>

Portal/src/Datahub.Portal/Pages/Public/RegisterPage.razor

@@ -14,10 +14,6 @@
     <MudStack>
         <MudForm @ref="@_form" @bind-IsValid="@_success" @bind-Errors="@_errors">
             <MudStack>
-                <MudText>
-                    @Localizer["Register for the Federal Science DataHub"]
-                </MudText>
-
                 <MudTextField T="string"
                               Label=@Localizer["Government of Canada Email"]
                                   @bind-Value="_email"
@@ -42,7 +38,7 @@
                         <MudLink Href="/terms-and-conditions" Typo="Typo.body2">
                             @Localizer["Terms and conditions"]
                         </MudLink>
-                        @Localizer[" of use for the FSDH Proof-of-Concept Phase 2"]
+                        @Localizer[" of use for the FSDH Trial"]
                     </MudText>
 
                 </MudCheckBox>
@@ -66,6 +62,10 @@
             @Localizer["Already registered?"]
             <MudLink Typo="Typo.body2" Href="/login">@Localizer["Login instead"]</MudLink>
         </MudText>
+         <MudText Typo="Typo.body2" Align="Align.Center">
+                    <MudLink Typo="Typo.body2" Target="_blank" Href="/account-setup">@Localizer["Click here for detailed instructions"]</MudLink>
+                    @Localizer["on setting up your account."]
+                </MudText>
     </MudStack>
 </PublicLandingDescription>
 

Portal/src/Datahub.Portal/i18n/localization.fr.json

@@ -1804,5 +1804,8 @@
   "Announcements": "Annonces",
   "Workspaces": "Espaces de travail",
   "Resource request has been successfully submitted": "La demande de ressource a été soumise avec succès",
-  "Resource request has failed, please contact an administrator": "La demande de ressource a échoué, veuillez contacter un administrateur"
+  "Resource request has failed, please contact an administrator": "La demande de ressource a échoué, veuillez contacter un administrateur",
+  "on setting up your account.": "sur la configuration de votre compte.",
+  "Click here for detailed instructions": "Cliquez ici pour des instructions détaillées",
+  " of use for the FSDH Trial": " d'utilisation pour l'essai FSDH"
 }

ResourceProvisioner/src/ResourceProvisioner.Functions.Python/function_app.py

@@ -65,4 +65,60 @@ def sync_workspace_users_function(workspace_definition):
 
     # Cleanup users in workspace that aren't in AAD Graph
     remove_deleted_users_in_workspace(workspace_client)
-    synchronize_workspace_users(workspace_definition, workspace_client)
+    synchronize_workspace_users(workspace_definition, workspace_client)
+
+
+
+
+
+####################################################################################
+# Temporary function to run the sync function in INT and POC environments 
+####################################################################################
+
+
+
+@app.function_name(name="TempIntSynchronizeWorkspaceUsersQueueTrigger")
+@app.queue_trigger(arg_name="msg", queue_name="user-run-request", 
+                   connection="TempIntConnectionString") # Queue Trigger
+
+def queue_sync_workspace_users_function(msg: func.QueueMessage) -> None:
+    """
+    Synchronizes the users in the Databricks workspace with the users in the definition file.
+
+    Args:
+        workspace_definition (QueueMessage): The workspace definition file.
+
+    Returns:
+        None
+
+    """
+    workspace_definition = msg.get_json()
+    logging.info("Synchronizing workspace users.")
+
+    sync_workspace_users_function(workspace_definition)
+
+    logging.info("Successfully synchronized workspace users.")
+    return None
+
+@app.function_name(name="TempPocSynchronizeWorkspaceUsersQueueTrigger")
+@app.queue_trigger(arg_name="msg", queue_name="user-run-request", 
+                   connection="TempPocConnectionString") # Queue Trigger
+
+def queue_sync_workspace_users_function(msg: func.QueueMessage) -> None:
+    """
+    Synchronizes the users in the Databricks workspace with the users in the definition file.
+
+    Args:
+        workspace_definition (QueueMessage): The workspace definition file.
+
+    Returns:
+        None
+
+    """
+    workspace_definition = msg.get_json()
+    logging.info("Synchronizing workspace users.")
+
+    sync_workspace_users_function(workspace_definition)
+
+    logging.info("Successfully synchronized workspace users.")
+    return None