Merge pull request #362 from UKSpaceAgency/develop

Release

Author: marvin-42

.github/workflows/deploy-to-aws-dev.yml

@@ -70,3 +70,4 @@ jobs:
           ref: main
           token: ${{ secrets.INFRA_REPO_TOKEN }}
           inputs: '{ "invoker": "frontend", "env": "dev", "image-tag":"${{ github.sha }}"}'
+

.github/workflows/rebuild-email-renderer.yml

@@ -0,0 +1,20 @@
+name: Rebuild backend email-renderer
+
+on:
+  push:
+    branches:
+      - develop
+    paths:
+      - 'src/emails/**'
+      - 'src/locales/en.json'
+
+jobs:
+  dispatch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger backend email-renderer rebuild
+        uses: peter-evans/repository-dispatch@v3
+        with:
+          token: ${{ secrets.INFRA_REPO_TOKEN }}
+          repository: UKSpaceAgency/sst-beta-python-backend
+          event-type: fe-email-templates-updated

public/Monitor Space Hazards Privacy Notice.pdf

@@ -3,7 +3,8 @@ import { notFound } from 'next/navigation';
 
 import type { TypeAlertSettingsIn } from '@/__generated__/data-contracts';
 import { getAlertsUserUserId } from '@/actions/getAlertsUserUserId';
-import { getUsersMe } from '@/actions/getUsersMe';
+import { getSession } from '@/actions/getSession';
+import { getUsersById } from '@/actions/getUserById';
 import { patchAlertsUserUserId } from '@/actions/patchAlertsUserUserId';
 import { AlertSettingsForm } from '@/components/account/alert-settings/AlertSettingsForm';
 import { isAgencyApprover } from '@/utils/Roles';
