Skip to content

Commit a7d6637

Browse files
acelayaacelaya
authored
Merge pull request #1507 from shlinkio/dependabot/npm_and_yarn/shlink-adac1902f5
Bump @shlinkio/shlink-frontend-kit from 0.8.7 to 0.8.10 in the shlink group
2 parents 43853ef + 14fa2e3 commit a7d6637

File tree

5 files changed

+54
-260
lines changed

5 files changed

+54
-260
lines changed

Diff for: ‎package-lock.json

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"@json2csv/plainjs": "^7.0.6",
3030
"@reduxjs/toolkit": "^2.6.1",
3131
"@shlinkio/data-manipulation": "^1.0.3",
32-
"@shlinkio/shlink-frontend-kit": "^0.8.7",
32+
"@shlinkio/shlink-frontend-kit": "^0.8.10",
3333
"@shlinkio/shlink-js-sdk": "^2.0.0",
3434
"@shlinkio/shlink-web-component": "^0.13.1",
3535
"bootstrap": "5.2.3",

Diff for: ‎src/servers/ManageServersRowDropdown.tsx

+17-15
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,25 @@ const ManageServersRowDropdown: FCWithDeps<ManageServersRowDropdownConnectProps,
3737
const autoConnectIcon = isAutoConnect ? toggleOffIcon : toggleOnIcon;
3838

3939
return (
40-
<RowDropdownBtn minWidth={isAutoConnect ? 210 : 170}>
41-
<DropdownItem tag={Link} to={serverUrl}>
42-
<FontAwesomeIcon icon={connectIcon} fixedWidth /> Connect
43-
</DropdownItem>
44-
<DropdownItem tag={Link} to={`${serverUrl}/edit`}>
45-
<FontAwesomeIcon icon={editIcon} fixedWidth /> Edit server
46-
</DropdownItem>
47-
<DropdownItem onClick={() => setAutoConnect(server, !isAutoConnect)}>
48-
<FontAwesomeIcon icon={autoConnectIcon} fixedWidth /> {isAutoConnect ? 'Do not a' : 'A'}uto-connect
49-
</DropdownItem>
50-
<DropdownItem divider tag="hr" />
51-
<DropdownItem className="tw:text-danger" onClick={showModal}>
52-
<FontAwesomeIcon icon={deleteIcon} fixedWidth /> Remove server
53-
</DropdownItem>
40+
<>
41+
<RowDropdownBtn minWidth={isAutoConnect ? 210 : 170}>
42+
<DropdownItem tag={Link} to={serverUrl}>
43+
<FontAwesomeIcon icon={connectIcon} fixedWidth /> Connect
44+
</DropdownItem>
45+
<DropdownItem tag={Link} to={`${serverUrl}/edit`}>
46+
<FontAwesomeIcon icon={editIcon} fixedWidth /> Edit server
47+
</DropdownItem>
48+
<DropdownItem onClick={() => setAutoConnect(server, !isAutoConnect)}>
49+
<FontAwesomeIcon icon={autoConnectIcon} fixedWidth /> {isAutoConnect ? 'Do not a' : 'A'}uto-connect
50+
</DropdownItem>
51+
<DropdownItem divider tag="hr" />
52+
<DropdownItem className="tw:text-danger" onClick={showModal}>
53+
<FontAwesomeIcon icon={deleteIcon} fixedWidth /> Remove server
54+
</DropdownItem>
55+
</RowDropdownBtn>
5456

5557
<DeleteServerModal server={server} open={isModalOpen} onClose={hideModal} />
56-
</RowDropdownBtn>
58+
</>
5759
);
5860
};
5961

Diff for: ‎src/servers/ServersDropdown.tsx

