Skip to content

Commit

Permalink
Merge pull request #114 from UCLALibrary/SYS-1607/swallow_error_for_p…
Browse files Browse the repository at this point in the history
…eaks_display

Swallow play button to prevent page breaking on bad render
  • Loading branch information
kjallen authored May 2, 2024
2 parents 4b06ea2 + 363c484 commit 01286a4
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
9 changes: 6 additions & 3 deletions app/views/catalog/_show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,12 @@
<% end %>

</a>

<%= react_component('PlayButton', id: child["id_t"].gsub('/', '-'), src: child["url_t"], peaks: parsed_peaks ? parsed_peaks[i]["peaks"] : '', transcript: highlighted_parsed_transcripts ? highlighted_parsed_transcripts[i]["highlighted_transcript"] : '' ) %>
</h5>
<% begin %>
<%= react_component('PlayButton', id: child["id_t"].gsub('/', '-'), src: child["url_t"], peaks: parsed_peaks ? parsed_peaks[i]["peaks"] : '', transcript: highlighted_parsed_transcripts ? highlighted_parsed_transcripts[i]["highlighted_transcript"] : '' ) %>
<% rescue %>
<!-- Error rendering PlayButton component -->
<% end %>
</h5>
</div>
<div id="accordion-10-body-<%= child['order_i'] %>" class="collapse" role="tabpanel" aria-labelledby="accordion-10-heading-<%= child['order_i'] %>">
<div class="u-accordion__body g-color-gray-dark-v5 g-pa-15-0">
Expand Down
12 changes: 6 additions & 6 deletions charts/stage-oralhistory-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ replicaCount: 1
image:
repository: uclalibrary/oral-history
# changing this tag will cause a deploy via ArgoCD
tag: ad96ed60
tag: 0b40962d
pullPolicy: Always

# Chart documentation: https://github.com/bitnami/charts/tree/main/bitnami/solr
Expand Down Expand Up @@ -165,7 +165,8 @@ externalsecrets:
# configure a registry token for access to your container registry, needs read permissions, create secret in Rancher, follow instructions:
# https://ranchermanager.docs.rancher.com/v2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/kubernetes-and-docker-registries#creating-a-registry
# replace registry-token below with the name of the secret you created in the Rancher UI
imagePullSecrets: []
imagePullSecrets:
[]
# - registry-token
fullnameOverride: "oral-history"

Expand Down Expand Up @@ -195,10 +196,9 @@ ingress:
paths:
- "/"
tls:
- secretName: oralhistory-tls
hosts:
- oralhistory-stage.library.ucla.edu

- secretName: oralhistory-tls
hosts:
- oralhistory-stage.library.ucla.edu

resources:
# We usually recommend not to specify default resources and to leave this as a conscious
Expand Down

0 comments on commit 01286a4

Please sign in to comment.