+ {dict.general.comingSoon} +
++ {dict.general.comingSoon} +
+|
@@ -82,7 +86,7 @@ export function DataTable | ||
|---|---|---|
| ({
{!loading && data.length > 0 && totalItems !== undefined && (
Items per page:
diff --git a/frontend/src/features/designer/ui/FormForm.tsx b/frontend/src/features/designer/ui/FormForm.tsx
index 4d06652..c31036e 100644
--- a/frontend/src/features/designer/ui/FormForm.tsx
+++ b/frontend/src/features/designer/ui/FormForm.tsx
@@ -362,11 +362,16 @@ function FormForm({ id }: { id?: string[] }) {
{dict.form.disclaimerLabel ||
'I agree to the disclaimer and statement of responsibility'}
-
diff --git a/frontend/src/features/designer/ui/FormList.tsx b/frontend/src/features/designer/ui/FormList.tsx
index f3b4c5f..c82870f 100644
--- a/frontend/src/features/designer/ui/FormList.tsx
+++ b/frontend/src/features/designer/ui/FormList.tsx
@@ -4,8 +4,10 @@ import { useState, useEffect, useMemo, useCallback } from 'react';
import { Container } from 'react-bootstrap';
import { Button as DSButton, ProgressCircle, TextField } from '@bcgov/design-system-react-components';
import { DataTable, type Column } from '@/src/components/DataTable';
+import { DsPageHeading } from '@/app/ui/DsPageHeading';
import { useKeycloak } from '@/lib/hooks/useKeycloak';
import { useDictionary } from '@/app/[lang]/Providers';
+import Link from 'next/link';
import { useRouter, usePathname } from 'next/navigation';
import { getLocaleFromPath } from '@/src/shared/util/locale';
import { FaMagnifyingGlass, FaX } from 'react-icons/fa6';
@@ -154,18 +156,13 @@ function FormList({
width: '40%',
render: (form: SobaFormSummary) => {
return designModeEnabled ? (
- {
- e.preventDefault();
- handleAction('manage', form.id);
- }}
- className="text-decoration-underline"
- style={{ cursor: 'pointer', color: '#00538A' }}
+ className="text-decoration-underline link-primary"
>
{form.name || dictForm?.nameLabel || 'Untitled Form'}
-
+
) : (
{form.name || dictForm?.nameLabel || 'Untitled Form'}
);
@@ -200,7 +197,15 @@ function FormList({
),
},
],
- [handleAction, dictFormList, dictForm, designModeEnabled, submitModeEnabled, formatLongDate],
+ [
+ handleAction,
+ locale,
+ dictFormList,
+ dictForm,
+ designModeEnabled,
+ submitModeEnabled,
+ formatLongDate,
+ ],
);
if (initializing)
@@ -213,9 +218,7 @@ function FormList({
return (
-
+ Forms-
{designModeEnabled && (
-
+ {dict.submission?.submissions || 'Submissions'}-
+
+ );
+}
diff --git a/frontend/src/app/ui/AuthRedirect.tsx b/frontend/src/app/ui/AuthRedirect.tsx
index 2125664..fc70f1f 100644
--- a/frontend/src/app/ui/AuthRedirect.tsx
+++ b/frontend/src/app/ui/AuthRedirect.tsx
@@ -4,7 +4,7 @@ import { useEffect } from 'react';
import { useRouter } from 'next/navigation';
import { useKeycloak } from '@/lib/hooks/useKeycloak';
import { useDictionary } from '@/app/[lang]/Providers';
-import { ProgressCircle } from '@bcgov/design-system-react-components';
+import { CenteredProgress } from '@/app/ui/base/CenteredProgress';
export function AuthRedirect({
to,
@@ -28,14 +28,7 @@ export function AuthRedirect({
}, [shouldRedirect, router, to]);
if (initializing || shouldRedirect) {
- return (
-
-
- );
+ return
- |
-
+
+ |
Loading Designer... ;
+ return Loading Form Designer... ,
+ loading: () =>
{id && id[0] ? (
loading ? (
-
-
+
-
- );
- if (!authenticated) return {dict.general.notAuthenticated} ;
+ // Auth gate only — loading (including Keycloak init) is shown inside the table
+ // body so the page heading stays visible throughout.
+ if (!authenticated && !initializing) {
+ return {dict.general.notAuthenticated} ;
+ }
return (
Loading form renderer… , + loading: () =>- Loading… - - ), + loading: () =>- Loading… - - ), + loading: () =>{dict.form?.loading || 'Loading submissions...'} ;
- }
-
- if (!authenticated) {
+ // Auth gate only — loading (including Keycloak init) is shown inside the table
+ // body so the page heading stays visible throughout.
+ if (!authenticated && !initializing) {
return null;
}
diff --git a/frontend/src/features/submit-mode/ui/SubmissionView.tsx b/frontend/src/features/submit-mode/ui/SubmissionView.tsx
index 24d6c8b..80654c8 100644
--- a/frontend/src/features/submit-mode/ui/SubmissionView.tsx
+++ b/frontend/src/features/submit-mode/ui/SubmissionView.tsx
@@ -3,7 +3,8 @@
import { useParams } from 'next/navigation';
import { useEffect, useState } from 'react';
import type { FormType, Submission } from '@formio/react';
-import { ProgressCircle, InlineAlert } from '@bcgov/design-system-react-components';
+import { InlineAlert } from '@bcgov/design-system-react-components';
+import { CenteredProgress } from '@/app/ui/base/CenteredProgress';
import { useKeycloak } from '@/lib/hooks/useKeycloak';
import { useDictionary } from '@/app/[lang]/Providers';
import { useAppSelector } from '@/lib/store';
@@ -63,18 +64,14 @@ export function SubmissionView() {
}, [authenticated, token, submissionId, ws, loaded]);
if (initializing || (authenticated && !token)) {
- return (
-
-
- );
+ return
{!loaded ? (
- {dictSub?.loading || 'Loading…'} +{labels.loading} ; + return
-
- )}
+
+
- {submission.formName || dict.form?.nameLabel || 'Submission'}+{submission.formName || dict.form?.nameLabel || 'Submission'}
v{submission.versionNo ?? 1}
{' · '}
-
- {(submission.workflowState || '').toUpperCase()}
-
+ You must be logged in ;
+ if (initializing) {
+ return Forms initializing ;
+ if (!authenticated) {
+ return {dict.general.notAuthenticated} ;
}
const renderDesignerContent = () => (
@@ -417,13 +417,13 @@ function FormForm({ id }: { id?: string[] }) {
)}
- |