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.4.9 to production #4120

Merged
merged 22 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
ad84ee9
Bump gettext from 0.26.0 to 0.26.1 in /app
dependabot[bot] Aug 21, 2024
0502c2a
Bump @emotion/react from 11.13.0 to 11.13.3 in /app/assets
dependabot[bot] Aug 21, 2024
e00b39f
Bump @babel/preset-env from 7.25.3 to 7.25.4 in /app/assets
dependabot[bot] Aug 22, 2024
5106cdb
Bump @babel/runtime from 7.25.0 to 7.25.4 in /app/assets
dependabot[bot] Aug 22, 2024
e6ca64c
Bump hls.js from 1.5.14 to 1.5.15 in /app/assets
dependabot[bot] Aug 22, 2024
df450a6
Bump version to 9.4.9
github-actions[bot] Aug 23, 2024
7c0bf4d
Bump @testing-library/jest-dom from 6.4.8 to 6.5.0 in /app/assets
dependabot[bot] Aug 26, 2024
c2ce253
Bump @honeybadger-io/js from 6.9.3 to 6.10.0 in /app/assets
dependabot[bot] Aug 26, 2024
4263ab7
Bump @samvera/clover-iiif from 2.10.0 to 2.10.1 in /app/assets
dependabot[bot] Aug 28, 2024
bbabb49
Explicitly map date_created_edtf as keyword type
kdid Aug 28, 2024
ce402db
Merge pull request #4125 from nulib/5146-edtf-date-keyword
kdid Aug 28, 2024
c6ef7ca
Merge dependabot/npm_and_yarn/app/assets/deploy/staging/samvera/clove…
github-actions[bot] Aug 28, 2024
fdb7e27
Merge dependabot/npm_and_yarn/app/assets/deploy/staging/honeybadger-i…
github-actions[bot] Aug 28, 2024
4eb1859
Merge dependabot/npm_and_yarn/app/assets/deploy/staging/testing-libra…
github-actions[bot] Aug 28, 2024
52a2799
Merge dependabot/npm_and_yarn/app/assets/deploy/staging/hls.js-1.5.15…
github-actions[bot] Aug 28, 2024
7457a81
Merge dependabot/npm_and_yarn/app/assets/deploy/staging/babel/runtime…
github-actions[bot] Aug 28, 2024
da190c0
Merge dependabot/npm_and_yarn/app/assets/deploy/staging/babel/preset-…
github-actions[bot] Aug 28, 2024
9bafe48
Merge dependabot/npm_and_yarn/app/assets/deploy/staging/emotion/react…
github-actions[bot] Aug 28, 2024
8e9132e
Merge dependabot/hex/app/deploy/staging/gettext-0.26.1 into combined-…
github-actions[bot] Aug 28, 2024
991deaf
Merge pull request #4126 from nulib/combined-dependencies
mbklein Aug 28, 2024
974b71d
Change IIIF server requests to v3
kdid Aug 28, 2024
913ff36
Merge pull request #4127 from nulib/5044-iiif-3
kdid Aug 28, 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
248 changes: 104 additions & 144 deletions app/assets/package-lock.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions app/assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@
"@apollo/react-hooks": "^4.0.0",
"@apollo/react-testing": "^4.0.0",
"@appbaseio/reactivesearch": "3.23.1",
"@emotion/react": "^11.13.0",
"@emotion/react": "^11.13.3",
"@fortawesome/fontawesome-svg-core": "^6.6.0",
"@fortawesome/free-brands-svg-icons": "^6.6.0",
"@fortawesome/free-solid-svg-icons": "^6.6.0",
"@fortawesome/react-fontawesome": "^0.2.2",
"@honeybadger-io/js": "^6.9.3",
"@honeybadger-io/js": "^6.10.0",
"@honeybadger-io/react": "^6.1.7",
"@nulib/design-system": "^1.5.1",
"@radix-ui/react-dialog": "^1.1.1",
"@samvera/clover-iiif": "^2.10.0",
"@samvera/clover-iiif": "^2.10.1",
"@samvera/image-downloader": "^1.1.1",
"bulma": "^0.9.4",
"bulma-checkradio": "^2.1.3",
Expand All @@ -45,7 +45,7 @@
"file-saver": "^2.0.5",
"graphql": "^16.9.0",
"graphql-tag": "^2.12.6",
"hls.js": "^1.5.14",
"hls.js": "^1.5.15",
"inflection": "^3.0.0",
"jest-environment-jsdom": "^29.7.0",
"js-cookie": "^3.0.5",
Expand All @@ -72,10 +72,10 @@
"@babel/plugin-proposal-object-rest-spread": "^7.17.3",
"@babel/plugin-proposal-optional-chaining": "^7.16.7",
"@babel/plugin-transform-async-to-generator": "^7.24.7",
"@babel/preset-env": "^7.25.3",
"@babel/preset-env": "^7.25.4",
"@babel/preset-react": "^7.24.7",
"@babel/preset-typescript": "^7.24.7",
"@babel/runtime": "^7.25.0",
"@babel/runtime": "^7.25.4",
"@creativebulma/bulma-divider": "^1.1.0",
"@creativebulma/bulma-tooltip": "^1.2.0",
"@elastic/elasticsearch-mock": "^2.0.0",
Expand All @@ -85,7 +85,7 @@
"@nulib/dcapi-types": "^2.3.1",
"@nulib/prettier-config": "^1.2.0",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.4.8",
"@testing-library/jest-dom": "^6.5.0",
"@testing-library/react": "^16.0.0",
"@testing-library/user-event": "^14.5.2",
"@types/jest": "^29.5.12",
Expand Down
2 changes: 1 addition & 1 deletion app/config/config.exs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ config :meadow,
iiif_server_url:
aws_secret("meadow",
dig: ["iiif", "base_url"],
default: "https://iiif.dev.rdc.library.northwestern.edu/iiif/2/#{prefix()}"
default: "https://iiif.dev.rdc.library.northwestern.edu/iiif/3/#{prefix()}"
),
iiif_manifest_url_deprecated:
aws_secret("meadow",
Expand Down
2 changes: 1 addition & 1 deletion app/config/test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ config :meadow,
index_interval: 1234,
mediaconvert_client: MediaConvert.Mock,
streaming_url: "https://test-streaming-url/",
iiif_server_url: "http://localhost:8184/iiif/2/",
iiif_server_url: "http://localhost:8184/iiif/3/",
iiif_manifest_url_deprecated: "http://test-pyramids.s3.localhost.localstack.cloud:4566/public/",
digital_collections_url: "https://fen.rdc-staging.library.northwestern.edu/"

Expand Down
12 changes: 6 additions & 6 deletions app/lib/meadow/utils/aws.ex
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,12 @@ defmodule Meadow.Utils.AWS do
do: MultipartCopy.copy_object(dest_bucket, dest_object, src_bucket, src_object, opts)

def invalidate_cache(file_set, invalidation_type), do: invalidate_cache(file_set, invalidation_type, Config.environment())
def invalidate_cache(file_set, :pyramid, :dev), do: perform_iiif_invalidation("/iiif/2/#{prefix()}/#{file_set.id}/*")
def invalidate_cache(file_set, :pyramid, :test), do: perform_iiif_invalidation("/iiif/2/#{prefix()}/#{file_set.id}/*")
def invalidate_cache(file_set, :pyramid, _), do: perform_iiif_invalidation("/iiif/2/#{file_set.id}/*")
def invalidate_cache(file_set, :poster, :dev), do: perform_iiif_invalidation("/iiif/2/#{prefix()}/posters/#{file_set.id}/*")
def invalidate_cache(file_set, :poster, :test), do: perform_iiif_invalidation("/iiif/2/#{prefix()}/posters/#{file_set.id}/*")
def invalidate_cache(file_set, :poster, _), do: perform_iiif_invalidation("/iiif/2/posters/#{file_set.id}/*")
def invalidate_cache(file_set, :pyramid, :dev), do: perform_iiif_invalidation("/iiif/3/#{prefix()}/#{file_set.id}/*")
def invalidate_cache(file_set, :pyramid, :test), do: perform_iiif_invalidation("/iiif/3/#{prefix()}/#{file_set.id}/*")
def invalidate_cache(file_set, :pyramid, _), do: perform_iiif_invalidation("/iiif/3/#{file_set.id}/*")
def invalidate_cache(file_set, :poster, :dev), do: perform_iiif_invalidation("/iiif/3/#{prefix()}/posters/#{file_set.id}/*")
def invalidate_cache(file_set, :poster, :test), do: perform_iiif_invalidation("/iiif/3/#{prefix()}/posters/#{file_set.id}/*")
def invalidate_cache(file_set, :poster, _), do: perform_iiif_invalidation("/iiif/3/posters/#{file_set.id}/*")
def invalidate_cache(_file_set, :streaming, :dev), do: :ok
def invalidate_cache(_file_set, :streaming, :test), do: :ok
def invalidate_cache(file_set, :streaming, _), do: perform_streaming_invalidation("/#{Pairtree.generate!(file_set.id)}/*")
Expand Down
2 changes: 1 addition & 1 deletion app/mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Code.require_file("lib/env.ex")
defmodule Meadow.MixProject do
use Mix.Project

@app_version "9.4.8"
@app_version "9.4.9"

def project do
[
Expand Down
2 changes: 1 addition & 1 deletion app/mix.lock
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"faker": {:hex, :faker, "0.18.0", "943e479319a22ea4e8e39e8e076b81c02827d9302f3d32726c5bf82f430e6e14", [:mix], [], "hexpm", "bfbdd83958d78e2788e99ec9317c4816e651ad05e24cfd1196ce5db5b3e81797"},
"file_system": {:hex, :file_system, "1.0.0", "b689cc7dcee665f774de94b5a832e578bd7963c8e637ef940cd44327db7de2cd", [:mix], [], "hexpm", "6752092d66aec5a10e662aefeed8ddb9531d79db0bc145bb8c40325ca1d8536d"},
"gen_stage": {:hex, :gen_stage, "1.2.1", "19d8b5e9a5996d813b8245338a28246307fd8b9c99d1237de199d21efc4c76a1", [:mix], [], "hexpm", "83e8be657fa05b992ffa6ac1e3af6d57aa50aace8f691fcf696ff02f8335b001"},
"gettext": {:hex, :gettext, "0.26.0", "f75fdb7d71beba746d15985fe084f8c1e2ddc4681ecb87839db263afdc994e48", [:mix], [{:expo, "~> 0.5.1 or ~> 1.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "9a201d32cc783eec5ecb7b26109d2805fa8d585a7e6a731d45eaa4e4c57cf41d"},
"gettext": {:hex, :gettext, "0.26.1", "38e14ea5dcf962d1fc9f361b63ea07c0ce715a8ef1f9e82d3dfb8e67e0416715", [:mix], [{:expo, "~> 0.5.1 or ~> 1.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "01ce56f188b9dc28780a52783d6529ad2bc7124f9744e571e1ee4ea88bf08734"},
"hackney": {:hex, :hackney, "1.20.1", "8d97aec62ddddd757d128bfd1df6c5861093419f8f7a4223823537bad5d064e2", [:rebar3], [{:certifi, "~>2.12.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.4.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "fe9094e5f1a2a2c0a7d10918fee36bfec0ec2a979994cff8cfe8058cd9af38e3"},
"honeybadger": {:hex, :honeybadger, "0.21.0", "a81f1db7807c3a250f3c4e81c1baa76b59c27974dafe0ff61b69232346e05060", [:mix], [{:ecto, ">= 2.0.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:hackney, "~> 1.1", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix, ">= 1.0.0 and < 2.0.0", [hex: :phoenix, repo: "hexpm", optional: true]}, {:plug, ">= 1.0.0 and < 2.0.0", [hex: :plug, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "444d7161e105ac2ee70e28c280cb3ad43d42f1d3d9670f2db21efffe9fbe6b0c"},
"httpoison": {:hex, :httpoison, "1.8.2", "9eb9c63ae289296a544842ef816a85d881d4a31f518a0fec089aaa744beae290", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "2bb350d26972e30c96e2ca74a1aaf8293d61d0742ff17f01e0279fef11599921"},
Expand Down
9 changes: 9 additions & 0 deletions app/priv/search/v2/settings/work.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,15 @@
}
}
},
{
"edtf_date": {
"match": "^date_created_edtf$",
"match_pattern": "regex",
"mapping": {
"type": "keyword"
}
}
},
{
"latlong": {
"match": ".*Geo|^geo",
Expand Down
4 changes: 2 additions & 2 deletions app/test/meadow/config_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,15 @@ defmodule Meadow.ConfigTest do
end

test "trailing slashes/0" do
Application.put_env(:meadow, :iiif_server_url, "http://no-slash-test/iiif/2")
Application.put_env(:meadow, :iiif_server_url, "http://no-slash-test/iiif/3")

Application.put_env(
:meadow,
:iiif_manifest_url_deprecated,
"http://no-slash-test/minio/test-pyramids/public"
)

assert Config.iiif_server_url() == "http://no-slash-test/iiif/2/"
assert Config.iiif_server_url() == "http://no-slash-test/iiif/3/"

assert Config.iiif_manifest_url_deprecated() ==
"http://no-slash-test/minio/test-pyramids/public/"
Expand Down
4 changes: 2 additions & 2 deletions app/test/meadow/data/file_sets_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ defmodule Meadow.Data.FileSetsTest do

with uri <- file_set |> FileSets.representative_image_url_for() |> URI.parse() do
assert uri.host == "localhost"
assert uri.path == "/iiif/2/posters/#{file_set.id}"
assert uri.path == "/iiif/3/posters/#{file_set.id}"
end
end

Expand All @@ -230,7 +230,7 @@ defmodule Meadow.Data.FileSetsTest do

with uri <- file_set |> FileSets.representative_image_url_for() |> URI.parse() do
assert uri.host == "localhost"
assert uri.path == "/iiif/2/#{file_set.id}"
assert uri.path == "/iiif/3/#{file_set.id}"
end
end

Expand Down
2 changes: 1 addition & 1 deletion app/test/pipeline/actions/generate_poster_image_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ defmodule Meadow.Pipeline.Actions.GeneratePosterImageTest do

assert log
|> String.contains?(
"Skipping cache invalidation for: /iiif/2/#{prefix()}/posters/#{file_set_id}/*. No distribution id found."
"Skipping cache invalidation for: /iiif/3/#{prefix()}/posters/#{file_set_id}/*. No distribution id found."
)
end
end
Expand Down
Loading