From a2580474794031697112bf3460c6c90503cd6b4c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Sep 2020 02:18:39 +0000 Subject: [PATCH 1/4] Bump http-proxy from 1.17.0 to 1.18.1 in /app/server/static Bumps [http-proxy](https://github.com/http-party/node-http-proxy) from 1.17.0 to 1.18.1. - [Release notes](https://github.com/http-party/node-http-proxy/releases) - [Changelog](https://github.com/http-party/node-http-proxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/http-party/node-http-proxy/compare/1.17.0...1.18.1) Signed-off-by: dependabot[bot] --- app/server/static/package-lock.json | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/app/server/static/package-lock.json b/app/server/static/package-lock.json index e6a3ba19..0f36d498 100644 --- a/app/server/static/package-lock.json +++ b/app/server/static/package-lock.json @@ -2703,12 +2703,6 @@ "es5-ext": "~0.10.14" } }, - "eventemitter3": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz", - "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==", - "dev": true - }, "events": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/events/-/events-3.1.0.tgz", @@ -4121,14 +4115,22 @@ "dev": true }, "http-proxy": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz", - "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==", + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", + "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", "dev": true, "requires": { - "eventemitter3": "^3.0.0", + "eventemitter3": "^4.0.0", "follow-redirects": "^1.0.0", "requires-port": "^1.0.0" + }, + "dependencies": { + "eventemitter3": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", + "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", + "dev": true + } } }, "http-proxy-middleware": { From 0f885c3fd13db7576eda28ef4ad5246c71e0e1cc Mon Sep 17 00:00:00 2001 From: Hironsan Date: Wed, 9 Sep 2020 14:32:43 +0900 Subject: [PATCH 2/4] Update cloudformation template to fix #957 --- template.aws.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/template.aws.yaml b/template.aws.yaml index a0cc08f4..37e28d78 100644 --- a/template.aws.yaml +++ b/template.aws.yaml @@ -25,6 +25,9 @@ Parameters: - t2.medium - t2.large ConstraintDescription: must be a valid EC2 instance type. + LatestAmiId: + Type: 'AWS::SSM::Parameter::Value' + Default: '/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2' Metadata: AWS::CloudFormation::Interface: @@ -119,7 +122,7 @@ Resources: - 0 - Fn::GetAZs: { Ref: "AWS::Region" } KeyName: !Ref KeyName - ImageId: ami-0873b46c45c11058d + ImageId: !Ref LatestAmiId InstanceType: !Ref InstanceType Monitoring: true SecurityGroupIds: From ac8918bba74bc98600bf26369dec315abf1626b7 Mon Sep 17 00:00:00 2001 From: Collin Brown Date: Wed, 9 Sep 2020 14:46:47 -0400 Subject: [PATCH 3/4] Adding showFirstLastPage flag in DocumentList --- frontend/components/containers/documents/DocumentList.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/components/containers/documents/DocumentList.vue b/frontend/components/containers/documents/DocumentList.vue index bcc776a3..03327387 100644 --- a/frontend/components/containers/documents/DocumentList.vue +++ b/frontend/components/containers/documents/DocumentList.vue @@ -8,6 +8,7 @@ :search="search" :loading="loading" :footer-props="{ + 'showFirstLastPage': true, 'items-per-page-options': [10, 50, 100] }" item-key="id" From 3788018cd173b25067268b5c2419d9e62aad41b8 Mon Sep 17 00:00:00 2001 From: Collin Brown Date: Wed, 9 Sep 2020 14:50:00 -0400 Subject: [PATCH 4/4] Adding first/last page buttons to Annotation page --- .../containers/annotation/Pagination.vue | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/frontend/components/containers/annotation/Pagination.vue b/frontend/components/containers/annotation/Pagination.vue index f97c33e3..66851302 100644 --- a/frontend/components/containers/annotation/Pagination.vue +++ b/frontend/components/containers/annotation/Pagination.vue @@ -22,6 +22,25 @@ /> + + + + mdi-page-first + + @@ -108,6 +146,12 @@ export default { nextPage() { const page = Math.min(this.value + 1, this.length) this.$emit('input', page) + }, + firstPage() { + this.$emit('input', 1) + }, + lastPage() { + this.$emit('input', this.length) } } }