|
-
+
))}
diff --git a/apps/console/src/pages/organizations/frameworks/NewFrameworkPage.tsx b/apps/console/src/pages/organizations/frameworks/NewFrameworkPage.tsx
index 69702e76c..0e52818db 100644
--- a/apps/console/src/pages/organizations/frameworks/NewFrameworkPage.tsx
+++ b/apps/console/src/pages/organizations/frameworks/NewFrameworkPage.tsx
@@ -12,7 +12,7 @@ export function NewFrameworkViewSkeleton() {
title="Create Framework"
description="Create a new framework to organize your mitigations"
>
-
+
);
}
diff --git a/apps/console/src/pages/organizations/frameworks/NewFrameworkView.tsx b/apps/console/src/pages/organizations/frameworks/NewFrameworkView.tsx
index 4a6c88a83..b9d232d46 100644
--- a/apps/console/src/pages/organizations/frameworks/NewFrameworkView.tsx
+++ b/apps/console/src/pages/organizations/frameworks/NewFrameworkView.tsx
@@ -56,7 +56,7 @@ function EditableField({
{helpText && (
-
+
{helpText}
)}
diff --git a/apps/console/src/pages/organizations/frameworks/controls/Control.tsx b/apps/console/src/pages/organizations/frameworks/controls/Control.tsx
index c3887bc19..c77a49247 100644
--- a/apps/console/src/pages/organizations/frameworks/controls/Control.tsx
+++ b/apps/console/src/pages/organizations/frameworks/controls/Control.tsx
@@ -451,42 +451,42 @@ export function Control({
};
const getImportanceColor = (importance: string | undefined): string => {
- if (!importance) return "bg-gray-100 text-gray-800";
+ if (!importance) return "bg-secondary-bg text-secondary";
switch (importance) {
case "LOW":
- return "bg-blue-100 text-blue-800";
+ return "bg-success-bg text-success";
case "MEDIUM":
- return "bg-yellow-100 text-yellow-800";
+ return "bg-info-bg text-info";
case "HIGH":
- return "bg-orange-100 text-orange-800";
+ return "bg-warning-bg text-warning";
case "CRITICAL":
- return "bg-red-100 text-red-800";
+ return "bg-danger-bg text-danger";
default:
- return "bg-gray-100 text-gray-800";
+ return "bg-secondary-bg text-secondary";
}
};
const getStateColor = (state: string | undefined): string => {
- if (!state) return "bg-gray-100 text-gray-800";
+ if (!state) return "bg-secondary-bg text-secondary";
switch (state) {
case "NOT_STARTED":
- return "bg-gray-100 text-gray-800";
+ return "bg-secondary-bg text-secondary";
case "IN_PROGRESS":
- return "bg-blue-100 text-blue-800";
+ return "bg-info-bg text-info";
case "IMPLEMENTED":
- return "bg-green-100 text-green-800";
+ return "bg-success-bg text-success";
case "NOT_APPLICABLE":
- return "bg-purple-100 text-purple-800";
+ return "bg-warning-bg text-warning";
default:
- return "bg-gray-100 text-gray-800";
+ return "bg-secondary-bg text-secondary";
}
};
return (
-
+
{control.referenceId}
@@ -494,7 +494,7 @@ export function Control({
{/* Control Description */}
{control.description && (
- {control.description}
+ {control.description}
)}
{/* Security Measures Section */}
@@ -516,7 +516,7 @@ export function Control({
-
+
{isLoadingMitigations ? (
-
+
Loading security measures...
) : (
{filteredMitigations().length === 0 ? (
-
+
No security measures found. Try adjusting your search or
select a different category.
) : (
-
+
-
+
| Name |
Importance
@@ -580,14 +580,14 @@ export function Control({
return (
|
|
{mitigation.name}
{mitigation.description && (
-
+
{mitigation.description}
)}
@@ -619,7 +619,7 @@ export function Control({
handleUnlinkMitigation(mitigation.id)
}
disabled={isUnlinkingMitigation}
- className="text-xs h-7 text-red-500 border-red-200 hover:bg-red-50"
+ className="text-xs h-7 text-danger border-danger-b hover:bg-h-danger-bg"
>
{isUnlinkingMitigation ? (
@@ -630,13 +630,13 @@ export function Control({
) : (
|
) : (
-
+
No controls linked to this mitigation yet. Click "Map
to Controls" to link controls.
@@ -2211,7 +2210,7 @@ function MitigationViewContent({
Tasks
-
+
Drag & drop files onto tasks to add evidence
@@ -2269,7 +2268,7 @@ function MitigationViewContent({
}
placeholder="Days"
/>
- Days
+ Days
@@ -2319,10 +2318,10 @@ function MitigationViewContent({
{tasks.map((task) => (
Adding document...
- Please wait
+ Please wait
)}
{
e.stopPropagation(); // Prevent task selection when checkbox is clicked
@@ -2384,7 +2381,7 @@ function MitigationViewContent({
}}
>
{task?.state === "DONE" && (
-
+
)}
{task?.name}
@@ -2406,7 +2402,7 @@ function MitigationViewContent({
@@ -2417,7 +2413,7 @@ function MitigationViewContent({
)}
{task?.assignedTo && (
-
+
{task.assignedTo.fullName}
@@ -2439,7 +2435,7 @@ function MitigationViewContent({
{
e.stopPropagation();
if (task?.id) {
@@ -2461,12 +2457,12 @@ function MitigationViewContent({
{task?.assignedTo ? (
-
+
{task.assignedTo.fullName}
-
+
{task.assignedTo.primaryEmailAddress}
@@ -2505,7 +2501,7 @@ function MitigationViewContent({
}}
/>
-
+
Click on a person to assign them to this task
@@ -2574,7 +2570,7 @@ function MitigationViewContent({
{edge.node.fullName}
-
+
{edge.node.primaryEmailAddress}
@@ -2591,7 +2587,7 @@ function MitigationViewContent({
{
e.stopPropagation();
if (task?.id && task?.name) {
@@ -2604,7 +2600,7 @@ function MitigationViewContent({
{
e.stopPropagation();
if (task?.id && task?.name) {
@@ -2623,7 +2619,7 @@ function MitigationViewContent({
task.evidences.edges.length > 0 && (
<>
{
e.stopPropagation(); // Prevent task selection
if (task.id) toggleEvidenceList(task.id);
@@ -2631,7 +2627,7 @@ function MitigationViewContent({
>
-
+
{task.evidences.edges.length}{" "}
{task.evidences.edges.length === 1
? "Evidence"
@@ -2639,14 +2635,14 @@ function MitigationViewContent({
{expandedEvidenceTaskId === task.id ? (
-
+
) : (
-
+
)}
{expandedEvidenceTaskId === task.id && (
-
+
{task.evidences.edges.map((edge) => {
if (!edge) return null;
const evidence = edge.node;
@@ -2655,17 +2651,17 @@ function MitigationViewContent({
return (
-
+
{getFileIcon(
evidence.mimeType,
evidence.type
)}
-
+
{evidence.filename}
{evidence.state === "REQUESTED" && (
)}
-
+
{evidence.state === "REQUESTED" ? (
Waiting for fulfillment
{evidence.description && (
<>
•
-
+
{evidence.description}
>
@@ -2691,7 +2687,7 @@ function MitigationViewContent({
) : evidence.type === "FILE" ? (
<>
-
+
{formatFileSize(evidence.size)}
•
@@ -2802,7 +2798,7 @@ function MitigationViewContent({
))}
{tasks.length === 0 && (
-
+
No tasks yet. Click "Add Task" to create one.
)}
@@ -2843,7 +2839,7 @@ function MitigationViewContent({
{risksData.mitigation.risks.edges.map(({ node }) => (
navigate(
`/organizations/${organizationId}/risks/${node.id}`
@@ -2883,7 +2879,7 @@ function MitigationViewContent({
) : (
-
+
No risks linked to this mitigation yet.
)}
@@ -2906,7 +2902,7 @@ function MitigationViewContent({
{selectedTask.name}
-
+
@@ -2929,7 +2925,7 @@ function MitigationViewContent({
{!isEditingDuration ? (
startEditingDuration(selectedTask.timeEstimate)
}
@@ -2954,7 +2950,7 @@ function MitigationViewContent({
className="w-12 p-1 text-xs border rounded"
placeholder="0"
/>
- d
+ d
- h
+ h
- m
+ m
setIsEditingDuration(false)}
>
Cancel
@@ -3004,10 +3000,10 @@ function MitigationViewContent({
{/* Task description */}
{selectedTask.description && (
-
+
Description
-
+
{selectedTask.description}
@@ -3015,11 +3011,11 @@ function MitigationViewContent({
{/* Assigned person */}
-
+
Assignment
{selectedTask.assignedTo ? (
-
+
@@ -3028,7 +3024,7 @@ function MitigationViewContent({
{selectedTask.assignedTo.fullName}
-
+
{selectedTask.assignedTo.primaryEmailAddress}
@@ -3044,8 +3040,8 @@ function MitigationViewContent({
) : (
-
-
+
+
No one is assigned to this task
@@ -3115,7 +3111,7 @@ function MitigationViewContent({
{edge.node.fullName}
-
+
{edge.node.primaryEmailAddress}
@@ -3134,7 +3130,7 @@ function MitigationViewContent({
{/* Evidence section */}
-
+
Evidence
-
+
{getFileIcon(evidence.mimeType, evidence.type)}
-
+
{evidence.filename}
{evidence.state === "REQUESTED" && (
)}
-
+
{evidence.state === "REQUESTED" ? (
Waiting for fulfillment
{evidence.description && (
<>
•
-
+
{evidence.description}
>
@@ -3194,7 +3190,7 @@ function MitigationViewContent({
) : evidence.type === "FILE" ? (
<>
-
+
{formatFileSize(evidence.size)}
•
@@ -3296,12 +3292,12 @@ function MitigationViewContent({
);
})
) : (
-
-
-
+
+
+
No evidence attached yet
-
+
Upload files or add links to provide evidence
@@ -3492,7 +3488,7 @@ function MitigationViewContent({
{previewEvidence?.filename}
setIsPreviewModalOpen(false)}
- className="rounded-full p-1 hover:bg-gray-100"
+ className="rounded-full p-1 hover:bg-secondary-bg"
>
@@ -3502,11 +3498,11 @@ function MitigationViewContent({
from here.
-
+
{isLoadingFileUrl ? (
- Loading preview...
+ Loading preview...
) : previewEvidence?.fileUrl ? (
previewEvidence.mimeType.startsWith("image/") ? (
@@ -3523,8 +3519,8 @@ function MitigationViewContent({
/>
) : (
-
-
+
+
Preview not available for this file type
-
- Failed to load preview
+
+ Failed to load preview
)}
diff --git a/apps/console/src/pages/organizations/mitigations/NewMitigationPage.tsx b/apps/console/src/pages/organizations/mitigations/NewMitigationPage.tsx
index aa62962c3..1af6bbf68 100644
--- a/apps/console/src/pages/organizations/mitigations/NewMitigationPage.tsx
+++ b/apps/console/src/pages/organizations/mitigations/NewMitigationPage.tsx
@@ -12,7 +12,7 @@ export function NewMitigationViewSkeleton() {
title="New Mitigation"
description="Add a new mitigation. You will be able to link it to control and risks"
>
-
+
);
}
diff --git a/apps/console/src/pages/organizations/mitigations/NewMitigationView.tsx b/apps/console/src/pages/organizations/mitigations/NewMitigationView.tsx
index 543b3f1b9..8f411cf5b 100644
--- a/apps/console/src/pages/organizations/mitigations/NewMitigationView.tsx
+++ b/apps/console/src/pages/organizations/mitigations/NewMitigationView.tsx
@@ -152,7 +152,7 @@ export default function NewMitigationView() {
"rounded-full cursor-pointer px-4 py-1 text-sm transition-colors",
formData.importance === "MANDATORY"
? "bg-red-100 text-red-900 ring-2 ring-red-600 ring-offset-2"
- : "bg-gray-100 text-gray-900 hover:bg-gray-200"
+ : "bg-secondary-bg text-primary hover:bg-h-secondary-bg"
)}
>
Mandatory
@@ -164,7 +164,7 @@ export default function NewMitigationView() {
"rounded-full cursor-pointer px-4 py-1 text-sm transition-colors",
formData.importance === "PREFERRED"
? "bg-yellow-100 text-yellow-900 ring-2 ring-yellow-600 ring-offset-2"
- : "bg-gray-100 text-gray-900 hover:bg-gray-200"
+ : "bg-secondary-bg text-primary hover:bg-h-secondary-bg"
)}
>
Preferred
@@ -176,7 +176,7 @@ export default function NewMitigationView() {
"rounded-full cursor-pointer px-4 py-1 text-sm transition-colors",
formData.importance === "ADVANCED"
? "bg-blue-100 text-blue-900 ring-2 ring-blue-600 ring-offset-2"
- : "bg-gray-100 text-gray-900 hover:bg-gray-200"
+ : "bg-secondary-bg text-primary hover:bg-h-secondary-bg"
)}
>
Advanced
diff --git a/apps/console/src/pages/organizations/people/NewPeoplePage.tsx b/apps/console/src/pages/organizations/people/NewPeoplePage.tsx
index ceeb9181c..b6da06226 100644
--- a/apps/console/src/pages/organizations/people/NewPeoplePage.tsx
+++ b/apps/console/src/pages/organizations/people/NewPeoplePage.tsx
@@ -12,7 +12,7 @@ export function NewPeopleViewSkeleton() {
title="New Person"
description="Add a new person interacting with organization"
>
-
+
);
}
diff --git a/apps/console/src/pages/organizations/people/NewPeopleView.tsx b/apps/console/src/pages/organizations/people/NewPeopleView.tsx
index 4c66869fe..d00c89fac 100644
--- a/apps/console/src/pages/organizations/people/NewPeopleView.tsx
+++ b/apps/console/src/pages/organizations/people/NewPeopleView.tsx
@@ -49,7 +49,7 @@ function EditableField({
return (
-
+
@@ -59,7 +59,7 @@ function EditableField({
onChange={(e) => onChange(e.target.value)}
required={required}
/>
- {helpText && {helpText} }
+ {helpText && {helpText} }
);
@@ -175,7 +175,7 @@ function NewPeopleViewContent() {
-
+
@@ -224,7 +224,7 @@ function NewPeopleViewContent() {
Additional Information
-
+
Additional details about the person
@@ -232,7 +232,7 @@ function NewPeopleViewContent() {
-
+
@@ -243,7 +243,7 @@ function NewPeopleViewContent() {
"rounded-full px-4 py-1 text-sm transition-colors",
formData.kind === "EMPLOYEE"
? "bg-blue-100 text-blue-900 ring-2 ring-blue-600 ring-offset-2"
- : "bg-gray-100 text-gray-900 hover:bg-gray-200"
+ : "bg-secondary-bg text-primary hover:bg-h-secondary-bg"
)}
>
Employee
@@ -255,7 +255,7 @@ function NewPeopleViewContent() {
"rounded-full px-4 py-1 text-sm transition-colors",
formData.kind === "CONTRACTOR"
? "bg-purple-100 text-purple-900 ring-2 ring-purple-600 ring-offset-2"
- : "bg-gray-100 text-gray-900 hover:bg-gray-200"
+ : "bg-secondary-bg text-primary hover:bg-h-secondary-bg"
)}
>
Contractor
@@ -269,7 +269,7 @@ function NewPeopleViewContent() {
"rounded-full px-4 py-1 text-sm transition-colors",
formData.kind === "SERVICE_ACCOUNT"
? "bg-green-100 text-green-900 ring-2 ring-green-600 ring-offset-2"
- : "bg-gray-100 text-gray-900 hover:bg-gray-200"
+ : "bg-secondary-bg text-primary hover:bg-h-secondary-bg"
)}
>
Service Account
@@ -286,7 +286,7 @@ function NewPeopleViewContent() {
Create Person
diff --git a/apps/console/src/pages/organizations/people/PeopleListPage.tsx b/apps/console/src/pages/organizations/people/PeopleListPage.tsx
index bb2ce7430..41ce697a9 100644
--- a/apps/console/src/pages/organizations/people/PeopleListPage.tsx
+++ b/apps/console/src/pages/organizations/people/PeopleListPage.tsx
@@ -11,18 +11,20 @@ export function PeopleListViewSkeleton() {
}
+ actions={
+
+ }
>
-
-
-
+
{[1, 2, 3].map((i) => (
))}
diff --git a/apps/console/src/pages/organizations/people/PeopleListView.tsx b/apps/console/src/pages/organizations/people/PeopleListView.tsx
index 51ae2eff1..10c911d8c 100644
--- a/apps/console/src/pages/organizations/people/PeopleListView.tsx
+++ b/apps/console/src/pages/organizations/people/PeopleListView.tsx
@@ -179,12 +179,7 @@ function PeopleListContent({
description="Keep track of your company's workforce and their progress
towards completing tasks assigned to them."
actions={
-
+
Add a person
@@ -200,7 +195,7 @@ function PeopleListContent({
to={`/organizations/${organizationId}/people/${person?.id}`}
className="block"
>
-
+
{person?.fullName?.[0]}
@@ -209,8 +204,8 @@ function PeopleListContent({
{person?.fullName}
{person?.primaryEmailAddress && (
<>
- •
-
+ •
+
{person.primaryEmailAddress}
>
@@ -218,10 +213,7 @@ function PeopleListContent({
-
+
{person?.kind === "EMPLOYEE"
? "Employee"
: person?.kind === "CONTRACTOR"
@@ -233,7 +225,7 @@ function PeopleListContent({
{
e.preventDefault();
if (
@@ -254,7 +246,7 @@ function PeopleListContent({
>
-
+
diff --git a/apps/console/src/pages/organizations/people/PeoplePage.tsx b/apps/console/src/pages/organizations/people/PeoplePage.tsx
index 7f836b40a..e3122205b 100644
--- a/apps/console/src/pages/organizations/people/PeoplePage.tsx
+++ b/apps/console/src/pages/organizations/people/PeoplePage.tsx
@@ -11,12 +11,15 @@ export function PeopleViewSkeleton() {
{[1, 2].map((i) => (
-
+
))}
diff --git a/apps/console/src/pages/organizations/people/PeopleView.tsx b/apps/console/src/pages/organizations/people/PeopleView.tsx
index 99355d0fc..29d5baccf 100644
--- a/apps/console/src/pages/organizations/people/PeopleView.tsx
+++ b/apps/console/src/pages/organizations/people/PeopleView.tsx
@@ -73,7 +73,7 @@ function EditableField({
return (
-
+
@@ -82,7 +82,7 @@ function EditableField({
value={value}
onChange={(e) => onChange(e.target.value)}
/>
- {helpText && {helpText} }
+ {helpText && {helpText} }
);
@@ -164,7 +164,7 @@ function PeopleViewContent({
return (
-
+
-
+
@@ -229,7 +229,7 @@ function PeopleViewContent({
Additional Information
-
+
Additional details about the person
@@ -237,7 +237,7 @@ function PeopleViewContent({
-
+
|