Skip to content

Commit 5ad5f85

Browse files
Rad14ntRad14nt
committed
Adjust Settings pages broken height
1 parent 5c7831f commit 5ad5f85

14 files changed

Lines changed: 1941 additions & 1941 deletions

File tree

‎client/src/components/layout/pages/BasicSettingsPage.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
:style="{ minHeight: 0 }"
1717
>
1818
<!--- Left Settings -->
19-
<v-col cols="3" class="h-100 overflow-y-auto pa-3">
19+
<v-col cols="3" class="h-100 pa-3">
2020
<SettingsNavigation />
2121
</v-col>
2222

‎client/src/pages/(app)/assessment-tool/[id]/index.vue‎

Lines changed: 549 additions & 538 deletions
Large diffs are not rendered by default.

‎client/src/pages/(app)/assessment-tool/create/index.vue‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
data-testid="createAssessmentTool-info-text"
1111
/>
1212

13-
<v-row class="px-6 mt-2">
14-
<v-col cols="8">
13+
<v-row class="px-6 mt-2" no-gutters>
14+
<v-col cols="8" class="pa-0">
1515
<LoadingFallbackComponent
1616
:loading="loading"
1717
:errors="errors"
@@ -121,22 +121,18 @@
121121
</v-row>
122122

123123
<!-- Action buttons -->
124-
<v-row class="px-6 pb-4">
125-
<v-col class="d-flex justify-end pa-0 ga-2">
126-
<CancelButton
127-
data-testid="createAssessmentTool-cancel-button"
128-
text="general.cancelButton"
129-
@click="
130-
router.push({ name: '/(app)/assessment-tool/' })
131-
"
132-
/>
133-
<ConfirmButton
134-
data-testid="createAssessmentTool-save-button"
135-
text="general.saveButton"
136-
@click="submit()"
137-
/>
138-
</v-col>
139-
</v-row>
124+
<div class="d-flex justify-end ga-2 px-6 pb-4">
125+
<CancelButton
126+
data-testid="createAssessmentTool-cancel-button"
127+
text="general.cancelButton"
128+
@click="router.push({ name: '/(app)/assessment-tool/' })"
129+
/>
130+
<ConfirmButton
131+
data-testid="createAssessmentTool-save-button"
132+
text="general.saveButton"
133+
@click="submit()"
134+
/>
135+
</div>
140136
</template>
141137
</BasicSettingsPage>
142138
</template>

‎client/src/pages/(app)/assessment-tool/index.vue‎

Lines changed: 44 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -11,57 +11,51 @@
1111
</template>
1212

1313
<template #PanelMain>
14-
<v-col>
15-
<SearchBar
16-
v-model="searchInputValue"
17-
search-text="assessmentToolConnections.assessmentToolsPage.filters.searchField"
18-
:filter-sections="filterSections"
19-
:filter-values="selectedFilters"
14+
<SearchBar
15+
class="mt-2"
16+
v-model="searchInputValue"
17+
search-text="assessmentToolConnections.assessmentToolsPage.filters.searchField"
18+
:filter-sections="filterSections"
19+
:filter-values="selectedFilters"
20+
:data-test-id="dataTestId"
21+
dense
22+
@search="onSearch"
23+
@clear="onClearSearch"
24+
@update:filter-values="setFilters"
25+
@clear-filters="clearAll"
26+
/>
27+
28+
<div v-if="deleteError">{{ deleteError }}</div>
29+
<div v-else-if="statusError">{{ statusError }}</div>
30+
31+
<LoadingFallbackComponent
32+
:loading="false"
33+
:errors="error ? [error] : []"
34+
>
35+
<EntityTable
36+
class="px-3"
37+
:headers="assessmentToolTableHeaders"
38+
:items="tableData?.content ?? []"
39+
:page-count="pageCount"
40+
:items-per-page="options.itemsPerPage"
41+
:options="options"
42+
:loading="loading || deleteLoading || statusLoading"
43+
:detail-route="assessmentToolDetailRoute"
44+
:cell-formatters="cellFormatters"
45+
:actions="tableActions"
2046
:data-test-id="dataTestId"
21-
dense
22-
@search="onSearch"
23-
@clear="onClearSearch"
24-
@update:filter-values="setFilters"
25-
@clear-filters="clearAll"
26-
/>
27-
28-
<v-row>
29-
<v-col>
30-
<div v-if="deleteError">{{ deleteError }}</div>
31-
<div v-else-if="statusError">{{ statusError }}</div>
32-
33-
<LoadingFallbackComponent
34-
:loading="false"
35-
:errors="error ? [error] : []"
36-
>
37-
<EntityTable
38-
:headers="assessmentToolTableHeaders"
39-
:items="tableData?.content ?? []"
40-
:page-count="pageCount"
41-
:items-per-page="options.itemsPerPage"
42-
:options="options"
43-
:loading="
44-
loading || deleteLoading || statusLoading
45-
"
46-
:detail-route="assessmentToolDetailRoute"
47-
:cell-formatters="cellFormatters"
48-
:actions="tableActions"
49-
:data-test-id="dataTestId"
50-
item-key="id"
51-
@update:options="loadItems"
52-
>
53-
<template #cell-active="{ item, rowTestId }">
54-
<ActiveStatusChip
55-
:active="!!item.active"
56-
:data-test-id="`${rowTestId}-status-chip`"
57-
@click="openStatusDialog(item)"
58-
/>
59-
</template>
60-
</EntityTable>
61-
</LoadingFallbackComponent>
62-
</v-col>
63-
</v-row>
64-
</v-col>
47+
item-key="id"
48+
@update:options="loadItems"
49+
>
50+
<template #cell-active="{ item, rowTestId }">
51+
<ActiveStatusChip
52+
:active="!!item.active"
53+
:data-test-id="`${rowTestId}-status-chip`"
54+
@click="openStatusDialog(item)"
55+
/>
56+
</template>
57+
</EntityTable>
58+
</LoadingFallbackComponent>
6559
</template>
6660
</BasicSettingsPage>
6761

‎client/src/pages/(app)/certificate/index.vue‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
<template #PanelMain>
2929
<SearchBar
30+
class="mt-2"
3031
v-model="searchInputValue"
3132
search-text="certificates.filters.searchField"
3233
:filter-sections="[]"
@@ -46,6 +47,7 @@
4647
:errors="error ? [error] : []"
4748
>
4849
<EntityTable
50+
class="px-3"
4951
:headers="certificatesTableHeaders"
5052
:items="tableData?.content ?? []"
5153
:page-count="pageCount"

0 commit comments

Comments
 (0)