From bee388c07c047f4c9646b5d73c4a0509ddfe7d08 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 4 May 2022 10:46:23 +0200 Subject: [PATCH 1/5] fix: Reload Transaction Link List Always on Page 1 --- .../src/components/Transactions/TransactionLinkSummary.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/Transactions/TransactionLinkSummary.vue b/frontend/src/components/Transactions/TransactionLinkSummary.vue index c24410924..cbce57029 100644 --- a/frontend/src/components/Transactions/TransactionLinkSummary.vue +++ b/frontend/src/components/Transactions/TransactionLinkSummary.vue @@ -84,7 +84,11 @@ export default { this.visible = false } else { this.transactionLinks = [] - this.updateListTransactionLinks() + if (this.currentPage === 1) { + this.updateListTransactionLinks() + } else { + this.currentPage = 1 + } this.visible = true } }, From 0e6ed809e25b06e16f2ff925b55fd6c67ccd66c7 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 4 May 2022 10:55:11 +0200 Subject: [PATCH 2/5] test reopening after loading more links --- .../TransactionLinkSummary.spec.js | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js index b60cc60f8..370233c42 100644 --- a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js +++ b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js @@ -227,6 +227,36 @@ describe('TransactionLinkSummary', () => { fetchPolicy: 'network-only', }) }) + + describe('close transaction link list', () => { + beforeEach(async () => { + wrapper.find('div.transaction-link-details').trigger('click') + }) + describe('reopen transaction link list', () => { + beforeEach(async () => { + jest.clearAllMocks() + wrapper.find('div.transaction-link-details').trigger('click') + }) + + it('calls the API once', () => { + expect(apolloQueryMock).toBeCalledTimes(1) + }) + + it('calls the API with curren page one', () => { + expect(apolloQueryMock).toBeCalledWith({ + query: listTransactionLinks, + variables: { + currentPage: 1, + }, + fetchPolicy: 'network-only', + }) + }) + + it('has four transactionLinks', () => { + expect(wrapper.vm.transactionLinks).toHaveLength(4) + }) + }) + }) }) }) From 837f644e255acffe84397e298ccd885ceec107ed Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 4 May 2022 10:58:24 +0200 Subject: [PATCH 3/5] fix typo --- .../src/components/Transactions/TransactionLinkSummary.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js index 370233c42..ba07f7aff 100644 --- a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js +++ b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js @@ -242,7 +242,7 @@ describe('TransactionLinkSummary', () => { expect(apolloQueryMock).toBeCalledTimes(1) }) - it('calls the API with curren page one', () => { + it('calls the API with current page one', () => { expect(apolloQueryMock).toBeCalledWith({ query: listTransactionLinks, variables: { From d9bd562a7c3eb41811aa7d405cfd283da23c2ada Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 4 May 2022 11:06:11 +0200 Subject: [PATCH 4/5] update deployment docu --- deployment/bare_metal/setup.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/deployment/bare_metal/setup.md b/deployment/bare_metal/setup.md index f39228879..0cb6951d9 100644 --- a/deployment/bare_metal/setup.md +++ b/deployment/bare_metal/setup.md @@ -2,6 +2,9 @@ # This assums you have root access via ssh to your cleanly setup server # Furthermore this assumes you have debian (11 64bit) running +# Check your (Sub-)Domain with your Provider. +# In this document gddhost.tld refers to your chosen domain + > ssh root@gddhost.tld # change root default shell @@ -92,4 +95,5 @@ > nano .env >> Adjust values accordingly # TODO the install.sh is not yet ready to run directly - consider to use it as pattern to do it manually -> ./install.sh \ No newline at end of file +# The Github Secret is Created on Github in Settimgs -> Webhooks +> ./install.sh From e3fd388f920fec72aeec36801fd02469eccfcd2e Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 4 May 2022 11:09:11 +0200 Subject: [PATCH 5/5] change text order --- deployment/bare_metal/setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/bare_metal/setup.md b/deployment/bare_metal/setup.md index 0cb6951d9..f43a3d655 100644 --- a/deployment/bare_metal/setup.md +++ b/deployment/bare_metal/setup.md @@ -90,10 +90,10 @@ # Adjust .env # NOTE ';' can not be part of any value +# The Github Secret is Created on Github in Settimgs -> Webhooks > cd gradido/deployment/bare_metal > cp .env.dist .env > nano .env >> Adjust values accordingly # TODO the install.sh is not yet ready to run directly - consider to use it as pattern to do it manually -# The Github Secret is Created on Github in Settimgs -> Webhooks > ./install.sh