Merge pull request #2245 from shinyichen/lib-count

Show number of records found in library
adsabs · Mar 29, 2022 · 52201ea · 52201ea
2 parents a681eb3 + 54c5ba0
commit 52201ea
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 40 deletions.
diff --git a/src/js/widgets/library_list/templates/library-container.html b/src/js/widgets/library_list/templates/library-container.html
@@ -1,42 +1,49 @@
-<div class="s-library-actions">
-    {{#if itemDeleted}}
-        <h3 class="record-deleted"><i class="icon-success" aria-hidden="true" /> Record successfully deleted</h3>
-    {{/if}}
-    {{#if hasRecords}}
-      <div class="row" style="margin-left: 0">
-        <div class="col-xs-1 col-sm-1" style="padding-left: 12.5px; text-align: right;">
-        {{#unless public}}
-        <div class="select-all-docs">
-          <label class="custom-checkbox">
-            <input type="checkbox" id="select-all-docs-cb" name="select-all-docs-cb" title="select all docs" {{#if allSelected}} checked {{/if}}>
-          </label>
-          <label for="select-all-docs-cb" class="sr-only custom-checkbox">Select All Docs</label>
-        </div>
-        {{/unless}}
-        </div>
-        <div class="col-xs-11 col-sm-6">
-          <div class="button-toolbar">
-            {{#if editRecords}}
-            <button class="btn btn-danger btn-sm hidden" id="bulk-delete">Delete Selected</button>
-            {{/if}}
-            <button class="btn btn-default btn-sm hidden" id="bulk-limit">
-              <i class="fa fa-archive" aria-hidden="true"></i> Show Selection in Results Page
-            </button>
+{{#compare numMissing 0 operator=">"}}
+<div class="alert alert-warning s-library-missing-record print-hidden">Displaying {{numFound}} out of {{numRecords}} records due to {{numMissing}} unmatched or merged record{{#compare numMissing 1 operator=">"}}s{{/compare}}
+  <a href="/help/faq/#ads-libraries" target="_blank" rel="noopener noreferrer"><i class="fa fa-question-circle alert-warning" title="See help page" style="margin: 5px"></i></a>
+</div>
+{{/compare}}
+<div class="s-library-list">
+  <div class="s-library-actions">
+      {{#if itemDeleted}}
+          <h3 class="record-deleted"><i class="icon-success" aria-hidden="true" /> Record successfully deleted</h3>
+      {{/if}}
+      {{#if hasRecords}}
+        <div class="row" style="margin-left: 0">
+          <div class="col-xs-1 col-sm-1" style="padding-left: 12.5px; text-align: right;">
+          {{#unless public}}
+          <div class="select-all-docs">
+            <label class="custom-checkbox">
+              <input type="checkbox" id="select-all-docs-cb" name="select-all-docs-cb" title="select all docs" {{#if allSelected}} checked {{/if}}>
+            </label>
+            <label for="select-all-docs-cb" class="sr-only custom-checkbox">Select All Docs</label>
+          </div>
+          {{/unless}}
+          </div>
+          <div class="col-xs-11 col-sm-6">
+            <div class="button-toolbar">
+              {{#if editRecords}}
+              <button class="btn btn-danger btn-sm hidden" id="bulk-delete">Delete Selected</button>
+              {{/if}}
+              <button class="btn btn-default btn-sm hidden" id="bulk-limit">
+                <i class="fa fa-archive" aria-hidden="true"></i> Show Selection in Results Page
+              </button>
+            </div>
           </div>
         </div>
-      </div>
-      <div style="text-align: right;">
-        <div id="sort-container"></div>
-      </div>
-    {{/if}}
-</div>
-<hr class="print-hidden"/>
+        <div style="text-align: right;">
+          <div id="sort-container"></div>
+        </div>
+      {{/if}}
+  </div>
+  <hr class="print-hidden"/>
 
-<ul class="library-list-container s-library-list-container">
-</ul>
+  <ul class="library-list-container s-library-list-container">
+  </ul>
 
-{{#if pagination}}
-    {{> js/widgets/list_of_things/templates/pagination-partial}}
-{{/if}}
+  {{#if pagination}}
+      {{> js/widgets/list_of_things/templates/pagination-partial}}
+  {{/if}}
 
+  </div>
 </div>
diff --git a/src/js/widgets/library_list/widget.js b/src/js/widgets/library_list/widget.js
@@ -323,6 +323,14 @@ define([
         // otherwise show a message urging users to add to collection
         this.model.set('hasRecords', true);
       }
+
+      // number of records actually found
+      this.model.set({
+        numRecords: resp.metadata.num_documents,
+        numFound: resp.solr.response.numFound,
+        numMissing: resp.metadata.num_documents - resp.solr.response.numFound,
+      });
+
       // set sort
       var sort = resp.solr.responseHeader.params.sort;
       this.model.set({ sort: sort.split(',')[0] });

diff --git a/src/styles/sass/ads-sass/dark-mode.scss b/src/styles/sass/ads-sass/dark-mode.scss
@@ -922,7 +922,7 @@
     .facet__dropdown,
     .ui-autocomplete,
     .s-all-libraries-widget,
-    .library-detail-view,
+    .s-library-list,
     .library-widget .main,
     .s-main-content-container,
     .s-inner-div-background > div,
@@ -1342,7 +1342,7 @@
       border-color: $darkmode-border;
     }
 
-    .library-detail-view {
+    .s-library-list {
       background: transparent;
     }
 

diff --git a/src/styles/sass/ads-sass/library.scss b/src/styles/sass/ads-sass/library.scss
@@ -163,7 +163,7 @@
   border-bottom: 1px solid lighten(#e8e8e8, 3%);
 }
 
-.library-detail-view,
+.s-library-list,
 .library-widget .main {
   margin: 15px auto;
   padding: 20px 3.7%;
@@ -172,6 +172,10 @@
   @extend .s-ads-card;
 }
 
+.s-library-missing-record {
+  margin-bottom: 0;
+}
+
 .library-widget .main:empty {
   display: none;
 }

diff --git a/src/styles/sass/ads-sass/print.scss b/src/styles/sass/ads-sass/print.scss
@@ -150,7 +150,8 @@
     display: none;
   }
 
-  .library-detail-view {
+  .library-detail-view,
+  .s-libary-list {
     margin: 0;
     padding: 0;
     border: none;