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

☄️ Valkyrize Hyku EPIC #2129

Merged
merged 594 commits into from
Apr 2, 2024
Merged

☄️ Valkyrize Hyku EPIC #2129

merged 594 commits into from
Apr 2, 2024

Conversation

Base automatically changed from hyrax-5-upgrade to main January 5, 2024 18:12
allColorInputs.each(function() {
$(this).val($(this).data('default-value'))
})
})

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.


allColorInputs.each(function() {
$(this).val($(this).data('default-value'))
})

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

var allColorInputs = $("input[name*='color']")

allColorInputs.each(function() {
$(this).val($(this).data('default-value'))

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

$('.panel-footer a.restore-all-default-colors').click(function(e) {
e.preventDefault()

var allColorInputs = $("input[name*='color']")

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

})

$('.panel-footer a.restore-all-default-colors').click(function(e) {
e.preventDefault()

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

var input = $("input[name='admin_appearance["+ defaultTarget +"]']")

input.val(input.data('default-value'))
})

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

var defaultTarget = $(e.target).data('default-target')
var input = $("input[name='admin_appearance["+ defaultTarget +"]']")

input.val(input.data('default-value'))

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

e.preventDefault()

var defaultTarget = $(e.target).data('default-target')
var input = $("input[name='admin_appearance["+ defaultTarget +"]']")

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

$('div.defaultable-colors a.restore-default-color').click(function(e) {
e.preventDefault()

var defaultTarget = $(e.target).data('default-target')

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

@@ -0,0 +1,20 @@
$(document).on('turbolinks:load', function() {
$('div.defaultable-colors a.restore-default-color').click(function(e) {
e.preventDefault()

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

allColorInputs.each(function() {
$(this).val($(this).data('default-value'))
})
})

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.


allColorInputs.each(function() {
$(this).val($(this).data('default-value'))
})

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

var allColorInputs = $("input[name*='color']")

allColorInputs.each(function() {
$(this).val($(this).data('default-value'))

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

$('.panel-footer a.restore-all-default-colors').click(function(e) {
e.preventDefault()

var allColorInputs = $("input[name*='color']")

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

})

$('.panel-footer a.restore-all-default-colors').click(function(e) {
e.preventDefault()

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

var input = $("input[name='admin_appearance["+ defaultTarget +"]']")

input.val(input.data('default-value'))
})

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

var defaultTarget = $(e.target).data('default-target')
var input = $("input[name='admin_appearance["+ defaultTarget +"]']")

input.val(input.data('default-value'))

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

e.preventDefault()

var defaultTarget = $(e.target).data('default-target')
var input = $("input[name='admin_appearance["+ defaultTarget +"]']")

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

$('div.defaultable-colors a.restore-default-color').click(function(e) {
e.preventDefault()

var defaultTarget = $(e.target).data('default-target')

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

@@ -0,0 +1,20 @@
$(document).on('turbolinks:load', function() {
$('div.defaultable-colors a.restore-default-color').click(function(e) {
e.preventDefault()

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

allColorInputs.each(function() {
$(this).val($(this).data('default-value'))
})
})

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.


allColorInputs.each(function() {
$(this).val($(this).data('default-value'))
})

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

var allColorInputs = $("input[name*='color']")

allColorInputs.each(function() {
$(this).val($(this).data('default-value'))

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

$('.panel-footer a.restore-all-default-colors').click(function(e) {
e.preventDefault()

var allColorInputs = $("input[name*='color']")

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

})

$('.panel-footer a.restore-all-default-colors').click(function(e) {
e.preventDefault()

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

if (domDependenciesMet()) {
// Grab the data from the ul div
var series_data = new Array();
var pointer_lookup = new Array();

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The array literal notation [] is preferable.

//flot loaded? And canvas element supported.
if (domDependenciesMet()) {
// Grab the data from the ul div
var series_data = new Array();

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The array literal notation [] is preferable.

};

global.BlacklightRangeLimit = BlacklightRangeLimit;
}(this);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Expected an assignment or function call and instead saw an expression.

max = BlacklightRangeLimit.parseNum($(range_element).find(".max").first().text());
}

return [min, max]

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.




var min = max = BlacklightRangeLimit.parseNum(current_limit.find(".single").text())

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.
You might be leaking a variable (max) here.

allColorInputs.each(function() {
$(this).val($(this).data('default-value'))
})
})

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.


allColorInputs.each(function() {
$(this).val($(this).data('default-value'))
})

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

var allColorInputs = $("input[name*='color']")

allColorInputs.each(function() {
$(this).val($(this).data('default-value'))

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

$('.panel-footer a.restore-all-default-colors').click(function(e) {
e.preventDefault()

var allColorInputs = $("input[name*='color']")

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

})

$('.panel-footer a.restore-all-default-colors').click(function(e) {
e.preventDefault()

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

if (domDependenciesMet()) {
// Grab the data from the ul div
var series_data = new Array();
var pointer_lookup = new Array();

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The array literal notation [] is preferable.

//flot loaded? And canvas element supported.
if (domDependenciesMet()) {
// Grab the data from the ul div
var series_data = new Array();

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The array literal notation [] is preferable.

};

global.BlacklightRangeLimit = BlacklightRangeLimit;
}(this);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Expected an assignment or function call and instead saw an expression.

max = BlacklightRangeLimit.parseNum($(range_element).find(".max").first().text());
}

return [min, max]

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.




var min = max = BlacklightRangeLimit.parseNum(current_limit.find(".single").text())

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.
You might be leaking a variable (max) here.

// Grab the data from the ul div
var series_data = new Array();
var pointer_lookup = new Array();
var x_ticks = new Array();

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The array literal notation [] is preferable.

if (domDependenciesMet()) {
// Grab the data from the ul div
var series_data = new Array();
var pointer_lookup = new Array();

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The array literal notation [] is preferable.

//flot loaded? And canvas element supported.
if (domDependenciesMet()) {
// Grab the data from the ul div
var series_data = new Array();

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The array literal notation [] is preferable.

};

global.BlacklightRangeLimit = BlacklightRangeLimit;
}(this);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Expected an assignment or function call and instead saw an expression.

max = BlacklightRangeLimit.parseNum($(range_element).find(".max").first().text());
}

return [min, max]

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

}

begin_el.val(min);
end_el.val(max);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'end_el' used out of scope.

});
}

begin_el.val(min);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'begin_el' used out of scope.


// Slider change should update text input values.
var parent = $(this).parent();
var form = $(parent).closest(".limit_content").find("form.range_limit");

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'form' is already defined.


if (plot && slider_el) {
slider_el.width(plot.width());
slider_el.css("display", "block")

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon.

if (isInt(min) && isInt(max)) {
$(this).contents().wrapAll('<div style="display:none" />');

var range_element = $(this);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'range_element' is already defined.

@ShanaLMoore ShanaLMoore changed the title 🎁 Generate GenericWorkResource and ImageResource 🎁 Valkyrize Hyku EPIC Jan 5, 2024
}

.hyc-banner {
padding: 15px;
.hyc-bugs .hyc-created-by, .hyc-bugs .hyc-last-updated, .hyc-title {
.hyc-bugs .hyc-created-by,

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rule declaration should be preceded by an empty line

@@ -22,6 +22,6 @@

// for catalog search result snippets
.highlight {
background: yellow;
background: #ffff00;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line should be indented 2 spaces, but was indented 4 spaces

ShanaLMoore and others added 13 commits January 26, 2024 14:14
Having this file was causing double rendering of bulkrax links in the sidebar.

Issues:
- #1850
- scientist-softserv/hykuup_knapsack#111
Update bulkrax to point to hyrax-4-valkyrie-support
This commit will adjust for the changes introduced in this commit:
samvera/hyrax@8fc0894
bulrax_identifier is not a required property. Each client should set their desired source_identifier in their application.

Issue:
- scientist-softserv/hykuup_knapsack#136
This commit will add a decorator to check the `human_readable_type` of
the given object is a Valkyrie migration object (which by convention
ends with 'resource') and adjust the generated link accordingly.  For
example, a GenericWorkResource should generate links like
`/concern/generic_work_resources/...` instead of
`/concern/generic_works/...`.

The models were updated to include the Hyrax::NestedWorks so the `Attach
Child` button would populate the appropriate work types.

Lastly, the `Gemfile.lock` was updated to include the latest version of
Hyrax `double_combo` branch.
For us to leverage the useful shared specs of Hyrax, we need a test
adapter.
…ifier-to-bulkrax

I903 remove bulkrax_identifier dependency
Using 'human_readable_type' was going to be flemsy.  Instead we are
opting for adding the `valkyrie_bsi` to the index and asking that.
The featured works and collections had some funky css problems where it
made sorting them impossible.  This commit will override some Hyrax scss
and fix some css classes on partials to make the featured
works/collections a better user experience.
background: #ddd;
background: -webkit-linear-gradient(top, #ddd 0%, #bbb 100%);
background: -moz-linear-gradient(top, #ddd 0%, #bbb 100%);
background: linear-gradient(top, #ddd 0%, #bbb 100%);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Property background already defined on line 479

.dd3-handle {
position: absolute; margin: 0; left: 0; top: 0; cursor: pointer; width: 30px;
text-indent: 100px;
white-space: nowrap; overflow: hidden;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Property 'overflow' should be placed on own line

@@ -467,6 +471,24 @@ body.public-facing {
padding: 0;
}

.dd3-handle {
position: absolute; margin: 0; left: 0; top: 0; cursor: pointer; width: 30px;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Properties should be ordered background, border, border-bottom-right-radius, border-top-right-radius, cursor, left, margin, overflow, position, text-indent, top, white-space, width, z-index
Property 'cursor' should be placed on own line
Property 'left' should be placed on own line
Property 'margin' should be placed on own line
Property 'top' should be placed on own line
Property 'width' should be placed on own line

@@ -467,6 +471,24 @@ body.public-facing {
padding: 0;
}

.dd3-handle {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rule set contains (17/10) properties

Fixes bug deleting works & file sets.

Refs scientist-softserv/hykuup_knapsack#187
@@ -178,9 +205,12 @@ def self.path_for(relative_path)
end
end

config.to_prepare do
DerivativeRodeo::Generators::HocrGenerator.additional_tessearct_options = nil
config.before_initialize do
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am a bit confused why we declare the models here as well as in hyrax.rb. Which one ultimately controls the behavior? It might be helpful to have it documented why we declare them twice.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This particular commit was me attempting to squash flakey specs. I don't know if they are necessary. And I'll remove and see.

In the `double_combo` branch, we replaced the need for delegation with
method_missing.  Thus we can remove the delegate declarations and
instead rely on method missing behavior.
jeremyf and others added 12 commits April 1, 2024 10:29
Addresses all reindex jobs to ensure that they will work for
either valkyrie or active fedora objects.

Ensures that works and collections are appropriately reindexed as
default work and collection images are added OR removed (previously,
reindexing didn't occur with removal of default images, resulting in
works displaying with a missing image.)
Since we changed the SolrEndpoint, this spec was failing.  This change
should fix it.
This commit will add storage/files as a persisted volume for rancher
set ups.  Hyrax uses this directory to store the binaries.
@laritakr laritakr merged commit ca49a19 into main Apr 2, 2024
4 checks passed
Copy link
Member

@orangewolf orangewolf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only the tiniest of questions and comments on this. really excellent work here

@@ -100,6 +100,9 @@ GIT
specs:
hyku_knapsack (0.0.1)
rails (>= 5.2.0)
sentry-rails
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how did sentry become a hyku dependency?

Copy link
Collaborator Author

@ShanaLMoore ShanaLMoore Apr 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should it not be? We added sentry for hyku up knapsack and knapsack prime, but now that you question it I wonder if we should've added it to bundler.d instead (within each repo)?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: rip it out of hyku and put it in bundler.d of the respective repo.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This appears to have come about because we added sentry (et al) to the gem spec of knapsack; and when we bundled along came sentry. This is definitely a surprise as we think about traditional directional dependencies; that is we think of Knapsack as laying on top of Hyku; but in reality it's a much more convoluted relationship.

pdf_splitter_service: IiifPrint::TenantConfig::PdfSplitter
)
end
include IiifPrint.model_configuration(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this mean we no longer allow IiifPrint on and off?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes…except that each tenant can disable it via a feature.

@@ -26,6 +26,8 @@ task index_collections: :environment do
end
end

# TODO: handle valkyrie reindex once admin sets have been valkyrized
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aren't adminsets valkyrized now?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pushed a PR for this.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@@ -20,7 +20,7 @@ def find_ids_by_model(model:, ids: :all) # rubocop:disable Metrics/MethodLength
model_name = ModelRegistry.lookup(model).model_name

solr_query = "_query_:\"{!raw f=has_model_ssim}#{model_name}\""
solr_response = ActiveFedora::SolrService.post(solr_query, fl: 'id', rows: @query_rows)['response']
solr_response = Hyrax::SolrService.post(solr_query, fl: 'id', rows: @query_rows)['response']
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we made a generic service accessor for SolrService above - should we use it here?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not aware of a generic service accessor. Which one were you thinking? There's a lot of Hyrax::SolrService references.

@@ -32,6 +32,9 @@ extraVolumeMounts: &volMounts
- name: uploads
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this file seems unused?

Copy link
Collaborator Author

@ShanaLMoore ShanaLMoore Apr 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's seems to be a valid host: hyku-iiif.$BASE_URL

that correlates to a running rancher pod:

image

jeremyf added a commit that referenced this pull request Apr 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
major-ver for release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants