aboutsummaryrefslogtreecommitdiffstats
path: root/src/helpers
diff options
context:
space:
mode:
authorLibravatar Markus Hatvan <markus_hatvan@aon.at>2021-09-14 10:34:04 +0200
committerLibravatar GitHub <noreply@github.com>2021-09-14 10:34:04 +0200
commit979ec02c9a1019152be08705986337e470eabb57 (patch)
tree6021179ad8649112717a499780f475275af487f2 /src/helpers
parentrefactor: defensive programming to avoid javascript error for unread badges (diff)
downloadferdium-app-979ec02c9a1019152be08705986337e470eabb57.tar.gz
ferdium-app-979ec02c9a1019152be08705986337e470eabb57.tar.zst
ferdium-app-979ec02c9a1019152be08705986337e470eabb57.zip
chore: codebase improvements (#1930)
Diffstat (limited to 'src/helpers')
-rw-r--r--src/helpers/serverless-helpers.ts (renamed from src/helpers/serverless-helpers.js)0
-rw-r--r--src/helpers/service-helpers.ts (renamed from src/helpers/service-helpers.js)13
-rw-r--r--src/helpers/validation-helpers.ts (renamed from src/helpers/validation-helpers.js)20
3 files changed, 22 insertions, 11 deletions
diff --git a/src/helpers/serverless-helpers.js b/src/helpers/serverless-helpers.ts
index 01549e038..01549e038 100644
--- a/src/helpers/serverless-helpers.js
+++ b/src/helpers/serverless-helpers.ts
diff --git a/src/helpers/service-helpers.js b/src/helpers/service-helpers.ts
index 745f40dd9..13c921f88 100644
--- a/src/helpers/service-helpers.js
+++ b/src/helpers/service-helpers.ts
@@ -2,15 +2,20 @@ import { readdirSync, removeSync } from 'fs-extra';
2import { userDataPath } from '../environment'; 2import { userDataPath } from '../environment';
3 3
4export function getServicePartitionsDirectory(...segments) { 4export function getServicePartitionsDirectory(...segments) {
5 return userDataPath('Partitions', ...([segments].flat())); 5 return userDataPath('Partitions', ...[segments].flat());
6} 6}
7 7
8export function removeServicePartitionDirectory(id = '', addServicePrefix = false) { 8export function removeServicePartitionDirectory(
9 const servicePartition = getServicePartitionsDirectory(`${addServicePrefix ? 'service-' : ''}${id}`); 9 id = '',
10 addServicePrefix = false,
11) {
12 const servicePartition = getServicePartitionsDirectory(
13 `${addServicePrefix ? 'service-' : ''}${id}`,
14 );
10 return removeSync(servicePartition); 15 return removeSync(servicePartition);
11} 16}
12 17
13export async function getServiceIdsFromPartitions() { 18export async function getServiceIdsFromPartitions() {
14 const files = readdirSync(getServicePartitionsDirectory()); 19 const files = readdirSync(getServicePartitionsDirectory());
15 return files.filter((n) => n !== '__chrome_extension'); 20 return files.filter(n => n !== '__chrome_extension');
16} 21}
diff --git a/src/helpers/validation-helpers.js b/src/helpers/validation-helpers.ts
index 569b13bb0..80d368b2e 100644
--- a/src/helpers/validation-helpers.js
+++ b/src/helpers/validation-helpers.ts
@@ -28,7 +28,9 @@ export function required({ field }) {
28 const isValid = field.value.trim() !== ''; 28 const isValid = field.value.trim() !== '';
29 return [ 29 return [
30 isValid, 30 isValid,
31 window.ferdi.intl.formatMessage(messages.required, { field: field.label }), 31 (window as any).ferdi.intl.formatMessage(messages.required, {
32 field: field.label,
33 }),
32 ]; 34 ];
33} 35}
34 36
@@ -37,7 +39,9 @@ export function email({ field }) {
37 const isValid = isEmail(value); 39 const isValid = isEmail(value);
38 return [ 40 return [
39 isValid, 41 isValid,
40 window.ferdi.intl.formatMessage(messages.email, { field: field.label }), 42 (window as any).ferdi.intl.formatMessage(messages.email, {
43 field: field.label,
44 }),
41 ]; 45 ];
42} 46}
43 47
@@ -58,11 +62,13 @@ export function url({ field }) {
58 62
59 return [ 63 return [
60 isValid, 64 isValid,
61 window.ferdi.intl.formatMessage(messages.url, { field: field.label }), 65 (window as any).ferdi.intl.formatMessage(messages.url, {
66 field: field.label,
67 }),
62 ]; 68 ];
63} 69}
64 70
65export function minLength(length) { 71export function minLength(length: number) {
66 return ({ field }) => { 72 return ({ field }) => {
67 let isValid = true; 73 let isValid = true;
68 if (field.touched) { 74 if (field.touched) {
@@ -70,7 +76,7 @@ export function minLength(length) {
70 } 76 }
71 return [ 77 return [
72 isValid, 78 isValid,
73 window.ferdi.intl.formatMessage(messages.minLength, { 79 (window as any).ferdi.intl.formatMessage(messages.minLength, {
74 field: field.label, 80 field: field.label,
75 length, 81 length,
76 }), 82 }),
@@ -78,12 +84,12 @@ export function minLength(length) {
78 }; 84 };
79} 85}
80 86
81export function oneRequired(targets) { 87export function oneRequired(targets: string[]) {
82 return ({ field, form }) => { 88 return ({ field, form }) => {
83 const invalidFields = targets.filter(target => form.$(target).value === ''); 89 const invalidFields = targets.filter(target => form.$(target).value === '');
84 return [ 90 return [
85 targets.length !== invalidFields.length, 91 targets.length !== invalidFields.length,
86 window.ferdi.intl.formatMessage(messages.required, { 92 (window as any).ferdi.intl.formatMessage(messages.required, {
87 field: field.label, 93 field: field.label,
88 }), 94 }),
89 ]; 95 ];