@@ -20,10 +21,11 @@ export default async function EditUserAlertSettingsPage({
 }) {
   const { id } = await params;
 
-  const user = await getUsersMe();
+  const session = await getSession();
   const alertSettings = await getAlertsUserUserId(id);
+  const user = await getUsersById(id);
 
-  if (!isAgencyApprover(user.role)) {
+  if (!isAgencyApprover(session?.user.role)) {
     notFound();
   }
 
@@ -45,6 +47,7 @@ export default async function EditUserAlertSettingsPage({
   return (
     <div>
       <AlertSettingsForm
+        user={user}
         defaultValues={defaultValues}
         selfEdit={false}
         onSubmit={onSubmit}

src/app/(auth)/account/alert-settings/[id]/page.tsx

@@ -1,13 +1,15 @@
 import type { Metadata } from 'next';
+import { notFound } from 'next/navigation';
 import { getTranslations } from 'next-intl/server';
 import { Suspense } from 'react';
 
 import type { TypeGetActivityEventsParams } from '@/__generated__/data-contracts';
-import { getActivityEvents } from '@/actions/getActivityEvents';
-import { ActivitiesDataTable } from '@/components/activities/data-table/ActivitiesDataTable';
+import { getSession } from '@/actions/getSession';
+import { ActivitiesEventsTable } from '@/components/activities/ActivitiesEventsTable';
 import { SearchBar } from '@/components/SearchBar';
 import Details from '@/ui/details/details';
 import Spinner from '@/ui/spinner/spinner';
+import { isAgencyUser, isRegulatorUser } from '@/utils/Roles';
 
 export const metadata: Metadata = {
   title: 'Monitor UK satellite activity',
@@ -21,6 +23,7 @@ type PageProps = {
 
 export default async function ActivitiesPage(props: PageProps) {
   const t = await getTranslations('Activities');
+  const session = await getSession();
 
   const searchParams = await props.searchParams;
 
@@ -29,15 +32,17 @@ export default async function ActivitiesPage(props: PageProps) {
     limit: 50,
   };
 
-  const initialData = await getActivityEvents(params);
+  if (!isAgencyUser(session?.user.role) && !isRegulatorUser(session?.user.role)) {
+    notFound();
+  }
 
   return (
     <div>
       <h1 className="govuk-heading-xl">{t('title')}</h1>
       {t.rich('description')}
       <SearchBar label={t('search_bar.label')} id="satellites_search_bar" placeholder={t('search_bar.placeholder')} ariaLabel="Satellite Search Bar" />
       <Suspense fallback={<Spinner />}>
-        <ActivitiesDataTable initialData={initialData} params={params} />
+        <ActivitiesEventsTable params={params} />
       </Suspense>
       <Details summary={t.rich('help.title')}>
         {t.rich('help.content')}

src/app/(auth)/activity/page.tsx

@@ -0,0 +1,31 @@
+import { getOrganisation } from '@/actions/getOrganisation';
+
+type PageProps = {
+  params: Promise<{ id: string }>;
+};
+
+export async function generateMetadata({
+  params,
+}: PageProps) {
+  const { id } = await params;
+  const organisations = await getOrganisation(id);
+  return {
+    title: organisations.name,
+  };
+}
+
+export default async function OrganisationPage({
+  params,
+}: PageProps) {
+  const { id } = await params;
+  const organisations = await getOrganisation(id);
+
+  return (
+    <div>
+      <h1 className="govuk-heading-xl">
+        {organisations.name}
+      </h1>
+      {/* <ContentNavigation className="mb-8" /> */}
+    </div>
+  );
+}

src/app/(auth)/organisations/[id]/page.tsx

@@ -4,7 +4,7 @@ import { HtmlMapper } from '@/components/HtmlMapper';
 import { getPage } from '@/libs/Cms';
 
 export const metadata: Metadata = {
-  title: 'Accessibility statement for NSpOC\'s Monitor Space Hazards service',
+  title: 'Accessibility statement for NSpOC Monitor Space Hazards service',
 };
 
 export default async function AccessibilityStatement() {

src/app/(unauth)/accessibility-statement/page.tsx

@@ -0,0 +1,35 @@
+import { getTranslations } from 'next-intl/server';
+
+import { getUsersById } from '@/actions/getUserById';
+import { Breadcrumb, BreadcrumbItem, BreadcrumbLink, BreadcrumbList, BreadcrumbPage } from '@/ui/breadcrumbs/breadcrumbs';
+
+export default async function BreadcrumbOrganisationSlot({
+  params,
+}: { params: Promise<{ id: string }> }) {
+  const { id } = await params;
+  const t = await getTranslations('Breadcrumb');
+  const user = await getUsersById(id);
+
+  return (
+    <Breadcrumb>
+      <BreadcrumbList>
+        <BreadcrumbItem>
+          <BreadcrumbLink href="/">Home</BreadcrumbLink>
+        </BreadcrumbItem>
+        <BreadcrumbItem>
+          <BreadcrumbLink href="/account">{t('account')}</BreadcrumbLink>
+        </BreadcrumbItem>
+        <BreadcrumbItem>
+          <BreadcrumbLink href="/account/distribution-list">{t('distribution-list')}</BreadcrumbLink>
+        </BreadcrumbItem>
+        <BreadcrumbItem>
+          <BreadcrumbPage>
+            {user.first_name}
+            {' '}
+            {user.last_name}
+          </BreadcrumbPage>
+        </BreadcrumbItem>
+      </BreadcrumbList>
+    </Breadcrumb>
+  );
+}

src/app/@breadcrumb/account/alert-settings/[id]/page.tsx

@@ -5,7 +5,7 @@ import { useState } from 'react';
 import type { SubmitHandler, UseFormRegister } from 'react-hook-form';
 import { FormProvider, useForm } from 'react-hook-form';
 
-import type { TypeAlertSettingsIn } from '@/__generated__/data-contracts';
+import type { TypeAlertSettingsIn, TypeUserOut } from '@/__generated__/data-contracts';
 import Accordion from '@/ui/accordion/accordion';
 import Button from '@/ui/button/button';
 import Checkboxes from '@/ui/checkboxes/checkboxes';
@@ -49,12 +49,13 @@ function Option({
 }
 
 type AlertSettingsFormProps = {
+  user?: TypeUserOut;
   defaultValues: AlertSettingsSchema;
   selfEdit?: boolean;
   onSubmit: (data: TypeAlertSettingsIn) => Promise<void>;
 };
 
-const AlertSettingsForm = ({ defaultValues, selfEdit = true, onSubmit: onSubmitAction }: AlertSettingsFormProps) => {
+const AlertSettingsForm = ({ user, defaultValues, selfEdit = true, onSubmit: onSubmitAction }: AlertSettingsFormProps) => {
   const t = useTranslations('Forms.Alert_settings');
   const tCommon = useTranslations('Common');
 
@@ -105,8 +106,8 @@ const AlertSettingsForm = ({ defaultValues, selfEdit = true, onSubmit: onSubmitA
           )
         : (
             <>
-              <h1 className="govuk-heading-xl">{t('title', { whose: selfEdit ? 'your' : 'user\'s' })}</h1>
-              <p className="govuk-body">{t('description')}</p>
+              <h1 className="govuk-heading-xl">{t('title', { whose: selfEdit ? 'your' : user?.first_name ? `${user.first_name}'s` : 'user\'s' })}</h1>
+              <p className="govuk-body">{t('description', { to: user?.first_name ? `${user.first_name} ${user.last_name}` : 'you' })}</p>
               {selfEdit && (
                 <WarningText>
                   {t('warning')}
@@ -119,43 +120,6 @@ const AlertSettingsForm = ({ defaultValues, selfEdit = true, onSubmit: onSubmitA
                   <Accordion
                     id="alert-settings"
                     initialItems={[
-                      {
-                        id: 'conjunction_alerts',
-                        heading: t('conjunction_alerts'),
-                        content: (
-                          <>
-                            <Checkboxes
-                              aria-label="Conjunction Alerts"
-                              legend={t(
-                                `${selfEdit ? 'self_which' : 'their_which'}`,
-                                { type: 'conjunction' },
-                              )}
-                              hint={t('select_one_option')}
-                              items={[{
-                                id: 'receive_all_conjunction_alerts',
-                                value: 'standard',
-                                children: t('receive_all_conjunction_alerts'),
-                                hint: t('recommended_for'),
-                                ...register('conjunctionAlerts'),
-                              }, {
-                                id: 'only_priority_conjunction_alerts',
-                                value: 'priority',
-                                children: t('only_priority_conjunction_alerts'),
-                                hint: t('recommended_for_all_other'),
-                                ...register('conjunctionAlerts'),
-                              }]}
-                            />
-                            <AlertSettingsDetails type="conjunction" />
-                            <Option
-                              id="receiveConjunction"
-                              name="receiveConjunction"
-                              hint={t('select_one_option')}
-                              label={t('how_would_you_like_conjunction')}
-                              register={register}
-                            />
-                          </>
-                        ),
-                      },
                       {
                         id: 're_entry_alerts',
                         heading: t('re_entry_alerts'),
@@ -251,6 +215,43 @@ const AlertSettingsForm = ({ defaultValues, selfEdit = true, onSubmit: onSubmitA
                           </>
                         ),
                       },
+                      {
+                        id: 'conjunction_alerts',
+                        heading: t('conjunction_alerts'),
+                        content: (
+                          <>
+                            <Checkboxes
+                              aria-label="Conjunction Alerts"
+                              legend={t(
+                                `${selfEdit ? 'self_which' : 'their_which'}`,
+                                { type: 'conjunction' },
+                              )}
+                              hint={t('select_one_option')}
+                              items={[{
+                                id: 'receive_all_conjunction_alerts',
+                                value: 'standard',
+                                children: t('receive_all_conjunction_alerts'),
+                                hint: t('recommended_for'),
+                                ...register('conjunctionAlerts'),
+                              }, {
+                                id: 'only_priority_conjunction_alerts',
+                                value: 'priority',
+                                children: t('only_priority_conjunction_alerts'),
+                                hint: t('recommended_for_all_other'),
+                                ...register('conjunctionAlerts'),
+                              }]}
+                            />
+                            <AlertSettingsDetails type="conjunction" />
+                            <Option
+                              id="receiveConjunction"
+                              name="receiveConjunction"
+                              hint={t('select_one_option')}
+                              label={t('how_would_you_like_conjunction')}
+                              register={register}
+                            />
+                          </>
+                        ),
+                      },
                     ]}
                   />
                   <div className="govuk-button-group">