mirrors/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2025-01-10 18:27:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixed export servers to ensure autoConnect is not included

Browse source
This commit is contained in:
Alejandro Celaya 2021-11-20 09:44:12 +01:00
parent 7db9974e8d
commit 14b2ee53b5
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG.md
View file

@ -6,10 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
## [Unreleased] ## [Unreleased]
### Added ### Added
* [#520](https://github.com/shlinkio/shlink-web-client/issues/520) Allowed to select "all visits" as the default interval for visits. * *Nothing*
### Changed ### Changed
* Moved ci workflow to external repo and reused * *Nothing*
### Deprecated ### Deprecated
* *Nothing* * *Nothing*
@ -18,7 +18,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
* *Nothing* * *Nothing*
### Fixed ### Fixed
* *Nothing* * [#520](https://github.com/shlinkio/shlink-web-client/issues/520) Fixed landing page scroll on mobile devices and improved its design.
* [#526](https://github.com/shlinkio/shlink-web-client/issues/526) Ensured exported servers do not include the `autoConnect` prop.
## [3.4.0] - 2021-11-11 ## [3.4.0] - 2021-11-11

4
src/servers/data/index.ts
View file

@ -1,3 +1,4 @@
import { omit } from 'ramda';
import { SemVer } from '../../utils/helpers/version'; import { SemVer } from '../../utils/helpers/version';
export interface ServerData { export interface ServerData {
@ -43,3 +44,6 @@ export const isNotFoundServer = (server: SelectedServer): server is NotFoundServ
!!server?.hasOwnProperty('serverNotFound'); !!server?.hasOwnProperty('serverNotFound');
export const getServerId = (server: SelectedServer) => isServerWithId(server) ? server.id : ''; export const getServerId = (server: SelectedServer) => isServerWithId(server) ? server.id : '';
export const serverWithIdToServerData = (server: ServerWithId): ServerData =>
omit<ServerWithId, 'id' | 'autoConnect'>([ 'id', 'autoConnect' ], server);

6
src/servers/services/ServersExporter.ts
View file

@ -1,7 +1,7 @@
import { dissoc, values } from 'ramda'; import { values } from 'ramda';
import { CsvJson } from 'csvjson'; import { CsvJson } from 'csvjson';
import LocalStorage from '../../utils/services/LocalStorage'; import LocalStorage from '../../utils/services/LocalStorage';
import { ServersMap } from '../data'; import { ServersMap, serverWithIdToServerData } from '../data';
import { saveCsv } from '../../utils/helpers/files'; import { saveCsv } from '../../utils/helpers/files';
const SERVERS_FILENAME = 'shlink-servers.csv'; const SERVERS_FILENAME = 'shlink-servers.csv';
@ -14,7 +14,7 @@ export default class ServersExporter {
) {} ) {}
public readonly exportServers = async () => { public readonly exportServers = async () => {
const servers = values(this.storage.get<ServersMap>('servers') ?? {}).map(dissoc('id')); const servers = values(this.storage.get<ServersMap>('servers') ?? {}).map(serverWithIdToServerData);
try { try {
const csv = this.csvjson.toCSV(servers, { headers: 'key' }); const csv = this.csvjson.toCSV(servers, { headers: 'key' });

2
test/servers/services/ServersExporter.test.ts
View file

@ -10,10 +10,12 @@ describe('ServersExporter', () => {
abc123: { abc123: {
id: 'abc123', id: 'abc123',
name: 'foo', name: 'foo',
autoConnect: true,
}, },
def456: { def456: {
id: 'def456', id: 'def456',
name: 'bar', name: 'bar',
autoConnect: false,
}, },
})), })),
}); });