Skip to content

Commit 7f9008d

Browse files
luannmoreiraotavio
luannmoreira
authored and
otavio
committed
refactor(ui): handle new tags objects
This commit refactor all tags object with new handling capabilities, using pagination on lists and a new refactored TagFormUpdate on the device and container associated tags.
1 parent e548ca8 commit 7f9008d

File tree

61 files changed

+3470
-2612
lines changed

Some content is hidden

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

61 files changed

+3470
-2612
lines changed

‎ui/admin/src/components/Device/DeviceList.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@
4040
v-for="(tag, index) in item.tags"
4141
:key="index"
4242
bottom
43-
:disabled="!showTag(tag)"
43+
:disabled="!showTag(tag.name)"
4444
>
4545
<template #activator="{ props }">
4646
<v-chip size="small" v-bind="props">
47-
{{ displayOnlyTenCharacters(tag) }}
47+
{{ displayOnlyTenCharacters(tag.name) }}
4848
</v-chip>
4949
</template>
5050

51-
<span v-if="showTag(tag)">
52-
{{ tag }}
51+
<span>
52+
{{ tag.name }}
5353
</span>
5454
</v-tooltip>
5555
</div>

‎ui/admin/src/components/FirewallRules/FirewallRulesList.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
v-for="(tag, index) in firewallRule.filter.tags"
3636
:key="index"
3737
bottom
38-
:disabled="!showTag(tag)"
38+
:disabled="!showTag(tag.name)"
3939
>
4040
<template #activator="{ props }">
4141
<v-chip
@@ -44,12 +44,12 @@
4444
outlined
4545
v-bind="props"
4646
>
47-
{{ displayOnlyTenCharacters(tag) }}
47+
{{ displayOnlyTenCharacters(tag.name) }}
4848
</v-chip>
4949
</template>
5050

51-
<span v-if="showTag(tag)">
52-
{{ tag }}
51+
<span>
52+
{{ tag.name }}
5353
</span>
5454
</v-tooltip>
5555
</div>

‎ui/admin/src/views/DeviceDetails.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,16 @@
7979
v-for="(tag, index) in device.tags"
8080
:key="index"
8181
bottom
82-
:disabled="!showTag(tag)"
82+
:disabled="!showTag(tag.name)"
8383
>
8484
<template #activator="{ props }">
8585
<v-chip size="small" v-bind="props">
86-
{{ displayOnlyTenCharacters(tag) }}
86+
{{ displayOnlyTenCharacters(tag.name) }}
8787
</v-chip>
8888
</template>
8989

90-
<span v-if="showTag(tag)">
91-
{{ tag }}
90+
<span>
91+
{{ tag.name }}
9292
</span>
9393
</v-tooltip>
9494
</div>

‎ui/admin/src/views/FirewallRulesDetails.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,16 @@
7070
v-for="(tag, index) in firewallRule.filter.tags"
7171
:key="index"
7272
bottom
73-
:disabled="!showTag(tag)"
73+
:disabled="!showTag(tag.name)"
7474
>
7575
<template #activator="{ props }">
7676
<v-chip class="mr-1" density="compact" outlined v-bind="props">
77-
{{ displayOnlyTenCharacters(tag) }}
77+
{{ displayOnlyTenCharacters(tag.name) }}
7878
</v-chip>
7979
</template>
8080

81-
<span v-if="showTag(tag)">
82-
{{ tag }}
81+
<span>
82+
{{ tag.name }}
8383
</span>
8484
</v-tooltip>
8585
</div>

‎ui/admin/tests/unit/components/Device/DeviceList/__snapshots__/index.spec.ts.snap‎

