From 26f537f6e31cda22fe3cec1976a374b9c146f5c5 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 11 Feb 2022 14:00:53 +0100 Subject: [PATCH 01/26] confirm pending creation box, confirmbutton right --- admin/src/components/UserTable.vue | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue index fb24cf0f1..932ea2d22 100644 --- a/admin/src/components/UserTable.vue +++ b/admin/src/components/UserTable.vue @@ -13,18 +13,23 @@

{{ overlayText.text2 }}

- - + + + {{ overlayText.button_cancel }} - - + {{ overlayText.button_ok }} - + + + + + From bc68db6b21301f531a8dac36af2a28a8ee86c40b Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 11 Feb 2022 14:01:31 +0100 Subject: [PATCH 02/26] confirm pending creation box, confirmbutton right, yarn lint --- admin/src/components/UserTable.vue | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue index 932ea2d22..e2222fc0c 100644 --- a/admin/src/components/UserTable.vue +++ b/admin/src/components/UserTable.vue @@ -15,21 +15,23 @@

- - {{ overlayText.button_cancel }} - - - {{ overlayText.button_ok }} - + + + {{ overlayText.button_cancel }} + + + + + {{ overlayText.button_ok }} + + - - From 7834054a77dcb3e47383c4da017112d15afa0fe2 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 11 Feb 2022 15:08:09 +0100 Subject: [PATCH 03/26] add components Overlay.vue, add localize for Overlay.vue --- admin/src/components/Overlay.vue | 66 +++++++++++++++++++++++++++++ admin/src/components/UserTable.vue | 68 ++++-------------------------- admin/src/locales/de.json | 4 +- admin/src/locales/en.json | 3 +- 4 files changed, 80 insertions(+), 61 deletions(-) create mode 100644 admin/src/components/Overlay.vue diff --git a/admin/src/components/Overlay.vue b/admin/src/components/Overlay.vue new file mode 100644 index 000000000..e9af36cdd --- /dev/null +++ b/admin/src/components/Overlay.vue @@ -0,0 +1,66 @@ + + diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue index e2222fc0c..de59cb277 100644 --- a/admin/src/components/UserTable.vue +++ b/admin/src/components/UserTable.vue @@ -1,38 +1,7 @@ From 71e1cd50e987802396f3d4823c282d61814c0c58 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Tue, 15 Feb 2022 14:06:45 +0100 Subject: [PATCH 17/26] Update admin/src/pages/CreationConfirm.vue Co-authored-by: Moriz Wahl --- admin/src/pages/CreationConfirm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index 304d628b5..2334a5a8b 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -2,7 +2,7 @@
From 39e38bea2c901f697b9d3af1429d909590528b6c Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Tue, 15 Feb 2022 14:06:56 +0100 Subject: [PATCH 18/26] Update admin/src/components/Overlay.vue Co-authored-by: Moriz Wahl --- admin/src/components/Overlay.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/components/Overlay.vue b/admin/src/components/Overlay.vue index 25ca9d254..af1c428b4 100644 --- a/admin/src/components/Overlay.vue +++ b/admin/src/components/Overlay.vue @@ -47,7 +47,7 @@ size="md" variant="success" class="m-3 text-right" - @click="$emit('confirm-creation', items)" + @click="$emit('confirm-creation', item)" > {{ $t('overlay.confirm.yes') }} From 0d3efa9900985207a78f2f80ce938a23949dd146 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Tue, 15 Feb 2022 14:07:06 +0100 Subject: [PATCH 19/26] Update admin/src/components/Overlay.vue Co-authored-by: Moriz Wahl --- admin/src/components/Overlay.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/components/Overlay.vue b/admin/src/components/Overlay.vue index af1c428b4..6a4e3e94a 100644 --- a/admin/src/components/Overlay.vue +++ b/admin/src/components/Overlay.vue @@ -22,7 +22,7 @@ {{ $t('name') }} - {{ items.firstName }} {{ items.lastName }} + {{ item.firstName }} {{ item.lastName }} {{ $t('e_mail') }} From 9f87e7a8c6d0d5d32998247b2b0d536442016396 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Tue, 15 Feb 2022 14:07:22 +0100 Subject: [PATCH 20/26] Update admin/src/components/Overlay.vue Co-authored-by: Moriz Wahl --- admin/src/components/Overlay.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/components/Overlay.vue b/admin/src/components/Overlay.vue index 6a4e3e94a..b6afb28e4 100644 --- a/admin/src/components/Overlay.vue +++ b/admin/src/components/Overlay.vue @@ -7,7 +7,7 @@ {{ $t('transactionlist.amount') }} - {{ items.amount }} GDD + {{ item.amount }} GDD From e83e65aca73b055722f08e127bf018c2e8014cb0 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Tue, 15 Feb 2022 14:07:32 +0100 Subject: [PATCH 21/26] Update admin/src/components/Overlay.vue Co-authored-by: Moriz Wahl --- admin/src/components/Overlay.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/components/Overlay.vue b/admin/src/components/Overlay.vue index b6afb28e4..bf477c491 100644 --- a/admin/src/components/Overlay.vue +++ b/admin/src/components/Overlay.vue @@ -13,7 +13,7 @@ {{ $t('creation_for_month') }} - {{ $d(new Date(items.date), 'month') }} {{ $d(new Date(items.date), 'year') }} + {{ $d(new Date(item.date), 'month') }} {{ $d(new Date(item.date), 'year') }} From a896c9eb8c98a23b4f4e8ae2943e23f9b662c3d9 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 23 Feb 2022 00:41:04 +0100 Subject: [PATCH 22/26] disallow warnings on database and fix all lint warnings --- database/migrations/0001-init_db.ts | 6 +++--- database/migrations/0002-add_settings.ts | 6 +++--- database/migrations/0003-login_server_tables.ts | 6 +++--- database/migrations/0004-login_server_data.ts | 10 +++++----- database/migrations/0005-admin_tables.ts | 3 +++ database/migrations/0006-login_users_collation.ts | 3 +++ database/migrations/0007-login_pending_tasks_delete.ts | 7 +++++-- database/migrations/0008-state_users_plug_holes.ts | 7 +++++-- database/migrations/0009-login_users_plug_holes.ts | 7 +++++-- .../migrations/0010-login_users_state_users_sync.ts | 7 +++++-- .../migrations/0011-login_user_backups_plug_holes.ts | 7 +++++-- .../0012-login_user_backups_unify_wordlist.ts | 8 ++++++-- database/migrations/0013-drop_unused_tables.ts | 3 +++ .../migrations/0014-drop_unused_tables_with_data.ts | 3 +++ database/migrations/0015-admin_pending_creations.ts | 3 +++ database/migrations/0016-transaction_signatures.ts | 3 +++ database/migrations/0017-combine_user_tables.ts | 3 +++ .../0018-combine_login_user_backups_and_user_table.ts | 3 +++ .../0019-replace_login_user_id_with_state_user_id.ts | 3 +++ .../migrations/0020-rename_and_clean_state_users.ts | 3 +++ .../migrations/0021-elopagebuys_fields_nullable.ts | 3 +++ database/migrations/0022-delete_decay_start_block.ts | 3 +++ database/migrations/0023-users_disabled_soft_delete.ts | 3 +++ database/migrations/0024-combine_transaction_tables.ts | 3 +++ database/package.json | 2 +- 25 files changed, 88 insertions(+), 27 deletions(-) diff --git a/database/migrations/0001-init_db.ts b/database/migrations/0001-init_db.ts index 242037363..e26c2c1a7 100644 --- a/database/migrations/0001-init_db.ts +++ b/database/migrations/0001-init_db.ts @@ -1,6 +1,3 @@ -/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ -/* eslint-disable @typescript-eslint/no-explicit-any */ - /* FIRST MIGRATION * * This migration is special since it takes into account that @@ -12,6 +9,9 @@ * databases. */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { // write upgrade logic as parameter of queryFn await queryFn(` diff --git a/database/migrations/0002-add_settings.ts b/database/migrations/0002-add_settings.ts index aed4feab4..ae9e72757 100644 --- a/database/migrations/0002-add_settings.ts +++ b/database/migrations/0002-add_settings.ts @@ -1,11 +1,11 @@ -/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ -/* eslint-disable @typescript-eslint/no-explicit-any */ - /* MIGRATION TO ADD USER SETTINGS * * This migration adds the table `user_setting` in order to store all sorts of user configuration data */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { await queryFn(` CREATE TABLE IF NOT EXISTS \`user_setting\` ( diff --git a/database/migrations/0003-login_server_tables.ts b/database/migrations/0003-login_server_tables.ts index 909e63c0b..bb6f56ac8 100644 --- a/database/migrations/0003-login_server_tables.ts +++ b/database/migrations/0003-login_server_tables.ts @@ -1,6 +1,3 @@ -/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ -/* eslint-disable @typescript-eslint/no-explicit-any */ - /* MIGRATION TO CREATE THE LOGIN_SERVER TABLES * * This migration creates the `login_server` tables in the `community_server` database (`gradido_community`). @@ -8,6 +5,9 @@ * `0004-login_server_data` which will fill the tables with the existing data */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { await queryFn(` CREATE TABLE IF NOT EXISTS \`login_app_access_tokens\` ( diff --git a/database/migrations/0004-login_server_data.ts b/database/migrations/0004-login_server_data.ts index 4a38e016e..8c9f3497c 100644 --- a/database/migrations/0004-login_server_data.ts +++ b/database/migrations/0004-login_server_data.ts @@ -1,6 +1,3 @@ -/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ -/* eslint-disable @typescript-eslint/no-explicit-any */ - /* MIGRATION TO COPY LOGIN_SERVER DATA * * This migration copies all existing data from the `login_server` database (`gradido_login`) @@ -12,6 +9,9 @@ * NOTE: This migration does not delete the data when downgrading! */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + const LOGIN_SERVER_DB = 'gradido_login' export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { @@ -62,6 +62,6 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis `) } -export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) { - // TODO NO EMPTY FUNCTION +export async function downgrade(/* queryFn: (query: string, values?: any[]) => Promise> */) { + // EMPTY FUNCTION } diff --git a/database/migrations/0005-admin_tables.ts b/database/migrations/0005-admin_tables.ts index 832008970..6351d146e 100644 --- a/database/migrations/0005-admin_tables.ts +++ b/database/migrations/0005-admin_tables.ts @@ -3,6 +3,9 @@ * This migration adds the table `login_pending_tasks_admin` to store pending creations */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { await queryFn(` CREATE TABLE IF NOT EXISTS \`login_pending_tasks_admin\` ( diff --git a/database/migrations/0006-login_users_collation.ts b/database/migrations/0006-login_users_collation.ts index 2a730f5e7..aa786ba34 100644 --- a/database/migrations/0006-login_users_collation.ts +++ b/database/migrations/0006-login_users_collation.ts @@ -5,6 +5,9 @@ * to also explicitly define it in the table */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { // Explicitly change the charset and collate to the one used to then change it await queryFn('ALTER TABLE `login_users` CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;') diff --git a/database/migrations/0007-login_pending_tasks_delete.ts b/database/migrations/0007-login_pending_tasks_delete.ts index c904a68e9..baf6f5191 100644 --- a/database/migrations/0007-login_pending_tasks_delete.ts +++ b/database/migrations/0007-login_pending_tasks_delete.ts @@ -6,10 +6,13 @@ * and dead entries */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { await queryFn('DELETE FROM `login_pending_tasks`;') } -export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) { - return [] // cannot undelete things +export async function downgrade(/* queryFn: (query: string, values?: any[]) => Promise> */) { + // cannot undelete things } diff --git a/database/migrations/0008-state_users_plug_holes.ts b/database/migrations/0008-state_users_plug_holes.ts index c5e8537f5..3607c6233 100644 --- a/database/migrations/0008-state_users_plug_holes.ts +++ b/database/migrations/0008-state_users_plug_holes.ts @@ -6,6 +6,9 @@ * login_users. */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { // Fill in missing emails from login_users await queryFn( @@ -18,6 +21,6 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis await queryFn(`DELETE FROM state_users WHERE email = ''`) } -export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) { - return [] // cannot undelete things +export async function downgrade(/* queryFn: (query: string, values?: any[]) => Promise> */) { + // cannot undelete things } diff --git a/database/migrations/0009-login_users_plug_holes.ts b/database/migrations/0009-login_users_plug_holes.ts index 62cdfc44a..506f8934c 100644 --- a/database/migrations/0009-login_users_plug_holes.ts +++ b/database/migrations/0009-login_users_plug_holes.ts @@ -5,6 +5,9 @@ * account is set as not yet activated */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { // Generate a random private key where the required data is present (pubkey + password + passphrase). // Furthermore the email needs to be confirmed @@ -23,6 +26,6 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis ) } -export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) { - return [] // cannot undelete things +export async function downgrade(/* queryFn: (query: string, values?: any[]) => Promise> */) { + // cannot undelete things } diff --git a/database/migrations/0010-login_users_state_users_sync.ts b/database/migrations/0010-login_users_state_users_sync.ts index a0976ed3d..dea9c6de7 100644 --- a/database/migrations/0010-login_users_state_users_sync.ts +++ b/database/migrations/0010-login_users_state_users_sync.ts @@ -4,6 +4,9 @@ * Copy missing data from login_users to state_users. */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { // Copy data with intact private key await queryFn( @@ -40,6 +43,6 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis ) } -export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) { - return [] // cannot undelete things +export async function downgrade(/* queryFn: (query: string, values?: any[]) => Promise> */) { + // cannot undelete things } diff --git a/database/migrations/0011-login_user_backups_plug_holes.ts b/database/migrations/0011-login_user_backups_plug_holes.ts index 179710869..87f38486d 100644 --- a/database/migrations/0011-login_user_backups_plug_holes.ts +++ b/database/migrations/0011-login_user_backups_plug_holes.ts @@ -5,6 +5,9 @@ * delete the right one of the duplicate keys */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { // Delete data with no reference in login_users table await queryFn(`DELETE FROM login_user_backups WHERE user_id NOT IN (SELECT id FROM login_users)`) @@ -13,6 +16,6 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis await queryFn(`DELETE FROM login_user_backups WHERE id IN (21, 103, 313, 325, 726, 750, 1098)`) } -export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) { - return [] // cannot undelete things +export async function downgrade(/* queryFn: (query: string, values?: any[]) => Promise> */) { + // cannot undelete things } diff --git a/database/migrations/0012-login_user_backups_unify_wordlist.ts b/database/migrations/0012-login_user_backups_unify_wordlist.ts index 0c04693ec..9825bb791 100644 --- a/database/migrations/0012-login_user_backups_unify_wordlist.ts +++ b/database/migrations/0012-login_user_backups_unify_wordlist.ts @@ -4,6 +4,10 @@ * we need to detect which word list was used and transform it accordingly. * This also removes the trailing space */ + +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + import fs from 'fs' import path from 'path' @@ -62,6 +66,6 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis }) } -export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) { - return [] // cannot transform things back +export async function downgrade(/* queryFn: (query: string, values?: any[]) => Promise> */) { + // cannot transform things back } diff --git a/database/migrations/0013-drop_unused_tables.ts b/database/migrations/0013-drop_unused_tables.ts index bb90db39f..1097270f9 100644 --- a/database/migrations/0013-drop_unused_tables.ts +++ b/database/migrations/0013-drop_unused_tables.ts @@ -5,6 +5,9 @@ * The migration reduces the amount of tables to 28 */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { await queryFn(`DROP TABLE \`login_app_access_tokens\`;`) await queryFn(`DROP TABLE \`pending_transactions\`;`) diff --git a/database/migrations/0014-drop_unused_tables_with_data.ts b/database/migrations/0014-drop_unused_tables_with_data.ts index 4f8c47eb7..af1e27cb4 100644 --- a/database/migrations/0014-drop_unused_tables_with_data.ts +++ b/database/migrations/0014-drop_unused_tables_with_data.ts @@ -5,6 +5,9 @@ * The migration reduces the amount of tables to 16 */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { await queryFn(`DROP TABLE \`address_types\`;`) await queryFn(`DROP TABLE \`admin_errors\`;`) diff --git a/database/migrations/0015-admin_pending_creations.ts b/database/migrations/0015-admin_pending_creations.ts index d15bd84a7..c48d81792 100644 --- a/database/migrations/0015-admin_pending_creations.ts +++ b/database/migrations/0015-admin_pending_creations.ts @@ -7,6 +7,9 @@ * the new table to properly describe what it does */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { // drop duplicate table, it was unused await queryFn('DROP TABLE `login_pending_tasks`;') diff --git a/database/migrations/0016-transaction_signatures.ts b/database/migrations/0016-transaction_signatures.ts index 2cf1e7aa1..37910e269 100644 --- a/database/migrations/0016-transaction_signatures.ts +++ b/database/migrations/0016-transaction_signatures.ts @@ -4,6 +4,9 @@ * combines its data with transaction_signatures. */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { // Drop column `state_group_id` since it only contains "0" as value, no variation. // Furthermore it was not present in our model itself (meaning that newly created ) diff --git a/database/migrations/0017-combine_user_tables.ts b/database/migrations/0017-combine_user_tables.ts index 04be53615..c2f76374d 100644 --- a/database/migrations/0017-combine_user_tables.ts +++ b/database/migrations/0017-combine_user_tables.ts @@ -4,6 +4,9 @@ * the `state_users` table, where the later is the target. */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { // Drop column `group_id` since it contains uniform data which is not the same as the uniform data // on login_users. Since we do not need this data anyway, we sjust throw it away. diff --git a/database/migrations/0018-combine_login_user_backups_and_user_table.ts b/database/migrations/0018-combine_login_user_backups_and_user_table.ts index 2141017bd..9209e461d 100644 --- a/database/migrations/0018-combine_login_user_backups_and_user_table.ts +++ b/database/migrations/0018-combine_login_user_backups_and_user_table.ts @@ -4,6 +4,9 @@ * the `state_users` table, where the later is the target. */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { // We only keep the passphrase, the mnemonic type is a constant, // since every passphrase was converted to mnemonic type 2 diff --git a/database/migrations/0019-replace_login_user_id_with_state_user_id.ts b/database/migrations/0019-replace_login_user_id_with_state_user_id.ts index 719c05443..cef608c29 100644 --- a/database/migrations/0019-replace_login_user_id_with_state_user_id.ts +++ b/database/migrations/0019-replace_login_user_id_with_state_user_id.ts @@ -5,6 +5,9 @@ * The table affected is `login_email_opt_in` */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { // Delete email opt in codes which can not be linked to an user await queryFn(` diff --git a/database/migrations/0020-rename_and_clean_state_users.ts b/database/migrations/0020-rename_and_clean_state_users.ts index 5abda1dc9..39dbfa093 100644 --- a/database/migrations/0020-rename_and_clean_state_users.ts +++ b/database/migrations/0020-rename_and_clean_state_users.ts @@ -4,6 +4,9 @@ * and removes columns with no meaningful value */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { // rename `state_users` table to `users` await queryFn('RENAME TABLE `state_users` TO `users`;') diff --git a/database/migrations/0021-elopagebuys_fields_nullable.ts b/database/migrations/0021-elopagebuys_fields_nullable.ts index dabe9d1e4..14ba00b3a 100644 --- a/database/migrations/0021-elopagebuys_fields_nullable.ts +++ b/database/migrations/0021-elopagebuys_fields_nullable.ts @@ -4,6 +4,9 @@ * `publisher_id`, `order_id`. `product_id`. */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { await queryFn( 'ALTER TABLE `login_elopage_buys` MODIFY COLUMN `affiliate_program_id` int(11) DEFAULT NULL;', diff --git a/database/migrations/0022-delete_decay_start_block.ts b/database/migrations/0022-delete_decay_start_block.ts index 22027933e..a31f9c441 100644 --- a/database/migrations/0022-delete_decay_start_block.ts +++ b/database/migrations/0022-delete_decay_start_block.ts @@ -4,6 +4,9 @@ * we can delete it from the database */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { // Remove transactions with type 9 (start decay block). This should affect exactly 1 row await queryFn(`DELETE FROM transactions WHERE transaction_type_id = 9;`) diff --git a/database/migrations/0023-users_disabled_soft_delete.ts b/database/migrations/0023-users_disabled_soft_delete.ts index 2e62d4b71..d85c2f019 100644 --- a/database/migrations/0023-users_disabled_soft_delete.ts +++ b/database/migrations/0023-users_disabled_soft_delete.ts @@ -4,6 +4,9 @@ * a date as it is standard for soft delete fields */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { // Create new `deletedAt` column await queryFn( diff --git a/database/migrations/0024-combine_transaction_tables.ts b/database/migrations/0024-combine_transaction_tables.ts index af564ce2d..b0595aa03 100644 --- a/database/migrations/0024-combine_transaction_tables.ts +++ b/database/migrations/0024-combine_transaction_tables.ts @@ -3,6 +3,9 @@ * Combine all transaction tables into one table with all data */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { // Create new `user_id` column (former `state_user_id`), with a temporary default of null await queryFn( diff --git a/database/package.json b/database/package.json index d3bda1bc4..89fec74c9 100644 --- a/database/package.json +++ b/database/package.json @@ -16,7 +16,7 @@ "dev_up": "ts-node src/index.ts up", "dev_down": "ts-node src/index.ts down", "dev_reset": "ts-node src/index.ts reset", - "lint": "eslint . --ext .js,.ts", + "lint": "eslint --max-warnings=0 --ext .js,.ts .", "seed:config": "ts-node ./node_modules/typeorm-seeding/dist/cli.js config", "seed": "ts-node src/index.ts seed" }, From a054c0ce2615dc753e28cb9ebda0c2605e9ec94b Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 23 Feb 2022 00:41:25 +0100 Subject: [PATCH 23/26] disallow lint warnings on backend, fix warning --- backend/package.json | 2 +- backend/src/graphql/resolver/TransactionResolver.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/package.json b/backend/package.json index 95a41c616..b1a395e5f 100644 --- a/backend/package.json +++ b/backend/package.json @@ -12,7 +12,7 @@ "clean": "tsc --build --clean", "start": "node build/src/index.js", "dev": "nodemon -w src --ext ts --exec ts-node src/index.ts", - "lint": "eslint . --ext .js,.ts", + "lint": "eslint --max-warnings=0 --ext .js,.ts .", "test": "TZ=UTC NODE_ENV=development jest --runInBand --coverage --forceExit --detectOpenHandles" }, "dependencies": { diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 7227f9621..1a1f20251 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -53,6 +53,7 @@ async function calculateAndAddDecayTransactions( transactionIndiced[transaction.id] = transaction involvedUserIds.push(transaction.userId) if (transaction.transactionTypeId === TransactionTypeId.SEND) { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion involvedUserIds.push(transaction.sendReceiverUserId!) // TODO ensure not null properly } }) From 0607731b1ad44aac910e7416fc4c917e95d2929b Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 23 Feb 2022 00:41:41 +0100 Subject: [PATCH 24/26] disallow warnings on frontend & admin --- admin/package.json | 2 +- frontend/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/package.json b/admin/package.json index 677095a28..3cd0c54c0 100644 --- a/admin/package.json +++ b/admin/package.json @@ -11,7 +11,7 @@ "serve": "vue-cli-service serve --open", "dev": "yarn run serve", "build": "vue-cli-service build", - "lint": "eslint --ext .js,.vue .", + "lint": "eslint --max-warnings=0 --ext .js,.vue .", "test": "TZ=UTC jest --coverage", "locales": "scripts/missing-keys.sh && scripts/sort.sh" }, diff --git a/frontend/package.json b/frontend/package.json index 8c7577ab3..a46e50f85 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -7,7 +7,7 @@ "serve": "vue-cli-service serve --open", "build": "vue-cli-service build", "analyse-bundle": "yarn build && webpack-bundle-analyzer dist/webpack.stats.json", - "lint": "eslint --ext .js,.vue .", + "lint": "eslint --max-warnings=0 --ext .js,.vue .", "dev": "yarn run serve", "i18n:report": "vue-cli-service i18n:report --src './src/**/*.?(js|vue)' --locales './src/locales/**/*.json'", "test": "jest --coverage", From e67427f8f143a1f494316815907ad7b4a477c63a Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 23 Feb 2022 09:24:46 +0100 Subject: [PATCH 25/26] linting --- admin/src/pages/CreationConfirm.vue | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index 2334a5a8b..54580c366 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -1,11 +1,7 @@