Skip to content

Commit bb3c7d1

Browse files
More classification unit tests (#592)
1 parent 907a422 commit bb3c7d1

File tree

8 files changed

+805
-6
lines changed

8 files changed

+805
-6
lines changed

src/components/admin/ClassificationAdmin.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
</td>
3838
<td>
3939
<LpiCheckbox
40+
data-test="classification-switch-for-skills"
4041
v-if="type === 'skills'"
4142
class="as-button min-width"
4243
:model-value="classification.is_enabled_for_skills"
@@ -49,6 +50,7 @@
4950
/>
5051

5152
<LpiCheckbox
53+
data-test="classification-switch-for-projects"
5254
v-if="type === 'projects'"
5355
class="as-button min-width"
5456
:model-value="classification.is_enabled_for_projects"
@@ -65,13 +67,15 @@
6567
<td>
6668
<div class="actions">
6769
<ContextActionButton
70+
data-test="edit-classification-button"
6871
secondary
6972
no-border
7073
action-icon="Pen"
7174
@click="classificationToEdit = classification"
7275
:disabled="!isCustomClassification(classification)"
7376
/>
7477
<ContextActionButton
78+
data-test="delete-classification-button"
7579
secondary
7680
no-border
7781
action-icon="TrashCanOutline"
@@ -86,19 +90,21 @@
8690
</div>
8791

8892
<ConfirmModal
93+
data-test="confirm-delete-classification-modal"
8994
v-if="classificationToDelete"
9095
:asyncing="isDeletingClassification"
9196
@cancel="classificationToDelete = null"
9297
@confirm="deleteClassification"
9398
:title="$t('admin.classifications.delete-classification.title')"
9499
:content="
95100
$t('admin.classifications.delete-classification.content', {
96-
title: classification?.title,
101+
title: classificationToDelete?.title,
97102
})
98103
"
99104
/>
100105
</div>
101106
<EditClassification
107+
data-test="edit-classification-drawer"
102108
:classification="classificationToEdit"
103109
:is-open="classificationToEdit || createClassificationIsOpen"
104110
@close="closeEditClassification"

src/components/admin/DefaultSkillsAdmin.vue

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ const deleteOrganizationTag = async () => {
7575

7676
<div class="tags-ctn">
7777
<FilterValue
78+
data-test="default-skill"
7879
v-for="tag in organizationTags"
7980
:key="tag.id"
8081
:label="tagTexts.title(tag)"
@@ -84,9 +85,15 @@ const deleteOrganizationTag = async () => {
8485
</div>
8586

8687
<div class="rel-ctn">
87-
<LpiButton btn-icon="Plus" :label="t('common.add')" @click="tagSearchIsOpened = true" />
88+
<LpiButton
89+
data-test="add-default-skills"
90+
btn-icon="Plus"
91+
:label="t('common.add')"
92+
@click="tagSearchIsOpened = true"
93+
/>
8894
</div>
8995
<BaseDrawer
96+
data-test="add-default-skills-drawer"
9097
:confirm-action-name="t('common.confirm')"
9198
:confirm-action-disabled="!newTags.length"
9299
:is-opened="tagSearchIsOpened"
@@ -103,6 +110,7 @@ const deleteOrganizationTag = async () => {
103110
/>
104111
</BaseDrawer>
105112
<ConfirmModal
113+
data-test="confirm-delete-default-skill"
106114
v-if="tagToDelete"
107115
:title="$t('common.confirm-delete')"
108116
content=""

src/components/admin/DefaultTagsAdmin.vue

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ const deleteOrganizationTag = async () => {
7474

7575
<div class="tags-ctn">
7676
<FilterValue
77+
data-test="default-tag"
7778
v-for="tag in organizationTags"
7879
:key="tag.id"
7980
:label="tagTexts.title(tag)"
@@ -83,9 +84,15 @@ const deleteOrganizationTag = async () => {
8384
</div>
8485

8586
<div class="rel-ctn">
86-
<LpiButton btn-icon="Plus" :label="t('common.add')" @click="tagSearchIsOpened = true" />
87+
<LpiButton
88+
data-test="add-default-tags"
89+
btn-icon="Plus"
90+
:label="t('common.add')"
91+
@click="tagSearchIsOpened = true"
92+
/>
8793
</div>
8894
<BaseDrawer
95+
data-test="add-default-tags-drawer"
8996
:confirm-action-name="t('common.confirm')"
9097
:confirm-action-disabled="!newTags.length"
9198
:is-opened="tagSearchIsOpened"
@@ -102,6 +109,7 @@ const deleteOrganizationTag = async () => {
102109
/>
103110
</BaseDrawer>
104111
<ConfirmModal
112+
data-test="confirm-delete-default-tag"
105113
v-if="tagToDelete"
106114
:title="$t('common.confirm-delete')"
107115
content=""

src/components/admin/TagClassificationAdmin.vue

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { ref, watch, computed, nextTick } from 'vue'
33
import debounce from 'lodash.debounce'
44
import { getOrgClassificationTags, deleteClassificationTag } from '@/api/tag-classification.service'
55
import useOrganizationsStore from '@/stores/useOrganizations.ts'
6-
import { refreshTokenGrantRequest } from '@panva/oauth4webapi'
76
import FilterSearchInput from '@/components/search/Filters/FilterSearchInput.vue'
87
import PaginationButtons from '@/components/base/navigation/PaginationButtons.vue'
98
import { axios } from '@/api/api.config'
@@ -104,7 +103,7 @@ const fetchTagStats = async () => {
104103
}
105104
106105
const getTags = debounce(async function () {
107-
isLoading.value = refreshTokenGrantRequest
106+
isLoading.value = true
108107
try {
109108
//await new Promise((resolve) => setTimeout(resolve, 300 * 1000))
110109
const axiosReq = await getOrgClassificationTags(
@@ -219,7 +218,7 @@ watch(() => [props.classification.value, search.value], getTags, { immediate: tr
219218
</div>
220219
</td>
221220
</tr>
222-
<tr v-else v-for="tag in tagResults" :key="tag.id">
221+
<tr v-else v-for="tag in tagResults" :key="tag.id" data-test="tag-entry">
223222
<td>
224223
<strong>{{ tagTexts.title(tag) }}</strong>
225224
</td>
@@ -230,19 +229,22 @@ watch(() => [props.classification.value, search.value], getTags, { immediate: tr
230229
@click="editTag(tag)"
231230
class="small"
232231
action-icon="Pen"
232+
data-test="edit-tag-button"
233233
/>
234234
<ContextActionButton
235235
@click="tagToDelete = tag"
236236
secondary
237237
class="small"
238238
action-icon="TrashCanOutline"
239+
data-test="delete-tag-button"
239240
/>
240241
</div>
241242
</td>
242243
</tr>
243244
</tbody>
244245
</table>
245246
<div
247+
v-if="pagination.total > 1"
246248
:style="{ visibility: (!isLoading && pagination.total > 1 && 'visible') || 'hidden' }"
247249
class="pagination-container"
248250
>
@@ -254,6 +256,7 @@ watch(() => [props.classification.value, search.value], getTags, { immediate: tr
254256
/>
255257
</div>
256258
<EditTagModal
259+
data-test="edit-tag-modal"
257260
:is-open="editTagIsOpen"
258261
:tag="editedTag"
259262
:classification="classification"
@@ -262,6 +265,7 @@ watch(() => [props.classification.value, search.value], getTags, { immediate: tr
262265
/>
263266
264267
<ConfirmModal
268+
data-test="confirm-tag-delete-modal"
265269
v-if="showConfirmTagDelete"
266270
:asyncing="isDeletingTag"
267271
@cancel="tagToDelete = null"

0 commit comments

Comments
 (0)