Merge remote-tracking branch 'origin/main' into 1.29-releases

gribnoysup · gribnoysup · commit 21979ad0c7fb · 2021-11-22T16:15:21.000+01:00
diff --git a/packages/compass-crud/src/components/document-list.jsx b/packages/compass-crud/src/components/document-list.jsx
@@ -184,7 +184,7 @@ class DocumentList extends React.Component {
    * @returns {React.Component} The query bar.
    */
   renderZeroState() {
-    if (this.props.docs.length > 0 || (this.props.status === DOCUMENTS_STATUS_FETCHING && !this.props.debouncingLoad)) {
+    if (this.props.docs.length > 0 || this.props.status === DOCUMENTS_STATUS_FETCHING) {
       return null;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ class DocumentList extends React.Component {`
`184`	`184`	`* @returns {React.Component} The query bar.`
`185`	`185`	`*/`
`186`	`186`	`renderZeroState() {`
`187`		`- if (this.props.docs.length > 0 \|\| (this.props.status === DOCUMENTS_STATUS_FETCHING && !this.props.debouncingLoad)) {`
	`187`	`+ if (this.props.docs.length > 0 \|\| this.props.status === DOCUMENTS_STATUS_FETCHING) {`
`188`	`188`	`return null;`
`189`	`189`	`}`
`190`	`190`