+19-25
Original file line numberDiff line numberDiff line change
@@ -13,36 +13,30 @@ export interface ServersDropdownProps {
1313
export const ServersDropdown = ({ servers, selectedServer }: ServersDropdownProps) => {
1414
const serversList = Object.values(servers);
1515

16-
const renderServers = () => {
17-
if (serversList.length === 0) {
18-
return (
19-
<DropdownItem tag={Link} to="/server/create">
20-
<FontAwesomeIcon icon={plusIcon} /> <span className="tw:ml-1">Add a server</span>
21-
</DropdownItem>
22-
);
23-
}
24-
25-
return (
26-
<>
27-
{serversList.map(({ name, id }) => (
28-
<DropdownItem key={id} tag={Link} to={`/server/${id}`} active={getServerId(selectedServer) === id}>
29-
{name}
30-
</DropdownItem>
31-
))}
32-
<DropdownItem divider tag="hr" />
33-
<DropdownItem tag={Link} to="/manage-servers">
34-
<FontAwesomeIcon icon={serverIcon} /> <span className="tw:ml-1">Manage servers</span>
35-
</DropdownItem>
36-
</>
37-
);
38-
};
39-
4016
return (
4117
<UncontrolledDropdown nav inNavbar>
4218
<DropdownToggle nav caret>
4319
<FontAwesomeIcon icon={serverIcon} /> <span className="tw:ml-1">Servers</span>
4420
</DropdownToggle>
45-
<DropdownMenu end className="tw:right-0">{renderServers()}</DropdownMenu>
21+
<DropdownMenu end className="tw:right-0">
22+
{serversList.length === 0 ? (
23+
<DropdownItem tag={Link} to="/server/create">
24+
<FontAwesomeIcon icon={plusIcon} /> <span className="tw:ml-1">Add a server</span>
25+
</DropdownItem>
26+
) : (
27+
<>
28+
{serversList.map(({ name, id }) => (
29+
<DropdownItem key={id} tag={Link} to={`/server/${id}`} active={getServerId(selectedServer) === id}>
30+
{name}
31+
</DropdownItem>
32+
))}
33+
<DropdownItem divider tag="hr" />
34+
<DropdownItem tag={Link} to="/manage-servers">
35+
<FontAwesomeIcon icon={serverIcon} /> <span className="tw:ml-1">Manage servers</span>
36+
</DropdownItem>
37+
</>
38+
)}
39+
</DropdownMenu>
4640
</UncontrolledDropdown>
4741
);
4842
};

Diff for: ‎test/servers/__snapshots__/ManageServersRowDropdown.test.tsx.snap

+10-212
Original file line numberDiff line numberDiff line change
@@ -35,113 +35,12 @@ exports[`<ManageServersRowDropdown /> > renders expected size and icon 1`] = `
3535
role="menu"
3636
style="min-width: 210px;"
3737
tabindex="-1"
38-
>
39-
<a
40-
class="dropdown-item"
41-
data-discover="true"
42-
href="/server/abc123"
43-
role="menuitem"
44-
tabindex="0"
45-
>
46-
<svg
47-
aria-hidden="true"
48-
class="svg-inline--fa fa-plug fa-fw "
49-
data-icon="plug"
50-
data-prefix="fas"
51-
focusable="false"
52-
role="img"
53-
viewBox="0 0 384 512"
54-
xmlns="http://www.w3.org/2000/svg"
55-
>
56-
<path
57-
d="M96 0C78.3 0 64 14.3 64 32l0 96 64 0 0-96c0-17.7-14.3-32-32-32zM288 0c-17.7 0-32 14.3-32 32l0 96 64 0 0-96c0-17.7-14.3-32-32-32zM32 160c-17.7 0-32 14.3-32 32s14.3 32 32 32l0 32c0 77.4 55 142 128 156.8l0 67.2c0 17.7 14.3 32 32 32s32-14.3 32-32l0-67.2C297 398 352 333.4 352 256l0-32c17.7 0 32-14.3 32-32s-14.3-32-32-32L32 160z"
58-
fill="currentColor"
59-
/>
60-
</svg>
61-
Connect
62-
</a>
63-
<a
64-
class="dropdown-item"
65-
data-discover="true"
66-
href="/server/abc123/edit"
67-
role="menuitem"
68-
tabindex="0"
69-
>
70-
<svg
71-
aria-hidden="true"
72-
class="svg-inline--fa fa-pen-to-square fa-fw "
73-
data-icon="pen-to-square"
74-
data-prefix="fas"
75-
focusable="false"
76-
role="img"
77-
viewBox="0 0 512 512"
78-
xmlns="http://www.w3.org/2000/svg"
79-
>
80-
<path
81-
d="M471.6 21.7c-21.9-21.9-57.3-21.9-79.2 0L362.3 51.7l97.9 97.9 30.1-30.1c21.9-21.9 21.9-57.3 0-79.2L471.6 21.7zm-299.2 220c-6.1 6.1-10.8 13.6-13.5 21.9l-29.6 88.8c-2.9 8.6-.6 18.1 5.8 24.6s15.9 8.7 24.6 5.8l88.8-29.6c8.2-2.7 15.7-7.4 21.9-13.5L437.7 172.3 339.7 74.3 172.4 241.7zM96 64C43 64 0 107 0 160L0 416c0 53 43 96 96 96l256 0c53 0 96-43 96-96l0-96c0-17.7-14.3-32-32-32s-32 14.3-32 32l0 96c0 17.7-14.3 32-32 32L96 448c-17.7 0-32-14.3-32-32l0-256c0-17.7 14.3-32 32-32l96 0c17.7 0 32-14.3 32-32s-14.3-32-32-32L96 64z"
82-
fill="currentColor"
83-
/>
84-
</svg>
85-
Edit server
86-
</a>
87-
<button
88-
class="dropdown-item"
89-
role="menuitem"
90-
tabindex="0"
91-
type="button"
92-
>
93-
<svg
94-
aria-hidden="true"
95-
class="svg-inline--fa fa-ban fa-fw "
96-
data-icon="ban"
97-
data-prefix="fas"
98-
focusable="false"
99-
role="img"
100-
viewBox="0 0 512 512"
101-
xmlns="http://www.w3.org/2000/svg"
102-
>
103-
<path
104-
d="M367.2 412.5L99.5 144.8C77.1 176.1 64 214.5 64 256c0 106 86 192 192 192c41.5 0 79.9-13.1 111.2-35.5zm45.3-45.3C434.9 335.9 448 297.5 448 256c0-106-86-192-192-192c-41.5 0-79.9 13.1-111.2 35.5L412.5 367.2zM0 256a256 256 0 1 1 512 0A256 256 0 1 1 0 256z"
105-
fill="currentColor"
106-
/>
107-
</svg>
108-
109-
Do not a
110-
uto-connect
111-
</button>
112-
<hr
113-
class="dropdown-divider"
114-
tabindex="-1"
115-
/>
116-
<button
117-
class="tw:text-danger dropdown-item"
118-
role="menuitem"
119-
tabindex="0"
120-
type="button"
121-
>
122-
<svg
123-
aria-hidden="true"
124-
class="svg-inline--fa fa-circle-minus fa-fw "
125-
data-icon="circle-minus"
126-
data-prefix="fas"
127-
focusable="false"
128-
role="img"
129-
viewBox="0 0 512 512"
130-
xmlns="http://www.w3.org/2000/svg"
131-
>
132-
<path
133-
d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM184 232l144 0c13.3 0 24 10.7 24 24s-10.7 24-24 24l-144 0c-13.3 0-24-10.7-24-24s10.7-24 24-24z"
134-
fill="currentColor"
135-
/>
136-
</svg>
137-
Remove server
138-
</button>
139-
<span>
140-
DeleteServerModal
141-
[CLOSED]
142-
</span>
143-
</div>
38+
/>
14439
</div>
40+
<span>
41+
DeleteServerModal
42+
[CLOSED]
43+
</span>
14544
</div>
14645
`;
14746

@@ -180,112 +79,11 @@ exports[`<ManageServersRowDropdown /> > renders expected size and icon 2`] = `
18079
role="menu"
18180
style="min-width: 170px;"
18281
tabindex="-1"
183-
>
184-
<a
185-
class="dropdown-item"
186-
data-discover="true"
187-
href="/server/abc123"
188-
role="menuitem"
189-
tabindex="0"
190-
>
191-
<svg
192-
aria-hidden="true"
193-
class="svg-inline--fa fa-plug fa-fw "
194-
data-icon="plug"
195-
data-prefix="fas"
196-
focusable="false"
197-
role="img"
198-
viewBox="0 0 384 512"
199-
xmlns="http://www.w3.org/2000/svg"
200-
>
201-
<path
202-
d="M96 0C78.3 0 64 14.3 64 32l0 96 64 0 0-96c0-17.7-14.3-32-32-32zM288 0c-17.7 0-32 14.3-32 32l0 96 64 0 0-96c0-17.7-14.3-32-32-32zM32 160c-17.7 0-32 14.3-32 32s14.3 32 32 32l0 32c0 77.4 55 142 128 156.8l0 67.2c0 17.7 14.3 32 32 32s32-14.3 32-32l0-67.2C297 398 352 333.4 352 256l0-32c17.7 0 32-14.3 32-32s-14.3-32-32-32L32 160z"
203-
fill="currentColor"
204-
/>
205-
</svg>
206-
Connect
207-
</a>
208-
<a
209-
class="dropdown-item"
210-
data-discover="true"
211-
href="/server/abc123/edit"
212-
role="menuitem"
213-
tabindex="0"
214-
>
215-
<svg
216-
aria-hidden="true"
217-
class="svg-inline--fa fa-pen-to-square fa-fw "
218-
data-icon="pen-to-square"
219-
data-prefix="fas"
220-
focusable="false"
221-
role="img"
222-
viewBox="0 0 512 512"
223-
xmlns="http://www.w3.org/2000/svg"
224-
>
225-
<path
226-
d="M471.6 21.7c-21.9-21.9-57.3-21.9-79.2 0L362.3 51.7l97.9 97.9 30.1-30.1c21.9-21.9 21.9-57.3 0-79.2L471.6 21.7zm-299.2 220c-6.1 6.1-10.8 13.6-13.5 21.9l-29.6 88.8c-2.9 8.6-.6 18.1 5.8 24.6s15.9 8.7 24.6 5.8l88.8-29.6c8.2-2.7 15.7-7.4 21.9-13.5L437.7 172.3 339.7 74.3 172.4 241.7zM96 64C43 64 0 107 0 160L0 416c0 53 43 96 96 96l256 0c53 0 96-43 96-96l0-96c0-17.7-14.3-32-32-32s-32 14.3-32 32l0 96c0 17.7-14.3 32-32 32L96 448c-17.7 0-32-14.3-32-32l0-256c0-17.7 14.3-32 32-32l96 0c17.7 0 32-14.3 32-32s-14.3-32-32-32L96 64z"
227-
fill="currentColor"
228-
/>
229-
</svg>
230-
Edit server
231-
</a>
232-
<button
233-
class="dropdown-item"
234-
role="menuitem"
235-
tabindex="0"
236-
type="button"
237-
>
238-
<svg
239-
aria-hidden="true"
240-
class="svg-inline--fa fa-circle fa-fw "
241-
data-icon="circle"
242-
data-prefix="far"
243-
focusable="false"
244-
role="img"
245-
viewBox="0 0 512 512"
246-
xmlns="http://www.w3.org/2000/svg"
247-
>
248-
<path
249-
d="M464 256A208 208 0 1 0 48 256a208 208 0 1 0 416 0zM0 256a256 256 0 1 1 512 0A256 256 0 1 1 0 256z"
250-
fill="currentColor"
251-
/>
252-
</svg>
253-
254-
A
255-
uto-connect
256-
</button>
257-
<hr
258-
class="dropdown-divider"
259-
tabindex="-1"
260-
/>
261-
<button
262-
class="tw:text-danger dropdown-item"
263-
role="menuitem"
264-
tabindex="0"
265-
type="button"
266-
>
267-
<svg
268-
aria-hidden="true"
269-
class="svg-inline--fa fa-circle-minus fa-fw "
270-
data-icon="circle-minus"
271-
data-prefix="fas"
272-
focusable="false"
273-
role="img"
274-
viewBox="0 0 512 512"
275-
xmlns="http://www.w3.org/2000/svg"
276-
>
277-
<path
278-
d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM184 232l144 0c13.3 0 24 10.7 24 24s-10.7 24-24 24l-144 0c-13.3 0-24-10.7-24-24s10.7-24 24-24z"
279-
fill="currentColor"
280-
/>
281-
</svg>
282-
Remove server
283-
</button>
284-
<span>
285-
DeleteServerModal
286-
[CLOSED]
287-
</span>
288-
</div>
82+
/>
28983
</div>
84+
<span>
85+
DeleteServerModal
86+
[CLOSED]
87+
</span>
29088
</div>
29189
`;

0 commit comments

Comments
 (0)