cleanup

IntelliTect · Sep 27, 2024 · 96d30e5 · 96d30e5
1 parent 683956d
commit 96d30e5
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 25 deletions.
diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/Auth/Permission.cs b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/Auth/Permission.cs
@@ -1,6 +1,4 @@
-using System.Text.Json.Serialization;
-
-namespace Coalesce.Starter.Vue.Data;
+namespace Coalesce.Starter.Vue.Data;
 
 /// <summary>
 /// The permissions available for assignment to <see cref="Models.Role"/>s. 

diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/Models/Tenancy/Tenant.cs b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/Models/Tenancy/Tenant.cs
@@ -27,8 +27,7 @@ public class DefaultSource(CrudContext<AppDbContext> context) : AppDataSource<Te
     {
         public override IQueryable<Tenant> GetQuery(IDataSourceParameters parameters)
         {
-            // By default, only allow the current tenant to be read and modified.
-            // If desired, this can be made more permissive.
+            // Only allow the current tenant to be read and modified.
             return base.GetQuery(parameters)
                 .Where(t => t.TenantId == User.GetTenantId());
         }
@@ -53,7 +52,8 @@ public static async Task<ItemResult> Create(
         AppDbContext db,
         [Inject] InvitationService invitationService,
         [Display(Name = "Org Name")] string name,
-        [DataType(DataType.EmailAddress)] string adminEmail)
+        [DataType(DataType.EmailAddress)] string adminEmail
+    )
     {
         Tenant tenant = new() { Name = name };
         db.Tenants.Add(tenant);

diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/Models/User.cs b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Data/Models/User.cs
@@ -1,4 +1,3 @@
-using IntelliTect.Coalesce.Helpers;
 using Microsoft.AspNetCore.Identity;
 using System.ComponentModel;
 

diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Program.cs b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/Program.cs
@@ -53,7 +53,7 @@
 services.ConfigureTelemetryModule<DependencyTrackingTelemetryModule>((module, o) => {
 	module.EnableSqlCommandTextInstrumentation = true;
 });
-// App insights filters all logs to Warning by default.
+// App insights filters all logs to Warning by default. We want to include our own logging.
 builder.Logging.AddFilter<ApplicationInsightsLoggerProvider>("Coalesce.Starter.Vue", LogLevel.Information);
 #endif
 
@@ -97,12 +97,14 @@
 services.AddScoped<SecurityService>();
 
 #if TenantMemberInvites
+// Register IUrlHelper to allow for invite link generation.
 services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
 services.AddScoped<IUrlHelper>(x => {
     var actionContext = x.GetRequiredService<IActionContextAccessor>().ActionContext;
     var factory = x.GetRequiredService<IUrlHelperFactory>();
     return factory.GetUrlHelper(actionContext!);
 });
+
 services.AddScoped<InvitationService>();
 #endif
 
@@ -146,16 +148,6 @@
 app.UseAuthentication();
 app.UseAuthorization();
 
-//app.Use(async (context, next) =>
-//{
-//    if (context.User.GetTenantId() is int tenantId)
-//    {
-//        context.RequestServices.GetRequiredService<AppDbContext>().TenantId = tenantId;
-//    }
-
-//    await next(context);
-//});
-
 var containsFileHashRegex = new Regex(@"[.-][0-9a-zA-Z-_]{8}\.[^\.]*$", RegexOptions.Compiled);
 app.UseStaticFiles(new StaticFileOptions
 {

diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/main.ts b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/main.ts
@@ -83,7 +83,6 @@ const coalesceVuetify = createCoalesceVuetify({
 // SETUP: app insights
 //@ts-expect-error AppInsights imported from backend JavaScriptSnippet; no types available.
 window.appInsights?.addTelemetryInitializer(function (envelope) {
-  debugger;
   if (
     envelope.baseType === "ExceptionData" &&
     // Filter out unactionable, junk errors:

diff --git a/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/router.ts b/templates/Coalesce.Vue.Template/content/Coalesce.Starter.Vue.Web/src/router.ts
@@ -32,14 +32,10 @@ const router = createRouter({
     //#if Identity
     {
       path: "/user/:id",
-      alias: "/admin/User/edit/:id",
+      alias: "/admin/User/edit/:id", // Override coalesce admin page
       props: true,
       component: () => import("./views/UserProfile.vue"),
     },
-    // {
-    //   path: "/admin/User/edit/:id",
-    //   redirect(to) { return `/user/` }
-    // }
     // #endif
 
     // Coalesce admin routes
@@ -82,7 +78,7 @@ function titledAdminPage<
     | typeof CAdminEditorPage
     //#if AuditLogs
     | typeof CAdminAuditLogPage,
-  //#endif
+    //#endif
 >(component: T) {
   return defineComponent({
     setup() {