Send report to owner (#2487)

Fosol · Fosol · commit 6f272c91d4cf · 2025-09-02T13:58:09.000-07:00
Publish tno-core:1.0.21
diff --git a/api/net/Areas/Subscriber/Controllers/ReportController.cs b/api/net/Areas/Subscriber/Controllers/ReportController.cs
@@ -184,6 +184,25 @@ public IActionResult FindById(int id, bool includeContent = false)
         return new JsonResult(new ReportModel(report, _serializerOptions));
     }
 
+    /// <summary>
+    /// Get the owner of the report.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpGet("{id}/owner")]
+    [Produces(MediaTypeNames.Application.Json)]
+    [ProducesResponseType(typeof(UserModel), (int)HttpStatusCode.OK)]
+    [ProducesResponseType((int)HttpStatusCode.NoContent)]
+    [ProducesResponseType(typeof(ErrorResponseModel), (int)HttpStatusCode.BadRequest)]
+    [SwaggerOperation(Tags = new[] { "Report" })]
+    public IActionResult GetReportOwner(int id)
+    {
+        var report = _reportService.FindById(id) ?? throw new NoContentException();
+        if (!report.OwnerId.HasValue) return NoContent();
+        var user = _userService.FindById(report.OwnerId.Value) ?? throw new NotAuthorizedException();
+        return new JsonResult(new UserModel(user));
+    }
+
     /// <summary>
     /// Find all report instances for the specified report 'id' and 'ownerId'.
     /// </summary>
diff --git a/api/net/Areas/Subscriber/Controllers/UserController.cs b/api/net/Areas/Subscriber/Controllers/UserController.cs
@@ -145,7 +145,7 @@ public IActionResult DeleteColleague(int colleagueId)
     {
         var user = _impersonate.GetCurrentUser();
         var result = _userColleagueService.RemoveColleague(user.Id, colleagueId) ?? throw new InvalidOperationException("No colleague to delete.");
-        var deletedModel = new UserColleagueModel(result, _serializerOptions);
+        var deletedModel = new UserColleagueModel(result);
         return CreatedAtAction(nameof(DeleteColleague), new { id = result?.ColleagueId }, deletedModel);
     }
     #endregion
diff --git a/app/editor/.yarn/cache/tno-core-npm-1.0.21-f332bbbe0f-c96bb98def.zip b/app/editor/.yarn/cache/tno-core-npm-1.0.21-f332bbbe0f-c96bb98def.zip
diff --git a/app/editor/package.json b/app/editor/package.json
@@ -60,7 +60,7 @@
     "redux-logger": "3.0.6",
     "styled-components": "6.1.11",
     "stylis": "4.3.2",
