Merge pull request #116 from Resgrid/develop

Develop

.deepsource.toml

@@ -0,0 +1,15 @@
+version = 1
+
+[[analyzers]]
+name = "csharp"
+
+
+[[analyzers]]
+name = "javascript"
+
+  [analyzers.meta]
+  plugins = ["angular"]
+
+
+  [analyzers.meta]
+  runtime_version = "3.x.x"

.dockerignore

@@ -21,5 +21,6 @@
 **/obj
 **/secrets.dev.yaml
 **/values.dev.yaml
+**/node_modules
 LICENSE
 README.md

.github/dependabot.yml

@@ -7,5 +7,6 @@ version: 2
 updates:
   - package-ecosystem: "npm" # See documentation for possible values
     directory: "/" # Location of package manifests
+    target-branch: "develop"
     schedule:
       interval: "weekly"

.github/workflows/auto-approve.yml

@@ -0,0 +1,26 @@
+name: Auto approve
+
+on:
+  issue_comment:
+    types:
+      - created
+
+jobs:
+  auto-approve:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+    - uses: actions/github-script@v6
+      name: Approve LGTM Review
+      if: github.actor == 'ucswift' &&  contains(github.event.comment.body, 'Approve')
+      with:
+        script: |
+          github.rest.pulls.createReview({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            pull_number: context.issue.number,
+            review_id: 1,
+            event: 'APPROVE',
+            body: 'This PR is approved.'
+          })

.github/workflows/dotnet.yml