100644100755
Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,44 @@ exports[`Device List > Renders the component 1`] = `
2121
</thead>
2222
<tbody>
2323
<tr data-v-aca44803="">
24-
<td data-v-aca44803=""><i data-v-aca44803="" class="mdi-check-circle mdi v-icon notranslate v-theme--light v-icon--size-default text-success" aria-hidden="true" data-test="success-icon"></i></td>
25-
<td data-v-aca44803="">tests</td>
24+
<td data-v-aca44803=""><i data-v-aca44803="" class="mdi-close-circle mdi v-icon notranslate v-theme--light v-icon--size-default" style="color: rgb(229, 57, 53); caret-color: #E53935;" aria-hidden="true" data-test="error-icon"></i></td>
25+
<td data-v-aca44803="">39-5e-2a</td>
2626
<td data-v-aca44803=""><span data-v-aca44803="" class="d-inline-flex align-center ga-2"><i data-v-aca44803="" class="fl-linuxmint" style="font-size: 20px;"></i> Linux Mint 19.3</span></td>
27-
<td data-v-aca44803=""><span data-v-aca44803="" tabindex="0" class="hover">dev</span></td>
27+
<td data-v-aca44803=""><span data-v-aca44803="" tabindex="0" class="hover">user</span></td>
2828
<td data-v-aca44803="">
2929
<div data-v-aca44803=""><span data-v-aca44803="" class="v-chip v-theme--light v-chip--density-default v-chip--size-small v-chip--variant-tonal" draggable="false" aria-describedby="v-tooltip-v-6"><!----><span class="v-chip__underlay"></span>
3030
<!---->
3131
<!---->
32-
<div class="v-chip__content" data-no-activator="">xxxx</div>
32+
<div class="v-chip__content" data-no-activator="">test-tag</div>
3333
<!---->
3434
<!----></span>
3535
<!--teleport start-->
36-
<!--teleport end--><span data-v-aca44803="" class="v-chip v-theme--light v-chip--density-default v-chip--size-small v-chip--variant-tonal" draggable="false" aria-describedby="v-tooltip-v-8"><!----><span class="v-chip__underlay"></span>
36+
<!--teleport end-->
37+
</div>
38+
</td>
39+
<td data-v-aca44803="">Wednesday, May 20th 2020, 6:58:53 pm</td>
40+
<td data-v-aca44803=""><span data-v-aca44803="" class="v-chip v-theme--light v-chip--density-default v-chip--size-small v-chip--variant-tonal" draggable="false"><!----><span class="v-chip__underlay"></span>
41+
<!---->
42+
<!---->
43+
<div class="v-chip__content" data-no-activator="">accepted</div>
44+
<!---->
45+
<!----></span>
46+
</td>
47+
<td data-v-aca44803=""><a data-v-aca44803="" class="mdi-information mdi v-icon notranslate v-theme--light v-icon--size-default v-icon--clickable" role="button" aria-hidden="false" tabindex="0" dark="" aria-describedby="v-tooltip-v-9"></a>
48+
<!--teleport start-->
49+
<!--teleport end-->
50+
</td>
51+
</tr>
52+
<tr data-v-aca44803="">
53+
<td data-v-aca44803=""><i data-v-aca44803="" class="mdi-check-circle mdi v-icon notranslate v-theme--light v-icon--size-default text-success" aria-hidden="true" data-test="success-icon"></i></td>
54+
<td data-v-aca44803="">39-5e-2b</td>
55+
<td data-v-aca44803=""><span data-v-aca44803="" class="d-inline-flex align-center ga-2"><i data-v-aca44803="" class="fl-linuxmint" style="font-size: 20px;"></i> Linux Mint 19.3</span></td>
56+
<td data-v-aca44803=""><span data-v-aca44803="" tabindex="0" class="hover">user</span></td>
57+
<td data-v-aca44803="">
58+
<div data-v-aca44803=""><span data-v-aca44803="" class="v-chip v-theme--light v-chip--density-default v-chip--size-small v-chip--variant-tonal" draggable="false" aria-describedby="v-tooltip-v-10"><!----><span class="v-chip__underlay"></span>
3759
<!---->
3860
<!---->
39-
<div class="v-chip__content" data-no-activator="">yyyyy</div>
61+
<div class="v-chip__content" data-no-activator="">test-tag</div>
4062
<!---->
4163
<!----></span>
4264
<!--teleport start-->
@@ -51,7 +73,7 @@ exports[`Device List > Renders the component 1`] = `
5173
<!---->
5274
<!----></span>
5375
</td>
54-
<td data-v-aca44803=""><a data-v-aca44803="" class="mdi-information mdi v-icon notranslate v-theme--light v-icon--size-default v-icon--clickable" role="button" aria-hidden="false" tabindex="0" dark="" aria-describedby="v-tooltip-v-11"></a>
76+
<td data-v-aca44803=""><a data-v-aca44803="" class="mdi-information mdi v-icon notranslate v-theme--light v-icon--size-default v-icon--clickable" role="button" aria-hidden="false" tabindex="0" dark="" aria-describedby="v-tooltip-v-13"></a>
5577
<!--teleport start-->
5678
<!--teleport end-->
5779
</td>
@@ -68,7 +90,7 @@ exports[`Device List > Renders the component 1`] = `
6890
<div class="v-input v-input--horizontal v-input--density-default v-theme--light v-locale--is-ltr v-input--dirty v-text-field v-input--plain-underlined v-combobox v-combobox--single mb-4">
6991
<!---->
7092
<div class="v-input__control">
71-
<div class="v-field v-field--active v-field--appended v-field--dirty v-field--no-label v-field--variant-underlined v-theme--light v-locale--is-ltr" role="combobox" aria-haspopup="menu" aria-expanded="false" aria-controls="v-menu-v-15">
93+
<div class="v-field v-field--active v-field--appended v-field--dirty v-field--no-label v-field--variant-underlined v-theme--light v-locale--is-ltr" role="combobox" aria-haspopup="menu" aria-expanded="false" aria-controls="v-menu-v-17">
7294
<div class="v-field__overlay"></div>
7395
<div class="v-field__loader">
7496
<div class="v-progress-linear v-theme--light v-locale--is-ltr" style="top: 0px; height: 0px; --v-progress-linear-height: 2px;" role="progressbar" aria-hidden="true" aria-valuemin="0" aria-valuemax="100">
@@ -92,7 +114,7 @@ exports[`Device List > Renders the component 1`] = `
92114
<div class="v-field__input" data-no-activator="">
93115
<!---->
94116
<!---->
95-
<div class="v-combobox__selection"><span class="v-combobox__selection-text">10<!----></span></div><input size="1" role="combobox" type="text" id="input-v-13" outlined="" value="10">
117+
<div class="v-combobox__selection"><span class="v-combobox__selection-text">10<!----></span></div><input size="1" role="combobox" type="text" id="input-v-15" outlined="" value="10">
96118
</div>
97119
<!---->
98120
</div>

