Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deploy v9.5.0 to production #4206

Merged
merged 25 commits into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
40cd8a9
Bump @samvera/clover-iiif from 2.10.1 to 2.10.2 in /app/assets
dependabot[bot] Oct 14, 2024
fea8ad9
Bump cachex from 4.0.1 to 4.0.2 in /app
dependabot[bot] Oct 14, 2024
887f040
Bump version to 9.4.14
github-actions[bot] Oct 14, 2024
0c082a3
Bump hls.js from 1.5.16 to 1.5.17 in /app/assets
dependabot[bot] Oct 18, 2024
066567f
Bump sass from 1.79.4 to 1.80.3 in /app/assets
dependabot[bot] Oct 21, 2024
4010507
Bump @aws-sdk/client-s3 from 3.669.0 to 3.675.0 in /app/assets
dependabot[bot] Oct 21, 2024
24f15b9
Bump @honeybadger-io/js from 6.10.0 to 6.10.1 in /app/assets
dependabot[bot] Oct 21, 2024
cbc1b97
Bump react-error-boundary from 4.0.13 to 4.1.2 in /app/assets
dependabot[bot] Oct 21, 2024
8d70fae
Merge dependabot/npm_and_yarn/app/assets/deploy/staging/react-error-b…
github-actions[bot] Oct 21, 2024
9191594
Merge dependabot/npm_and_yarn/app/assets/deploy/staging/honeybadger-i…
github-actions[bot] Oct 21, 2024
260af3e
Merge dependabot/npm_and_yarn/app/assets/deploy/staging/aws-sdk/clien…
github-actions[bot] Oct 21, 2024
a10e5f2
Merge dependabot/npm_and_yarn/app/assets/deploy/staging/sass-1.80.3 i…
github-actions[bot] Oct 21, 2024
7994a33
Merge dependabot/npm_and_yarn/app/assets/deploy/staging/hls.js-1.5.17…
github-actions[bot] Oct 21, 2024
80e8cb3
Merge dependabot/hex/app/deploy/staging/cachex-4.0.2 into combined-de…
github-actions[bot] Oct 21, 2024
55154e5
Merge dependabot/npm_and_yarn/app/assets/deploy/staging/samvera/clove…
github-actions[bot] Oct 21, 2024
ad2757c
Merge pull request #4222 from nulib/combined-dependencies
mbklein Oct 21, 2024
f1b1c92
Make status a facet and fix link from work page
kdid Oct 22, 2024
94e4b99
Rename structure tab -> Access files
kdid Oct 22, 2024
c3d625a
Merge pull request #4224 from nulib/5229-rename-structure-tab
kdid Oct 22, 2024
e998276
Merge pull request #4225 from nulib/2792-status-facet
kdid Oct 22, 2024
c8eaafc
Require confirmation to delete WebVTT
kdid Oct 23, 2024
22f6635
Adds iiif_collection field to collection index
kdid Oct 23, 2024
227354f
Merge pull request #4232 from nulib/4119-delete-vtt
kdid Oct 23, 2024
a7fb379
Merge pull request #4233 from nulib/5174-iiif-collection
kdid Oct 23, 2024
76580cd
Update version to 9.5.0
kdid Nov 1, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ function WorkAdministrativeTabsGeneral({
className="break-word"
onClick={() =>
handlePassedInSearchTerm(
"administrativeMetadata.status.label",
"status",
status.label
)
}
Expand Down
2 changes: 1 addition & 1 deletion app/assets/js/components/Work/Tabs/Structure/Structure.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ const WorkTabsStructure = ({ work }) => {
name="work-structure-form"
onSubmit={methods.handleSubmit(onSubmit)}
>
<UITabsStickyHeader title="Structure of Filesets">
<UITabsStickyHeader title="Access & Auxiliary Filesets">
{!isEditing && (
<Button
isPrimary
Expand Down
55 changes: 39 additions & 16 deletions app/assets/js/components/Work/Tabs/Structure/WebVTTModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ function WorkTabsStructureWebVTTModal({ isActive }) {
const [parseErrors, setParseErrors] = React.useState();
const workState = useWorkState();
const [webVttValue, setWebVttValue] = React.useState("");
const [confirmDelete, setConfirmDelete] = React.useState(false);
const params = useParams();
const workId = params.id;

Expand All @@ -34,7 +35,7 @@ function WorkTabsStructureWebVTTModal({ isActive }) {
if (graphQLErrors?.length > 0) {
errorStrings = graphQLErrors.map(
({ message, details }) =>
`${message}: ${details && details.title ? details.title : ""}`
`${message}: ${details && details.title ? details.title : ""}`,
);
}
toastWrapper("is-danger", errorStrings.join(" \n "));
Expand Down Expand Up @@ -65,6 +66,7 @@ function WorkTabsStructureWebVTTModal({ isActive }) {
dispatch({ type: "toggleWebVttModal", fileSetId: null });
setParseErrors(null);
setWebVttValue("");
setConfirmDelete(false);
};

const handleSubmit = (structuralMetadata) => {
Expand All @@ -76,6 +78,12 @@ function WorkTabsStructureWebVTTModal({ isActive }) {
});
};

const handleDelete = () => {
setConfirmDelete(true);
setParseErrors("Are you sure you want to delete this WebVTT structure?");
setWebVttValue("");
};

return (
<div
className={classNames(["modal"], {
Expand All @@ -95,6 +103,12 @@ function WorkTabsStructureWebVTTModal({ isActive }) {
</header>

<section className="modal-card-body">
{confirmDelete && (
<Notification isDanger>
Are you sure you want to delete this WebVTT structure?
</Notification>
)}

{webVttValue?.trim().length > 0 &&
(parseErrors ? (
<Notification isDanger>{parseErrors.message}</Notification>
Expand All @@ -107,34 +121,43 @@ function WorkTabsStructureWebVTTModal({ isActive }) {
placeholder="Enter WebVTT text here"
ref={textAreaRef}
rows="10"
style={{ whiteSpace: "pre-wrap" }}
style={{
whiteSpace: "pre-wrap",
display: confirmDelete ? "none" : "block",
}}
value={webVttValue}
/>
</section>
<footer className="modal-card-foot buttons is-justify-content-space-between">
{webVttValue?.trim().length > 0 && (
{webVttValue?.trim().length > 0 && !confirmDelete && (
<Button
isText
onClick={() => handleSubmit({})}
onClick={() => handleDelete()}
css={{ backgroundColor: "transparent" }}
>
Delete WebVTT
</Button>
)}
<div className="is-flex is-justify-content-flex-end is-flex-grow-1">
<Button onClick={handleClose}>Cancel</Button>
<Button
isPrimary
onClick={() =>
handleSubmit({
type: "WEBVTT",
value: webVttValue,
})
}
disabled={parseErrors}
>
Submit
</Button>
{confirmDelete ? (
<Button isPrimary onClick={() => handleSubmit({})}>
Yes, delete
</Button>
) : (
<Button
isPrimary
onClick={() =>
handleSubmit({
type: "WEBVTT",
value: webVttValue,
})
}
disabled={parseErrors}
>
Submit
</Button>
)}
</div>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/assets/js/components/Work/Tabs/Tabs.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const WorkTabs = ({ work }) => {
data-testid="tab-structure"
onClick={handleTabClick}
>
Structure
Access files
</a>
</li>
<AuthDisplayAuthorized>
Expand Down
7 changes: 7 additions & 0 deletions app/assets/js/services/reactive-search.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,13 @@ export const FACET_SENSORS = [
showSearch: true,
title: "Subject",
},
{
...defaultListItemValues,
componentId: "Status",
dataField: "status",
showSearch: true,
title: "Status",
},
{
...defaultListItemValues,
componentId: "StylePeriod",
Expand Down
Loading
Loading