Skip to content

Ap 709: Update Geodata to use Geoblacklight 5.3.0; AP-714: Update Geodata to use Ruby 3.4#76

Open
yzhoubk wants to merge 16 commits into
mainfrom
AP-709
Open

Ap 709: Update Geodata to use Geoblacklight 5.3.0; AP-714: Update Geodata to use Ruby 3.4#76
yzhoubk wants to merge 16 commits into
mainfrom
AP-709

Conversation

@yzhoubk

@yzhoubk yzhoubk commented Jun 24, 2026

Copy link
Copy Markdown
Contributor
  1. Integrated a Geoblacklight instance into the current GeoData
  2. Updated to use Ruby 3.4.9
  3. Temporarily excluded Rspec test in build.yml , it will revered back in AP-754 during add/update test.

@anarchivist anarchivist left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

looks okay - but i have a lot of questions. do we really intend to get rid a majority of the ERB templates and the css overrides?


- name: Run RSpec
if: ${{ always() }}
if: ${{ always() && env.RUN_TESTS == 'true' }}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

is this and the other change in this file just supposed be temporary until tests are passing?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes, these changes are temporary. A note has already been added to AP-754 to explaining how to revert the change when they are no longer needed.

Comment on lines -1 to -52
.ucb_container {
min-height: 100%;
width: 100%;
margin-bottom: 90px;
}

.spacer {
height: 90px;
}

.navbar {
height: 6em;
}

.btn-primary {
background-color: $link-color;
color: #ffffff;
}

ul.facet-values {
span.selected {
color: #208836 !important;
}
}

.nav-pills .nav-link.active,
.nav-pills .show>.nav-link,
.nav-pills .no-js .btn-group:focus-within .dropdown-menu>.nav-link,
.nav-pills .no-js .btn-group:focus-within .twitter-typeahead .tt-menu>.nav-link,
.twitter-typeahead .nav-pills .no-js .btn-group:focus-within .tt-menu>.nav-link,
.no-js .btn-group:focus-within .nav-pills .dropdown-menu>.nav-link,
.no-js .btn-group:focus-within .nav-pills .twitter-typeahead .tt-menu>.nav-link,
.twitter-typeahead .no-js .btn-group:focus-within .nav-pills .tt-menu>.nav-link {
background-color: $link-color;
}

#metadata-container {
a {
color: #006FD6;

&:hover {
color: #0044B3;
text-decoration: underline;
}
}
}

.element-focusable:hover,
.element-focusable:focus {
color: #0051AD;
text-decoration: underline;
} No newline at end of file

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

are you sure we want to get rid of all of these customizations? i suspect at least some of them are things we added to address accessibility issues.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

To keep the default GeoBlacklight UI clean during the upgrade, i removed off all the old style files. Yes, some of the styles in those legacy CSS files under app/assets/stylesheets/ will be needed for the upcoming UI updates. Good catch, I've moved those files into a legacy folder and comment out their contents, so they can be used during UI work.

Comment thread app/assets/stylesheets/_footer.scss Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ditto this - i know the last change to your file was to update the logos, so do we need to retain this?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes, this has been moved to the legacy folder so it can be reused later if needed.

@import url("https://cdn.jsdelivr.net/npm/leaflet.fullscreen@5.3.0/dist/Control.FullScreen.css");
@import url("https://cdn.jsdelivr.net/npm/ol@8.1.0/ol.css");

@import 'customizations';

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

importing the customizations should probably happen last as it will override all the other rules.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

yes, updated.

Comment thread app/models/user.rb
Comment on lines -9 to -24
class << self
# Finds or creates a user record given data from the omniauth request hash
def from_calnet(auth)
where(calnet_uid: auth.uid).first_or_initialize do |user|
user.email = auth.extra['berkeleyEduOfficialEmail'] || fake_email if user.email.blank?
user.save!
end
end

private

# Generates a random email address
def fake_email
"fake-#{SecureRandom.hex[0, 16]}@noemail.com"
end
end

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

is this no longer necessary?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

They will be used for the CalNet login. I've restored them and commented them out for now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants