Skip to content

Commit 8e41c5b

Browse files
authored
ISS-55 (#835)
* initial Signed-off-by: Bruno Kucevic <[email protected]> * table skeleton Signed-off-by: Bruno Kucevic <[email protected]> * object w slideout skeleton and programs page skeleton Signed-off-by: Bruno Kucevic <[email protected]> * evidence skeleton and data table no results response Signed-off-by: Bruno Kucevic <[email protected]> * control-report-skeleton Signed-off-by: Bruno Kucevic <[email protected]> * more skeletons Signed-off-by: Bruno Kucevic <[email protected]> * skeleton fixes Signed-off-by: Bruno Kucevic <[email protected]> * breadcrumb fix Signed-off-by: Bruno Kucevic <[email protected]> --------- Signed-off-by: Bruno Kucevic <[email protected]>
1 parent d7cbef3 commit 8e41c5b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+911
-115
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { Loading } from '@/components/shared/loading/loading'
1+
import { ControlReportPageSkeleton } from '@/components/pages/protected/control-report/skeleton/control-report-page-skeleton'
22
import React from 'react'
33

44
const Loader: React.FC = () => {
5-
return <Loading />
5+
return <ControlReportPageSkeleton />
66
}
77

88
export default Loader
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { Loading } from '@/components/shared/loading/loading'
1+
import { ObjectWithDetailsSkeleton } from '@/components/shared/skeleton/object-with-slideout-skeleton'
22
import React from 'react'
33

44
const Loader: React.FC = () => {
5-
return <Loading />
5+
return <ObjectWithDetailsSkeleton />
66
}
77

88
export default Loader

apps/console/src/app/(protected)/controls/[id]/page.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ import { useOrganization } from '@/hooks/useOrganization'
4242
import ObjectAssociationSwitch from '@/components/shared/object-association/object-association-switch.tsx'
4343
import { ObjectAssociationNodeEnum } from '@/components/shared/object-association/types/object-association-types.ts'
4444
import { AccessEnum } from '@/lib/authz/enums/access-enum.ts'
45+
import Loading from './loading.tsx'
4546

4647
interface FormValues {
4748
refCode: string
@@ -220,7 +221,9 @@ const ControlDetailsPage: React.FC = () => {
220221
}
221222
}, [data?.control, form])
222223

223-
if (isLoading) return <div className="p-4 text-muted-foreground">Loading...</div>
224+
if (isLoading) {
225+
return <Loading />
226+
}
224227
if (isError || !data?.control) return <div className="p-4 text-red-500">Control not found</div>
225228
const control = data?.control
226229
const hasInfoData = control.implementationGuidance || control.exampleEvidence || control.controlQuestions || control.assessmentMethods || control.assessmentObjectives

apps/console/src/app/(protected)/dashboard/loading.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react'
2-
import DashboardSkeleton from '@/app/(protected)/dashboard/dashboard-skeleton.tsx'
2+
import DashboardSkeleton from '@/components/pages/protected/dashboard/skeleton/dashboard-skeleton'
33

44
const Loader: React.FC = () => {
55
return <DashboardSkeleton />
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { Loading } from '@/components/shared/loading/loading'
1+
import { EvidenceSkeleton } from '@/components/pages/protected/evidence/skeleton/evidence-skeleton'
22
import React from 'react'
33

44
const Loader: React.FC = () => {
5-
return <Loading />
5+
return <EvidenceSkeleton />
66
}
77

88
export default Loader
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import { ObjectWithDetailsSkeleton } from '@/components/shared/skeleton/object-with-slideout-skeleton'
2+
import React from 'react'
3+
4+
const Loader: React.FC = () => {
5+
return <ObjectWithDetailsSkeleton />
6+
}
7+
8+
export default Loader
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import { Loading } from '@/components/shared/loading/loading'
21
import React from 'react'
32

43
const Loader: React.FC = () => {
5-
return <Loading />
4+
return <></>
65
}
76

87
export default Loader
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import { ObjectWithDetailsSkeleton } from '@/components/shared/skeleton/object-with-slideout-skeleton'
2+
import React from 'react'
3+
4+
const Loader: React.FC = () => {
5+
return <ObjectWithDetailsSkeleton />
6+
}
7+
8+
export default Loader
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import { Loading } from '@/components/shared/loading/loading'
21
import React from 'react'
32

43
const Loader: React.FC = () => {
5-
return <Loading />
4+
return <></>
65
}
76

87
export default Loader
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { Loading } from '@/components/shared/loading/loading'
1+
import { ProgramsPageSkeleton } from '@/components/pages/protected/program/skeleton/programs-page-skeleton'
22
import React from 'react'
33

44
const Loader: React.FC = () => {
5-
return <Loading />
5+
return <ProgramsPageSkeleton />
66
}
77

88
export default Loader

0 commit comments

Comments
 (0)