-    "tno-core": "1.0.20"
+    "tno-core": "1.0.21"
   },
   "devDependencies": {
     "@simbathesailor/use-what-changed": "2.0.0",
diff --git a/app/editor/yarn.lock b/app/editor/yarn.lock
@@ -12209,7 +12209,7 @@ __metadata:
     sass-extract-loader: 1.1.0
     styled-components: 6.1.11
     stylis: 4.3.2
-    tno-core: 1.0.20
+    tno-core: 1.0.21
     typescript: 4.9.5
     vitest: 3.0.7
   languageName: unknown
@@ -16674,9 +16674,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tno-core@npm:1.0.20":
-  version: 1.0.20
-  resolution: "tno-core@npm:1.0.20"
+"tno-core@npm:1.0.21":
+  version: 1.0.21
+  resolution: "tno-core@npm:1.0.21"
   dependencies:
     "@elastic/elasticsearch": ^8.13.1
     "@fortawesome/free-solid-svg-icons": ^6.4.2
@@ -16709,7 +16709,7 @@ __metadata:
     styled-components: ^6.1.11
     stylis: ^4.3.2
     yup: ^1.1.1
-  checksum: a536db93ce8ca422af81ca7f4bf49ca5a63c9ec419608e5a03f3585ab5cb9d0c6f2100ebabc909963da36d34ca6ec1f91289a3989321a44d88537c19f06a798f
+  checksum: c96bb98def24cd02587ab94853b44a41932088b656a805522851a153eb0c9176a94df00655c306e2fb2446d9b9783a3a7ffb99c71e3e74a94d14a900a87a2707
   languageName: node
   linkType: hard
 
diff --git a/app/subscriber/.yarn/cache/tno-core-npm-1.0.21-f332bbbe0f-c96bb98def.zip b/app/subscriber/.yarn/cache/tno-core-npm-1.0.21-f332bbbe0f-c96bb98def.zip
diff --git a/app/subscriber/package.json b/app/subscriber/package.json
@@ -48,7 +48,7 @@
     "sheetjs": "file:packages/xlsx-0.20.1.tgz",
     "styled-components": "6.1.11",
     "stylis": "4.3.2",
-    "tno-core": "1.0.20"
+    "tno-core": "1.0.21"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "6.6.3",
diff --git a/app/subscriber/src/features/my-reports/edit/view/ReportViewForm.tsx b/app/subscriber/src/features/my-reports/edit/view/ReportViewForm.tsx
@@ -6,7 +6,7 @@ import React from 'react';
 import { FaTelegramPlane } from 'react-icons/fa';
 import { FaRegClock } from 'react-icons/fa6';
 import { toast } from 'react-toastify';
-import { useApp, useReportInstances } from 'store/hooks';
+import { useApp, useReportInstances, useReports } from 'store/hooks';
 import {
   Claim,
   Col,
@@ -35,6 +35,7 @@ import * as styled from './styled';
 export const ReportViewForm: React.FC = () => {
   const { values, isSubmitting, setFieldValue, setSubmitting } = useReportEditContext();
   const [{ sendReportInstance }] = useReportInstances();
+  const [, { getReportOwner }] = useReports();
   const [{ userInfo }] = useApp();
 
   const [to, setTo] = React.useState('');
@@ -47,15 +48,29 @@ export const ReportViewForm: React.FC = () => {
   const [{ publishReportInstance }] = useReportInstances();
 
   const handleSend = React.useCallback(
-    async (id: number, to: string) => {
+    async (instanceId: number, to: string) => {
       try {
-        await sendReportInstance(id, to);
+        await sendReportInstance(instanceId, to);
         toast.success('Report has been submitted.');
       } catch {}
     },
     [sendReportInstance],
   );
 
+  const handleSendToOwner = React.useCallback(
+    async (reportId: number, instanceId: number) => {
+      try {
+        const owner = await getReportOwner(reportId);
+        const email = owner?.preferredEmail ? owner.preferredEmail : owner?.email;
+        if (!email) {
+          toast.error('This report does not have an owner');
+        }
+        await handleSend(instanceId, email!);
+      } catch {}
+    },
+    [getReportOwner, handleSend],
+  );
+
   const handlePublish = React.useCallback(
     async (instance: IReportInstanceModel, resend: boolean) => {
       try {
@@ -112,16 +127,30 @@ export const ReportViewForm: React.FC = () => {
         </Row>
       </Col>
 
-      <Show visible={isAdmin}>
-        <Row gap="1rem">
-          <Col flex="1">
+      <Row gap="1rem">
+        <Col flex="1">
+          <Show visible={isAdmin || !!values.ownerId}>
             <Row alignItems="baseline" gap="0.5rem">
               <FaRegClock />
               <div className="preview-block-headline">Send a Test</div>
             </Row>
-
+            <Row alignItems="flex-start" className="preview-send-details-row">
+              <Button
+                className="send-test-button"
+                disabled={isSubmitting}
+                variant="secondary"
+                onClick={() => !!instance?.id && handleSendToOwner(values.id, instance.id)}
+                style={{ backgroundColor: 'transparent' }}
+              >
+                <FaTelegramPlane />
+                Send to Report Owner
+              </Button>
+            </Row>
+          </Show>
+          <Show visible={isAdmin}>
             <Row alignItems="flex-start" className="preview-send-details-row">
               <Col>
+                <hr />
                 <p>
                   Sending a report to a specific email address does not register the 'Last sent'
                   date. Only use this for testing.
@@ -147,9 +176,9 @@ export const ReportViewForm: React.FC = () => {
                 </Text>
               </Col>
             </Row>
-          </Col>
-        </Row>
-      </Show>
+          </Show>
+        </Col>
+      </Row>
 
       <Row gap="1rem">
         <Col flex="1">
diff --git a/app/subscriber/src/features/my-reports/edit/view/styled/ReportViewForm.tsx b/app/subscriber/src/features/my-reports/edit/view/styled/ReportViewForm.tsx
@@ -16,6 +16,12 @@ export const ReportViewForm = styled.div`
   .preview-send-details-row {
     margin-left: 1.5rem;
     gap: 1rem;
+
+    hr {
+      width: 100%;
+      border: none;
+      border-top: solid 1px grey;
+    }
   }
   .hide {
     display: none;
diff --git a/app/subscriber/src/store/hooks/subscriber/useReports.ts b/app/subscriber/src/store/hooks/subscriber/useReports.ts
@@ -7,6 +7,7 @@ import {
   IReportInstanceModel,
   IReportModel,
   IReportResultModel,
+  IUserModel,
   sortable,
   useApiSubscriberReports,
 } from 'tno-core';
@@ -15,6 +16,7 @@ interface IReportController {
   findMyReports: (filter?: IReportFilter) => Promise<IReportModel[]>;
   findPublicReports: (filter?: IReportFilter) => Promise<IReportModel[]>;
   getReport: (id: number, includeContent?: boolean) => Promise<IReportModel | undefined>;
+  getReportOwner: (id: number) => Promise<IUserModel | undefined>;
   findInstancesForReportId: (id: number, ownerId?: number) => Promise<IReportInstanceModel[]>;
   addReport: (model: IReportModel) => Promise<IReportModel>;
   updateReport: (model: IReportModel, updateInstances?: boolean) => Promise<IReportModel>;
@@ -78,6 +80,12 @@ export const useReports = (): [IProfileState, IReportController] => {
         }
         return response.data;
       },
+      getReportOwner: async (id: number) => {
+        const response = await dispatch<IUserModel | undefined>('get-report-owner', () =>
+          api.getReportOwner(id),
+        );
+        return response.data;
+      },
       findInstancesForReportId: async (
         id: number,
         ownerId?: number,
diff --git a/app/subscriber/yarn.lock b/app/subscriber/yarn.lock
@@ -12049,7 +12049,7 @@ __metadata:
     sheetjs: "file:packages/xlsx-0.20.1.tgz"
     styled-components: 6.1.11
     stylis: 4.3.2
-    tno-core: 1.0.20
+    tno-core: 1.0.21
     typescript: 4.9.5
     vitest: 3.0.7
   languageName: unknown
@@ -16404,9 +16404,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tno-core@npm:1.0.20":
-  version: 1.0.20
-  resolution: "tno-core@npm:1.0.20"
+"tno-core@npm:1.0.21":
+  version: 1.0.21
+  resolution: "tno-core@npm:1.0.21"
   dependencies:
     "@elastic/elasticsearch": ^8.13.1
     "@fortawesome/free-solid-svg-icons": ^6.4.2
@@ -16439,7 +16439,7 @@ __metadata:
     styled-components: ^6.1.11
     stylis: ^4.3.2
     yup: ^1.1.1
-  checksum: a536db93ce8ca422af81ca7f4bf49ca5a63c9ec419608e5a03f3585ab5cb9d0c6f2100ebabc909963da36d34ca6ec1f91289a3989321a44d88537c19f06a798f
+  checksum: c96bb98def24cd02587ab94853b44a41932088b656a805522851a153eb0c9176a94df00655c306e2fb2446d9b9783a3a7ffb99c71e3e74a94d14a900a87a2707
   languageName: node
   linkType: hard
 
diff --git a/libs/net/models/Areas/Subscriber/Models/User/UserColleagueModel.cs b/libs/net/models/Areas/Subscriber/Models/User/UserColleagueModel.cs
@@ -1,4 +1,3 @@
-using System.Text.Json;
 using TNO.API.Models;
 
 namespace TNO.API.Areas.Subscriber.Models.User;
@@ -46,8 +45,7 @@ public UserColleagueModel(int userId, int colleagueId)
     /// Creates a new instance of an UserModel, initializes with specified parameter.
     /// </summary>
     /// <param name="entity"></param>
-    /// <param name="serializerOptions"></param>
-    public UserColleagueModel(Entities.UserColleague entity, JsonSerializerOptions? serializerOptions = null) : base(entity)
+    public UserColleagueModel(Entities.UserColleague entity) : base(entity)
     {
         this.UserId = entity.UserId;
         this.ColleagueId = entity.ColleagueId;
@@ -59,9 +57,8 @@ public UserColleagueModel(Entities.UserColleague entity, JsonSerializerOptions?
     /// <summary>
     /// Creates a new instance of a User object.
     /// </summary>
-    /// <param name="options"></param>
     /// <returns></returns>
-    public Entities.UserColleague ToEntity(JsonSerializerOptions options)
+    public Entities.UserColleague ToEntity()
     {
         var entity = (Entities.UserColleague)this;
         return entity;
diff --git a/libs/net/models/Areas/Subscriber/Models/User/UserModel.cs b/libs/net/models/Areas/Subscriber/Models/User/UserModel.cs
@@ -1,5 +1,3 @@
-using System.Text.Json;
-
 namespace TNO.API.Areas.Subscriber.Models.User;
 
 /// <summary>
@@ -47,11 +45,6 @@ public class UserModel
     /// get/set - Last name of user.
     /// </summary>
     public string LastName { get; set; } = "";
-
-    /// <summary>
-    /// get/set - The user preferences.
-    /// </summary>
-    public JsonDocument Preferences { get; set; } = JsonDocument.Parse("{}");
     #endregion
 
     #region Constructors
@@ -74,7 +67,6 @@ public UserModel(Entities.User entity)
         this.DisplayName = entity.DisplayName;
         this.FirstName = entity.FirstName;
         this.LastName = entity.LastName;
-        this.Preferences = entity.Preferences;
     }
     #endregion
 
@@ -91,7 +83,6 @@ public static explicit operator Entities.User(UserModel model)
             FirstName = model.FirstName,
             LastName = model.LastName,
             DisplayName = model.DisplayName,
-            Preferences = model.Preferences,
             PreferredEmail = model.PreferredEmail,
         };
 
diff --git a/libs/npm/core/package.json b/libs/npm/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tno-core",
   "description": "TNO shared library",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "homepage": "https://github.com/bcgov/tno",
   "license": "Apache-2.0",
   "files": [
diff --git a/libs/npm/core/src/hooks/api/subscriber/useApiSubscriberReports.ts b/libs/npm/core/src/hooks/api/subscriber/useApiSubscriberReports.ts
@@ -10,6 +10,7 @@ import {
   IReportInstanceModel,
   IReportModel,
   IReportResultModel,
+  IUserModel,
   useApi,
 } from '../..';
 
@@ -45,6 +46,11 @@ export const useApiSubscriberReports = (
         `/subscriber/reports/${id}${includeContent ? `?includeContent=true` : ''}`,
       );
     },
+    getReportOwner: (id: number) => {
+      return api.get<never, AxiosResponse<IUserModel | undefined>, any>(
+        `/subscriber/reports/${id}/owner`,
+      );
+    },
     findInstancesForReportId: (
       id: number,
       ownerId: number | undefined = undefined,

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ public IActionResult DeleteColleague(int colleagueId)`
`145`	`145`	`{`
`146`	`146`	`var user = _impersonate.GetCurrentUser();`
`147`	`147`	`var result = _userColleagueService.RemoveColleague(user.Id, colleagueId) ?? throw new InvalidOperationException("No colleague to delete.");`
`148`		`- var deletedModel = new UserColleagueModel(result, _serializerOptions);`
	`148`	`+ var deletedModel = new UserColleagueModel(result);`
`149`	`149`	`return CreatedAtAction(nameof(DeleteColleague), new { id = result?.ColleagueId }, deletedModel);`
`150`	`150`	`}`
`151`	`151`	`#endregion`