‎ui/admin/tests/unit/components/Device/DeviceList/index.spec.ts‎

Lines changed: 52 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,29 +22,66 @@ const headers = [
2222

2323
const devices = [
2424
{
25-
created_at: "2020-05-20T19:58:53.276Z",
26-
identity: { mac: "00:00:00:00:00:00" },
25+
uid: "a582b47a42d",
26+
name: "39-5e-2a",
27+
identity: {
28+
mac: "00:00:00:00:00:00",
29+
},
2730
info: {
31+
id: "linuxmint",
32+
pretty_name: "Linux Mint 19.3",
33+
version: "",
2834
arch: "x86_64",
35+
platform: "linux",
36+
},
37+
public_key: "----- PUBLIC KEY -----",
38+
tenant_id: "fake-tenant-data",
39+
last_seen: "2020-05-20T18:58:53.276Z",
40+
created_at: "2020-05-20T18:00:00.000Z",
41+
online: false,
42+
namespace: "user",
43+
status: "accepted",
44+
remoteAddr: "127.0.0.1",
45+
position: { latitude: 0, longitude: 0 },
46+
tags: [
47+
{
48+
tenant_id: "fake-tenant-data",
49+
name: "test-tag",
50+
created_at: "",
51+
updated_at: "",
52+
},
53+
],
54+
},
55+
{
56+
uid: "a582b47a42e",
57+
name: "39-5e-2b",
58+
identity: {
59+
mac: "00:00:00:00:00:00",
60+
},
61+
info: {
2962
id: "linuxmint",
30-
platform: "linuxmint",
3163
pretty_name: "Linux Mint 19.3",
32-
version: "18.4.2",
64+
version: "",
65+
arch: "x86_64",
66+
platform: "linux",
3367
},
68+
public_key: "----- PUBLIC KEY -----",
69+
tenant_id: "fake-tenant-data",
3470
last_seen: "2020-05-20T19:58:53.276Z",
35-
name: "tests",
36-
namespace: "dev",
71+
created_at: "2020-05-20T18:00:00.000Z",
3772
online: true,
38-
position: {
39-
latitude: 12,
40-
longitude: 12,
41-
},
42-
public_key: "xxxxxxxxxxxxxxxx",
43-
remote_addr: "127.0.0.1",
73+
namespace: "user",
4474
status: "accepted",
45-
tags: ["xxxx", "yyyyy"],
46-
tenant_id: "00000000",
47-
uid: "a582b47a42d",
75+
remoteAddr: "127.0.0.1",
76+
position: { latitude: 0, longitude: 0 },
77+
tags: [
78+
{
79+
tenant_id: "fake-tenant-data",
80+
name: "test-tag",
81+
created_at: "",
82+
updated_at: "",
83+
},
84+
],
4885
},
4986
];
5087

‎ui/admin/tests/unit/components/FirewallRules/FirewallRulesList/__snapshots__/index.spec.ts.snap‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,14 @@ exports[`Firewall Rules List > Renders the component 1`] = `
2828
<div><span class="v-chip v-theme--light v-chip--density-compact v-chip--size-default v-chip--variant-tonal mr-1" draggable="false" outlined="" aria-describedby="v-tooltip-v-0"><!----><span class="v-chip__underlay"></span>
2929
<!---->
3030
<!---->
31-
<div class="v-chip__content" data-no-activator="">xxxx</div>
32-
<!---->
33-
<!----></span>
34-
<!--teleport start-->
35-
<!--teleport end--><span class="v-chip v-theme--light v-chip--density-compact v-chip--size-default v-chip--variant-tonal mr-1" draggable="false" outlined="" aria-describedby="v-tooltip-v-2"><!----><span class="v-chip__underlay"></span>
36-
<!---->
37-
<!---->
38-
<div class="v-chip__content" data-no-activator="">yyyy</div>
31+
<div class="v-chip__content" data-no-activator="">test-tag</div>
3932
<!---->
4033
<!----></span>
4134
<!--teleport start-->
4235
<!--teleport end-->
4336
</div>
4437
</td>
45-
<td><a class="mdi-information mdi v-icon notranslate v-theme--light v-icon--size-default v-icon--clickable" role="button" aria-hidden="false" tabindex="0" dark="" aria-describedby="v-tooltip-v-4"></a>
38+
<td><a class="mdi-information mdi v-icon notranslate v-theme--light v-icon--size-default v-icon--clickable" role="button" aria-hidden="false" tabindex="0" dark="" aria-describedby="v-tooltip-v-2"></a>
4639
<!--teleport start-->
4740
<!--teleport end-->
4841
</td>
@@ -59,7 +52,7 @@ exports[`Firewall Rules List > Renders the component 1`] = `
5952
<div class="v-input v-input--horizontal v-input--density-default v-theme--light v-locale--is-ltr v-input--dirty v-text-field v-input--plain-underlined v-combobox v-combobox--single mb-4">
6053
<!---->
6154
<div class="v-input__control">
62-
<div class="v-field v-field--active v-field--appended v-field--dirty v-field--no-label v-field--variant-underlined v-theme--light v-locale--is-ltr" role="combobox" aria-haspopup="menu" aria-expanded="false" aria-controls="v-menu-v-8">
55+
<div class="v-field v-field--active v-field--appended v-field--dirty v-field--no-label v-field--variant-underlined v-theme--light v-locale--is-ltr" role="combobox" aria-haspopup="menu" aria-expanded="false" aria-controls="v-menu-v-6">
6356
<div class="v-field__overlay"></div>
6457
<div class="v-field__loader">
6558
<div class="v-progress-linear v-theme--light v-locale--is-ltr" style="top: 0px; height: 0px; --v-progress-linear-height: 2px;" role="progressbar" aria-hidden="true" aria-valuemin="0" aria-valuemax="100">
@@ -83,7 +76,7 @@ exports[`Firewall Rules List > Renders the component 1`] = `
8376
<div class="v-field__input" data-no-activator="">
8477
<!---->
8578
<!---->
86-
<div class="v-combobox__selection"><span class="v-combobox__selection-text">10<!----></span></div><input size="1" role="combobox" type="text" id="input-v-6" outlined="" value="10">
79+
<div class="v-combobox__selection"><span class="v-combobox__selection-text">10<!----></span></div><input size="1" role="combobox" type="text" id="input-v-4" outlined="" value="10">
8780
</div>
8881
<!---->
8982
</div>

‎ui/admin/tests/unit/components/FirewallRules/FirewallRulesList/index.spec.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,14 @@ const firewallRules = [
2424
action: "allow" as const,
2525
active: true,
2626
filter: {
27-
tags: ["xxxx", "yyyy"],
27+
tags: [
28+
{
29+
tenant_id: "fake-tenant-data",
30+
name: "test-tag",
31+
created_at: "",
32+
updated_at: "",
33+
},
34+
],
2835
},
2936
id: "5f1996c84d2190a22d5857bb",
3037
tenant_id: "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",

0 commit comments

Comments
 (0)