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

CKAN 2.10 + Cypress 12.10.0 #162

Merged
merged 43 commits into from
Jul 18, 2023
Merged

CKAN 2.10 + Cypress 12.10.0 #162

merged 43 commits into from
Jul 18, 2023

Conversation

nickumia-reisys
Copy link
Contributor

@nickumia-reisys nickumia-reisys commented Apr 18, 2023

Related to

Changes:

  • IRoutes is deprecated and it wasn't doing anything for us since CKAN 2.9.5
  • Changed references to deprecated url to url_for
  • (BREAKING) h.flash.pop_messages is deprecated and replaced with h.get_flashed_messages
  • (BREAKING) Update references to routes from pylons organization_read to new way of organization.read ... et cetera.
  • Update dataset creation method to return the ID of the new dataset.
  • h.new_activities is deprecated, so remove code.
  • Migrate to cypress 12.10.0 (EACH DEVELOPER NEEDS TO UPDATE THEIR LOCAL SETUP)
  • Update cypress tests due to CKAN 2.10 dataset name inconsistency
  • Add (missing?) styles to datagovtheme.css
  • Deleted custom resource_preview_custom function.
    • h.resource_preview was mysteriously deleted in CKAN 2.10
  • Fix facet list on organization page
  • Update icon-??? to fa-???
  • Fix collection_resources inheritance between datagovtheme and geodatagov (not sure why it broke in CKAN 2.10)
  • Fix flash message styling
  • New template override templates/snippets/search_form.html
  • Add new cypress test for contact information on dataset page
  • Track upstream ckanext-spatial for extension testing

@nickumia-reisys
Copy link
Contributor Author

@FuhuXia I need help. One of the datasets in the test is being created a private and we don't know why or how. Can you take a look at it and see if you find anything? Or can we pair at some point?

modify the create_dataset function to return the real ID so that it knows where to go
See PR comment for breaking change comments
This prevents an error that the user/group already exists
- Lots and lots and lots and lots... of changes..
- Migrate from cypress 7.3.0 to 12.10.0
- Add command to run cypress locally (courtesy of @FuhuXia)
- Update tests to not be dependent on dataset name (since CKAN 2.10 breaks dataset name consistency)
- Reorg cypress layout due to pre-10.0 and post-10.0 folder structuring changes
@nickumia-reisys nickumia-reisys changed the title CKAN 2.10 CKAN 2.10 + Cypress 12.10.0 Apr 19, 2023
@nickumia-reisys
Copy link
Contributor Author

nickumia-reisys commented Apr 20, 2023

Tests are passing.. TODO:

  • Update README
  • Sync CKAN 2.10 templates
  • Any other random changes... TBD

@FuhuXia
Copy link
Member

FuhuXia commented Jun 16, 2023

Looks good and ready to be released as version='0.2.0',

@FuhuXia
Copy link
Member

FuhuXia commented Jun 26, 2023

manually publish to PYPI version 0.2.0.

@nickumia-reisys nickumia-reisys marked this pull request as ready for review July 11, 2023 20:11
@nickumia-reisys nickumia-reisys requested a review from a team July 11, 2023 20:11
Copy link
Contributor

@btylerburton btylerburton left a comment

Choose a reason for hiding this comment

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

a few questions...

Makefile Show resolved Hide resolved
@@ -18,6 +18,13 @@
background-color: transparent;
border: 0;
}
.hide {
Copy link
Contributor

Choose a reason for hiding this comment

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

anyone know the reason for this alt CSS file?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Apparently CKAN CSS messed with Data.gov theme CSS and USWDS CSS... this is where we use it @btylerburton

ckanext/datagovtheme/templates/header-site-usage.html:3:<a href="#content" class="hide">{{ _('Skip to content') }}</a>
ckanext/datagovtheme/templates/header-site-usage.html:18:                        <label class="hide" for="search-header">Search for:</label>
ckanext/datagovtheme/templates/package/search.html:15:          <label for="search-big" class="hide">{{ _('Search datasets') }}</label>
ckanext/datagovtheme/templates/package/search.html:124:        <label for="field-location" class="hide">{{ _('Filter by location') }}</label>
ckanext/datagovtheme/templates/header.html:63:<a href="#content" class="hide">{{ _('Skip to content') }}</a>
ckanext/datagovtheme/templates/header.html:104:                            <li class="usa-nav__primary-item desktop-hide">

@@ -8,15 +8,15 @@
{% snippet 'snippets/sort_by.html', sort=c.sort_by_selected %}

#}
<span class="form-select {{ 'form-group' }} control-order-by">
<div class="form-group control-order-by">
Copy link
Contributor

Choose a reason for hiding this comment

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

what's the template tags for? {{ 'form-group'}}

also, looks like we deleted form-select??

nickumia-reisys and others added 3 commits July 12, 2023 15:04
The new template feature of 'super' inheritance recreates the dependency on geodatagov
@nickumia-reisys nickumia-reisys merged commit fdfe725 into main Jul 18, 2023
@nickumia-reisys nickumia-reisys deleted the ckan-210 branch July 18, 2023 19:20
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.

4 participants