Search card fixes (#1963)

* Add back isContainedBy to search-result-card * Preserve whitespace for description field
CenterForOpenScience · Aug 23, 2023 · a30faa9 · a30faa9
1 parent 23d9714
commit a30faa9
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 11 deletions.
diff --git a/lib/osf-components/addon/components/search-result-card/file-secondary-metadata/styles.scss b/lib/osf-components/addon/components/search-result-card/file-secondary-metadata/styles.scss
@@ -0,0 +1,3 @@
+.description {
+    white-space: pre-wrap;
+}
diff --git a/lib/osf-components/addon/components/search-result-card/file-secondary-metadata/template.hbs b/lib/osf-components/addon/components/search-result-card/file-secondary-metadata/template.hbs
@@ -5,7 +5,7 @@
     {{/if}}
     {{#if @result.description}}
         <dt>{{t 'osf-components.search-result-card.description'}}</dt>
-        <dd>{{@result.description}}</dd>
+        <dd local-class='description'>{{@result.description}}</dd>
     {{/if}}
     {{#if @result.nodeFunders}}
         <dt>{{t 'osf-components.search-result-card.funder'}}</dt>

diff --git a/...sf-components/addon/components/search-result-card/preprint-secondary-metadata/styles.scss b/...sf-components/addon/components/search-result-card/preprint-secondary-metadata/styles.scss
@@ -0,0 +1,3 @@
+.description {
+    white-space: pre-wrap;
+}
diff --git a/...f-components/addon/components/search-result-card/preprint-secondary-metadata/template.hbs b/...f-components/addon/components/search-result-card/preprint-secondary-metadata/template.hbs
@@ -2,7 +2,7 @@
     {{!-- Description --}}
     {{#if @result.description}}
         <dt>{{t 'osf-components.search-result-card.description'}}:</dt>
-        <dd>{{@result.description}}</dd>
+        <dd local-class='description'>{{@result.description}}</dd>
     {{/if}}
 
     {{!-- Preprint Provider --}}

diff --git a/...osf-components/addon/components/search-result-card/project-secondary-metadata/styles.scss b/...osf-components/addon/components/search-result-card/project-secondary-metadata/styles.scss
@@ -0,0 +1,3 @@
+.description {
+    white-space: pre-wrap;
+}
diff --git a/...sf-components/addon/components/search-result-card/project-secondary-metadata/template.hbs b/...sf-components/addon/components/search-result-card/project-secondary-metadata/template.hbs
@@ -1,7 +1,7 @@
 <dl>
     {{#if @result.description}}
         <dt>{{t 'osf-components.search-result-card.description'}}</dt>
-        <dd>{{@result.description}}</dd>
+        <dd local-class='description'>{{@result.description}}</dd>
     {{/if}}
     {{#if @result.funders}}
         <dt>{{t 'osf-components.search-result-card.funder'}}</dt>

diff --git a/...omponents/addon/components/search-result-card/registration-secondary-metadata/styles.scss b/...omponents/addon/components/search-result-card/registration-secondary-metadata/styles.scss
@@ -0,0 +1,3 @@
+.description {
+    white-space: pre-wrap;
+}
diff --git a/...mponents/addon/components/search-result-card/registration-secondary-metadata/template.hbs b/...mponents/addon/components/search-result-card/registration-secondary-metadata/template.hbs
@@ -1,7 +1,7 @@
 <dl>
     {{#if @result.description}}
         <dt>{{t 'osf-components.search-result-card.description'}}</dt>
-        <dd>{{@result.description}}</dd>
+        <dd local-class='description'>{{@result.description}}</dd>
     {{/if}}
     {{#if @result.funders}}
         <dt>{{t 'osf-components.search-result-card.funder'}}</dt>

diff --git a/lib/osf-components/addon/components/search-result-card/template.hbs b/lib/osf-components/addon/components/search-result-card/template.hbs
@@ -55,6 +55,11 @@
                 <span>{{t 'osf-components.search-result-card.from'}}: <a href={{@result.isPartOfTitleAndUrl.absoluteUrl}} target='_blank' rel='noopener noreferrer'> {{@result.isPartOfTitleAndUrl.title}} </a></span>
             </div>
         {{/if}}
+        {{#if @result.isContainedBy}}
+            <div>
+                <span>{{t 'osf-components.search-result-card.from'}}: <a href={{@result.isContainedByTitleAndUrl.absoluteUrl}} target='_blank' rel='noopener noreferrer'> {{@result.isContainedByTitleAndUrl.title}} </a></span>
+            </div>
+        {{/if}}
         <div local-class='date-fields'>
             {{#each @result.dateFields as |field|}}
                 {{#if field.date}}
@@ -85,13 +90,6 @@
         <panel.body>
             <hr>
             {{component this.secondaryMetadataComponent result=@result}}
-            {{!-- {{#if (or (eq @result.resourceType 'registration') (eq @result.resourceType 'registration_component'))}}
-                <SearchResultCard::RegistrationSecondaryMetadata @result={{@result}} />
-            {{else if (or (eq @result.resourceType 'project') (eq @result.resourceType 'project_component'))}}
-                <SearchResultCard::ProjectSecondaryMetadata @result={{@result}} />
-            {{else if (eq @result.resourceType 'preprint')}}
-                <SearchResultCard::PreprintSecondaryMetadata @result={{@result}} />
-            {{/if}} --}}
         </panel.body>
     </CpPanel>
 </div>