@@ -0,0 +1,26 @@
+# This workflow will build a .NET project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
+
+name: .NET
+
+on:
+  pull_request:
+    branches: [ "master", "develop" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --no-restore
+    - name: Test
+      run: dotnet test --no-build --verbosity normal

.gitignore

@@ -141,12 +141,9 @@ deploy.cmd
 Packages.dgml
 OffRuleSet.ruleset
 Build/*
-Resgrid.sln
-Resgrid.xml
-Resgrid-NoCore.sln
+.idea/*
 Tests/Resgrid.TestHarness/*
 Tests/Resgrid.TestHarnessCore/*
-Tests/Resgrid.SmokeTests/*
 Web/Resgrid.WebCore/appsettings.Azure.json
 Web/Resgrid.WebCore/appsettings.Development.json
 Web/Resgrid.WebCore/appsettings.Production.json
@@ -194,13 +191,9 @@ Common/resgrid.local.pfx
 Web/Resgrid.Web.ServicesCore/Properties/serviceDependencies.json
 Web/Resgrid.Web.ServicesCore/Properties/serviceDependencies.local.json
 Web/Resgrid.Web.ServicesCore/Properties/ServiceDependencies/local/appInsights1.arm.json
-
 Docker/docker-data/dms/mail-state/lib-clamav/bytecode.cvd
-
 Docker/docker-data/dms/mail-state/lib-clamav/daily.cvd
-
 Docker/docker-data/dms/mail-state/lib-clamav/freshclam.dat
-
 Docker/docker-data/dms/mail-state/lib-clamav/main.cvd
 Docker/docker-data/dms/config/dovecot-quotas.cf
 Docker/docker-data/dms/config/mailconfig
@@ -308,3 +301,4 @@ Web/Resgrid.WebCore/wwwroot/js/ng/main.js
 Web/Resgrid.WebCore/wwwroot/js/ng/polyfills.js
 Web/Resgrid.WebCore/wwwroot/js/ng/runtime.js
 Web/Resgrid.WebCore/wwwroot/js/ng/styles.css
+Web/Resgrid.WebCore/wwwroot/js/ng/*

Common/Resgrid/Auth/Login.bru

@@ -0,0 +1,26 @@
+meta {
+  name: Login
+  type: http
+  seq: 1
+}
+
+post {
+  url: {{BASE_API_URL}}/connect/token
+  body: formUrlEncoded
+  auth: none
+}
+
+headers {
+  Content-Type: application/x-www-form-urlencoded
+}
+
+body:form-urlencoded {
+  grant_type: password
+  scope: openid profile offline_access
+  username: {{USERNAME}}
+  password: {{PASSWORD}}
+}
+
+vars:post-response {
+  access_token: res.body.access_token
+}

Common/Resgrid/CreateCall.bru

@@ -0,0 +1,36 @@
+meta {
+  name: CreateCall
+  type: http
+  seq: 1
+}
+
+post {
+  url: {{BASE_API_URL}}/Calls/SaveCall
+  body: json
+  auth: bearer
+}
+
+auth:bearer {
+  token: {{access_token}}
+}
+
+body:json {
+  {
+      "Priority": "1",
+      "Name": "Jane Smith",
+      "Nature": "This is the nature of my call",
+      "Note": "These are the notes of the call",
+      "Address": "123 Main St., Wilmington, OH",
+      "Geolocation": "",
+      "Type": "",
+      "What3Words": "",
+      "DispatchList": "U:5733",
+      "ContactName": "null",
+      "ContactInfo": "null",
+      "ExternalId": "null",
+      "IncidentId": "null",
+      "ReferenceId": "null",
+      "DispatchOn": "2024-03-07T02:32:53.842Z",
+      "CallFormData": "null" 
+  }
+}

Common/Resgrid/bruno.json

@@ -0,0 +1,9 @@
+{
+  "version": "1",
+  "name": "Resgrid",
+  "type": "collection",
+  "ignore": [
+    "node_modules",
+    ".git"
+  ]
+}

Common/Resgrid/environments/Dev.bru

@@ -0,0 +1,5 @@
+vars:secret [
+  BASE_API_URL,
+  USERNAME,
+  PASSWORD
+]

Common/Resgrid/environments/QA.bru

@@ -0,0 +1,2 @@
+vars {
+}

Core/Resgrid.Config/ApiConfig.cs

@@ -14,5 +14,10 @@ public static class ApiConfig
 		/// Allowed Methods (verbs) for CORS access. NOTE: CANNOT BE SET VIA THE CONFIG FILE.
 		/// </summary>
 		public const string CorsAllowedMethods = "GET,POST,PUT,DELETE,OPTIONS";
+
+		/// <summary>
+		/// Key used for authing with the backend internal apis
+		/// </summary>
+		public static string BackendInternalApikey = "";
 	}
 }

Core/Resgrid.Config/AuditConfig.cs

@@ -0,0 +1,13 @@
+namespace Resgrid.Config
+{
+	/// <summary>
+	/// Config settings for the operation of the auditing sub-system
+	/// </summary>
+	public static class AuditConfig
+	{
+		/// <summary>
+		/// Connection string to the audit database
+		/// </summary>
+		public static string ConnectionString = "Server=rgdevserver;Database=ResgridAudit;User Id=resgrid_audit;Password=resgrid123;MultipleActiveResultSets=True;";
+	}
+}

Core/Resgrid.Config/ChatConfig.cs

@@ -2,7 +2,7 @@
 {
 	public static class ChatConfig
 	{
-		public static string DepartmentChatPrefix = "";
-		public static string DepartmentGroupChatPrefix = "";
+		public static string DepartmentChatPrefix = "D1_";
+		public static string DepartmentGroupChatPrefix = "DG1_";
 	}
 }

Core/Resgrid.Config/ConfigProcessor.cs

@@ -37,6 +37,8 @@ public static bool LoadAndProcessConfig(string path = null)
 									FieldInfo prop = configObj.GetField(parts[1]);
 									if (null != prop)
 									{
+										Console.WriteLine($"Resgrid.Config: Setting Value for {prop.ToString()}");
+
 										if (prop.FieldType.BaseType == typeof(Enum))
 										{
 											Type t = Nullable.GetUnderlyingType(prop.FieldType) ?? prop.FieldType;
@@ -72,6 +74,8 @@ public static bool LoadAndProcessConfig(string path = null)
 
 		public static bool LoadAndProcessEnvVariables(IEnumerable<KeyValuePair<string, string>> values)
 		{
+			Console.WriteLine($"Resgrid.Config: Processing Environment Variables");
+
 			bool hasSetAtLeastOneVariable = false;
 
 			try
@@ -94,6 +98,7 @@ public static bool LoadAndProcessEnvVariables(IEnumerable<KeyValuePair<string, s
 								if (null != prop)
 								{
 									Console.WriteLine($"Resgrid.Config: Setting Value for {prop.ToString()}");
+
 									if (prop.FieldType.BaseType == typeof(Enum))
 									{
 										Type t = Nullable.GetUnderlyingType(prop.FieldType) ?? prop.FieldType;