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

feat: Merge extension in #230

Merged
merged 46 commits into from
Jan 23, 2025
Merged

feat: Merge extension in #230

merged 46 commits into from
Jan 23, 2025

Conversation

cooper667
Copy link
Contributor

@cooper667 cooper667 commented Jan 23, 2025

Description

A test to see if we want to do this everywhere

Merges https://github.com/fjelltopp/ckanext-zarr and the history into this repo, as changes to the extension invariably require changes here, so having them in the same tree makes sense and will cut down on the number of PRs needing to be approved.

The commits are rewritten with links to the original, so we can archive the source repo.

image

The only change with the source is I ran git filter-branch to scrub the secrets from the history (I just removed the files entirely as they're not used)

The extension repo has no open PRs but does have several stale branches. These can be copied across if required.

Once this is merged, the original repo should be archived

Replaces #160

One minor negative is @ChasNelson1990 old commits are now unverified as I rewrote them to add the context/extension tag. The rewriting commit content might now be strictly necessary as I have it in my script for cases where several submodules are being merged together. With all of this coming from a single source, having the commits in the tree might be ok? Depends how much we value the verified tag on old commits really

Checklist

Put an x in the boxes that apply to this pull request (you can also fill these out after opening the pull request).
You may not need to check all boxes.

  • The GitHub ticket for this issue has been updated to "Ready to Review" or equivalent.
  • I have developed these changes in discussion with the appropriate project manager.
  • My code follows the general Fjelltopp documentation (see Confluence).
  • I have made corresponding changes to the Fjelltopp documentation (see Confluence).
  • I have rebased this branch with master.
  • New dependency changes have been committed.
  • I have added automated tests that prove my fix is effective or that my feature works.
  • New and existing tests pass locally with my changes.
  • My changes generate no new warnings.
  • I have performed a self-review of my own code.
  • I have assigned at least one reviewer.
  • I have assigned at least one label to this PR: "patch", "minor", "major".

ChasNelson1990 and others added 30 commits July 16, 2024 08:43
Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@cf62433
Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@467d4f4
…d resource page (fjelltopp/ckanext-zarr#3)

* _

* Adding helper functions / extended fjelltopp-theme layout

* Adding helper functions / extended fjelltopp-theme layout

* Adding helper functions / extended fjelltopp-theme layout

* _

* scaled promoted bg image

* _

* _

* Updated 'recently updated'

* Moved package item template to fjelltopp theme

* Removed a few helpers to clean code

* Added the topics section

* Updated :
fjelltopp-theme
added disclaimer
about

* Updated :
Insights

---------

Co-authored-by: toavina <[email protected]>

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@126e8db
… actions tests run again (fjelltopp/ckanext-zarr#4)

Co-authored-by: toavina <[email protected]>

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@7e861cd
…of fjelltopp-theme without further changes (fjelltopp/ckanext-zarr#5)

Co-authored-by: toavina <[email protected]>

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@1a083b3
…t-zarr#11)

* Updates copyright value

* Updates subscribe_to_updates.html subtext content

* Dataset search fa-search hover fixed

* Dataset search fa-search hover fixed

* Removed the extended subcribe_to_updates.html

* fix .fa-search color

---------

Co-authored-by: toavina <[email protected]>

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@b2b907c
…arr#6)

* Added a draft schema for Dublin Core and a dcat profile to include the elements in dcat export

* Small change to doi label

* Small changes for a few help_text

* Updates to schema

* Updates to schema

* Updates to schema

* Convert Json Schema to Yaml

* Updates to UI

* Updates to UI

* Updates to schema

* Added validator for date, a few fix for UI

* Fixing multiple select

* Macro for multiple select

* Using yaml schema now

* css fix

* Small code fix

* Default metadata for resources

* Small fix for multiple_select_formatter

* wip: add file uploader (fjelltopp/ckanext-zarr#9)

* Code improvements for additional_info.html and helpers.py

* Remove excess of lines from zarr.css

* Moved the namespace with others

* Updated the language field as a single select

* Updated the language field as a single select

* Renamed schema

* Commented profiles.py as WIP

---------

Co-authored-by: toavina <[email protected]>
Co-authored-by: Chas Nelson <[email protected]>

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@8414244
* About content updated with styling

* About content updated with styling

---------

Co-authored-by: toavina <[email protected]>

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@56486af
…pp/ckanext-zarr#23)

* feat: add a placeholder video to the homepage

* fix: make iframe responsive

* fix: make caption i18n friendly

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@1254dda
…t-zarr#20)

* Removed insight section

* Removed max-width for bottom search footer button

* Updating search button

* Updating search button

* small comment

* a bit of customization for datahub stats

* fix: keep insights

---------

Co-authored-by: toavina <[email protected]>
Co-authored-by: Chas Nelson <[email protected]>

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@da37dde
…splay on homepage (fjelltopp/ckanext-zarr#22)

* using groups with extra whose key is 'topic' and value is 'yes'

* Removed filtering

* Removed filtering

* Updated the name 'topic' to 'Resource Type'

---------

Co-authored-by: toavina <[email protected]>

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@221a315
…-zarr#24)

* Removed extra 'Learn more about the repository'

* Still under development banner color white / green background

* update grays in datasets and resource read

* changes inactive stage background color

* needs rebase

---------

Co-authored-by: toavina <[email protected]>
Co-authored-by: Chas Nelson <[email protected]>

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@8ed195b
* feat: simplify schema

* fix: minor improvement to subject placeholder

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@ab1212b
Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@c811f2f
replace "Licence" to "" (use an extension template)

Co-authored-by: toavina <[email protected]>

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@de5ffc4
…rr#27)

* wip: remove cssrewrite

* wip: remove version in outputs

* revert: undo webassets hash changes

* wip: combine CSS assets

* wip: combine CSS assets

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@8fd2333
* Added organizations to facets

* refactoring

* Added organizations and renamed find data to data

* Added organizations and renamed find data to data

* Defines the top menu nav items

---------

Co-authored-by: toavina <[email protected]>

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@e9c4d25
…p/ckanext-zarr#30)

* draft

* Refactored in fjelltopp-theme

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@23baa7e
…iable information (fjelltopp/ckanext-zarr#40)

* added a multi checkbox in schema

* added a new preset

* added a new preset

* Updated preset

* Invalidate this change

* Small update to display_snippet

* Small fix to schema

* More update

* More update

* Changed default values

* Small id change

* invalidate changes on react files

* invalidate changes on react files

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@7695951
…zarr#41)

* flag added on promoted right

* small fix in layout1.html

* Removed dots and made the flag flat

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@18f6055
* change of name

* change of name

* change of name

* small fix

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@979acce
…ages as icons (fjelltopp/ckanext-zarr#44)

* feat: make groups on home page show icons

* feat: make flag a bit thinner

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@b65e604
…lltopp/ckanext-zarr#45)

* Remove footer effects

* Remove footer effects

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@ad6d992
A-Souhei and others added 16 commits October 9, 2024 09:00
…ll-photo-on-the-home-page - fix (fjelltopp/ckanext-zarr#50)

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@1358106
…ltopp/ckanext-zarr#49)

* resource types shown as badges in promoted

* added comments

* apply styling

* apply styling (added to palette)

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@4a6274f
…anext-zarr#52)

* fix:rename dataset_type value to data

* Simplify the dashboard datasets tab label as humanize_entity_type will return 'My Datas'

* adds a comment to explain template extension

* debugging

* A staging schema with dataset_type: dataset

---------

Co-authored-by: toavina <[email protected]>

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@7a01670
…ext-zarr#55)

* Adding the case insensitive feature in zarr extension

* Removed unused import

* Removed unused import

* added password verification

* added tests

* Renamed WHOAFROPlugin to ZaRRPlugin

* Added one more test

---------

Co-authored-by: toavina <[email protected]>

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@04e3a13
…ical bars do not hide them (fjelltopp/ckanext-zarr#56)

Co-authored-by: toavina <[email protected]>

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@7dfee77
…atasets (fjelltopp/ckanext-zarr#57)

* added a word break property so metadata td does not exceed container

* justified dataset and resource descriptions

* small update

* word break is better

* More specific selector

---------

Co-authored-by: toavina <[email protected]>

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@dc79d62
@cooper667 cooper667 changed the title Merge ext feat: Merge extension in Jan 23, 2025
@cooper667 cooper667 added enhancement New feature or request dependencies Pull requests that update a dependency file submodules Pull requests that update Submodules code labels Jan 23, 2025
@cooper667 cooper667 self-assigned this Jan 23, 2025
Copy link
Member

@ChasNelson1990 ChasNelson1990 left a comment

Choose a reason for hiding this comment

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

LGTM 🎉
Works in a fresh local dev environment fine; let's get this merged and I can deploy to staging.

@cooper667 cooper667 merged commit dca3f42 into main Jan 23, 2025
@cooper667 cooper667 deleted the merge_ext branch January 23, 2025 10:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file enhancement New feature or request submodules Pull requests that update Submodules code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants