From 57a7b726ae5acd6db8bdc1368a1fc0b18791305c Mon Sep 17 00:00:00 2001 From: Suniul Karim <102999067+sunnykarim@users.noreply.github.com> Date: Fri, 17 Nov 2023 11:48:41 -0800 Subject: [PATCH 1/4] WV-136 --- package-lock.json | 17 +++++++---------- package.json | 1 + src/js/components/Widgets/ShowMoreItems.jsx | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index bcc10dc91..8e1f43baf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,6 +28,7 @@ "d3-zoom": "^3.0.0", "flux": "~4.0.1", "fs-extra": "^10.0.0", + "fsevents": "^2.3.3", "gapi-script": "github:wevote/gapi-script", "glob": "^9.0.0", "iframe-resizer-react": "^1.1.0", @@ -10224,12 +10225,10 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "hasInstallScript": true, - "optional": true, "os": [ "darwin" ], @@ -30036,11 +30035,9 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "optional": true + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==" }, "fstream": { "version": "1.0.12", diff --git a/package.json b/package.json index ec5f22325..fc950a57a 100644 --- a/package.json +++ b/package.json @@ -112,6 +112,7 @@ "d3-zoom": "^3.0.0", "flux": "~4.0.1", "fs-extra": "^10.0.0", + "fsevents": "^2.3.3", "gapi-script": "github:wevote/gapi-script", "glob": "^9.0.0", "iframe-resizer-react": "^1.1.0", diff --git a/src/js/components/Widgets/ShowMoreItems.jsx b/src/js/components/Widgets/ShowMoreItems.jsx index 1e2431b88..dcf9fcf3d 100644 --- a/src/js/components/Widgets/ShowMoreItems.jsx +++ b/src/js/components/Widgets/ShowMoreItems.jsx @@ -11,7 +11,7 @@ class ShowMoreItems extends Component { render () { const { hideShowMoreLink, loadingMoreItemsNow, numberOfItemsDisplayed, numberOfItemsTotal } = this.props; - if (numberOfItemsDisplayed === 0) { + if (numberOfItemsDisplayed <= 1) { return null; } From 3826646eb54b5f5aebc8f111ce30a5fb90a348ae Mon Sep 17 00:00:00 2001 From: Suniul Karim <102999067+sunnykarim@users.noreply.github.com> Date: Sun, 3 Dec 2023 12:34:49 -0800 Subject: [PATCH 2/4] Update package-lock.json --- package-lock.json | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8e1f43baf..bcc10dc91 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,7 +28,6 @@ "d3-zoom": "^3.0.0", "flux": "~4.0.1", "fs-extra": "^10.0.0", - "fsevents": "^2.3.3", "gapi-script": "github:wevote/gapi-script", "glob": "^9.0.0", "iframe-resizer-react": "^1.1.0", @@ -10225,10 +10224,12 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, "hasInstallScript": true, + "optional": true, "os": [ "darwin" ], @@ -30035,9 +30036,11 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==" + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "optional": true }, "fstream": { "version": "1.0.12", From 021a0778b301efea2bd2173d341b8c283d2e66ff Mon Sep 17 00:00:00 2001 From: Suniul Karim <102999067+sunnykarim@users.noreply.github.com> Date: Sun, 3 Dec 2023 12:37:08 -0800 Subject: [PATCH 3/4] Update package.json --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index fc950a57a..ec5f22325 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,6 @@ "d3-zoom": "^3.0.0", "flux": "~4.0.1", "fs-extra": "^10.0.0", - "fsevents": "^2.3.3", "gapi-script": "github:wevote/gapi-script", "glob": "^9.0.0", "iframe-resizer-react": "^1.1.0", From a0b51ad83c363ab64d4b0d588f4ed8435be7e239 Mon Sep 17 00:00:00 2001 From: Suniul Karim <102999067+sunnykarim@users.noreply.github.com> Date: Sun, 3 Dec 2023 12:37:48 -0800 Subject: [PATCH 4/4] Update ShowMoreItems.jsx --- src/js/components/Widgets/ShowMoreItems.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/js/components/Widgets/ShowMoreItems.jsx b/src/js/components/Widgets/ShowMoreItems.jsx index dcf9fcf3d..ef698aab1 100644 --- a/src/js/components/Widgets/ShowMoreItems.jsx +++ b/src/js/components/Widgets/ShowMoreItems.jsx @@ -2,6 +2,8 @@ import styled from 'styled-components'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; +const MINIMUM_DENOMINATOR = 6; + class ShowMoreItems extends Component { constructor (props) { super(props); @@ -11,7 +13,7 @@ class ShowMoreItems extends Component { render () { const { hideShowMoreLink, loadingMoreItemsNow, numberOfItemsDisplayed, numberOfItemsTotal } = this.props; - if (numberOfItemsDisplayed <= 1) { + if (numberOfItemsDisplayed < MINIMUM_DENOMINATOR) { return null; }