Skip to content

Commit

Permalink
feat: Merge extension in (#230)
Browse files Browse the repository at this point in the history
* [ckanext-zarr] feat: create README.md

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@cf62433

* [ckanext-zarr] feat: initialise ckan extension


Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@e0dedd5

* [ckanext-zarr] fix: add .gitignore


Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@467d4f4

* [ckanext-zarr] 2- branding for homepage, search page, dataset page and 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

* [ckanext-zarr] Rename the __github to .github to effectively make the actions tests run again (fjelltopp/ckanext-zarr#4)

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

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@7e861cd

* [ckanext-zarr] With this commit, ZaRR should work with master branch 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

* [ckanext-zarr] 10 - additional ZaRR UI enhancements (fjelltopp/ckanext-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

* [ckanext-zarr] 9- Dublin Core metadata standards (fjelltopp/ckanext-zarr#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

* [ckanext-zarr] 15-Updating about page (fjelltopp/ckanext-zarr#16)

* 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

* [ckanext-zarr] feat: add a placeholder video to the homepage (fjelltopp/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

* [ckanext-zarr] feat: move datahub stats into footer (fjelltopp/ckanext-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

* [ckanext-zarr] feat: make Dublin Core 'types' be CKAN 'groups' and display 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

* [ckanext-zarr] feat: add small visual enhancements (fjelltopp/ckanext-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

* [ckanext-zarr] fix: update resource type in schema to match latest dublin definitions


Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@88d5ca2

* [ckanext-zarr] feat: simplify schema (fjelltopp/ckanext-zarr#25)

* feat: simplify schema

* fix: minor improvement to subject placeholder

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@ab1212b

* [ckanext-zarr] fix: correct minor typo


Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@c811f2f

* [ckanext-zarr] Updates to font sizes (fjelltopp/ckanext-zarr#26)

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

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@474790f

* [ckanext-zarr] Added padding to licence (fjelltopp/ckanext-zarr#28)

replace "Licence" to "" (use an extension template)

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

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@de5ffc4

* [ckanext-zarr] fix: give webassets unique names (fjelltopp/ckanext-zarr#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

* [ckanext-zarr] Add Organizations to menu bar (fjelltopp/ckanext-zarr#29)

* 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

* [ckanext-zarr] ZaRR dataset read page to look like WHO-AFRO (fjelltopp/ckanext-zarr#30)

* draft

* Refactored in fjelltopp-theme

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@23baa7e

* [ckanext-zarr] Updating get_facet_items_dict (fjelltopp/ckanext-zarr#37)



Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@109dfe7

* [ckanext-zarr] update in project description (fjelltopp/ckanext-zarr#38)



Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@7505f73

* [ckanext-zarr] Removes custom field from organization_form.html (fjelltopp/ckanext-zarr#32)



Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@c855e4f

* [ckanext-zarr] 174 - Add mandatory check box about personally identifiable 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

* [ckanext-zarr] Add Zambia flag colors on promoted (fjelltopp/ckanext-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

* [ckanext-zarr] 179 - Change name  (fjelltopp/ckanext-zarr#42)

* change of name

* change of name

* change of name

* small fix

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@979acce

* [ckanext-zarr] fix: relock npm from inside container (fjelltopp/ckanext-zarr#43)



Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@0aa1358

* [ckanext-zarr] feat: make group icons on homepage show their group images 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

* [ckanext-zarr] 185 - Fjelltopp theme leaks through on the footer (fjelltopp/ckanext-zarr#45)

* Remove footer effects

* Remove footer effects

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@ad6d992

* [ckanext-zarr] feat: remove custom fields for groups (fjelltopp/ckanext-zarr#46)



Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@4fdc837

* [ckanext-zarr] fix: replace logo with official version


Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@5db4eab

* [ckanext-zarr] adds dataset to "resource type" group if an option is selected (fjelltopp/ckanext-zarr#48)



Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@c1a9db1

* [ckanext-zarr] 195-on-wide-screens-the-dark-green-doesnt-cover-the-full-photo-on-the-home-page - fix (fjelltopp/ckanext-zarr#50)



Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@1358106

* [ckanext-zarr] 192 - Make schema badges actually reflect groups (fjelltopp/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

* [ckanext-zarr] fix:badge in dashboard dataset is not positioned in the best (fjelltopp/ckanext-zarr#51)



Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@f24e688

* [ckanext-zarr] draft can be deleted (fjelltopp/ckanext-zarr#54)

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

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@af3a8bb

* [ckanext-zarr] 199 fix:rename zarr dataset_type to data (fjelltopp/ckanext-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

* [ckanext-zarr] 196 email addresses are case sensitive (fjelltopp/ckanext-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

* [ckanext-zarr] Increased z-index for ul.nav.nav-tabs so promoted vertical 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

* [ckanext-zarr] Some metadata fields are not responsive when viewing datasets (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

* [ckanext-zarr] Added get package stats for google analytics in extension (fjelltopp/ckanext-zarr#58)

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

Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@b8593f8

* [ckanext-zarr] fix: remove redundant tests that also include secrets (fjelltopp/ckanext-zarr#59)



Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@257be99

* [ckanext-zarr] chore: move all files into ckanext-zarr


Commit migrated from fjelltopp/ckanext-zarr: fjelltopp/ckanext-zarr@cbee43b

* remove submodule

---------

Co-authored-by: Chas Nelson <[email protected]>
Co-authored-by: Toavina A. <[email protected]>
  • Loading branch information
3 people authored Jan 23, 2025
1 parent 4a1d4e4 commit dca3f42
Show file tree
Hide file tree
Showing 92 changed files with 30,050 additions and 4 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "ckan"]
path = ckan
url = [email protected]:ckan/ckan.git
[submodule "ckanext-zarr"]
path = ckanext-zarr
url = [email protected]:fjelltopp/ckanext-zarr.git
1 change: 0 additions & 1 deletion ckanext-zarr
Submodule ckanext-zarr deleted from 96726f
48 changes: 48 additions & 0 deletions ckanext-zarr/.github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Tests
on: [push, pull_request]
jobs:
test:
runs-on: ubuntu-latest
container:
# The CKAN version tag of the Solr and Postgres containers should match
# the one of the container the tests run on.
# You can switch this base image with a custom image tailored to your project
image: ckan/ckan-base:2.10.4
services:
solr:
image: ckan/ckan-solr:2.10-solr8
postgres:
image: ckan/ckan-postgres-dev:2.10
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: postgres
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
redis:
image: redis:3

env:
CKAN_SQLALCHEMY_URL: postgresql://ckan_default:pass@postgres/ckan_test
CKAN_DATASTORE_WRITE_URL: postgresql://datastore_write:pass@postgres/datastore_test
CKAN_DATASTORE_READ_URL: postgresql://datastore_read:pass@postgres/datastore_test
CKAN_SOLR_URL: http://solr:8983/solr/ckan
CKAN_REDIS_URL: redis://redis:6379/1

steps:
- uses: actions/checkout@v4
- name: Install requirements
# Install any extra requirements your extension has here (dev requirements, other extensions etc)
run: |
pip install -r requirements.txt
pip install -r dev-requirements.txt
pip install -e .
- name: Setup extension
# Extra initialization steps
run: |
# Replace default path to CKAN core config file with the one on the container
sed -i -e 's/use = config:.*/use = config:\/srv\/app\/src\/ckan\/test-core.ini/' test.ini
ckan -c test.ini db init
- name: Run tests
run: pytest --ckan-ini=test.ini --cov=ckanext.zarr --disable-warnings ckanext/zarr

42 changes: 42 additions & 0 deletions ckanext-zarr/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
.ropeproject
node_modules
bower_components

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]

# C extensions
*.so

# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
sdist/
*.egg-info/
.installed.cfg
*.egg

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.cache
nosetests.xml
coverage.xml

# Sphinx documentation
docs/_build/
Loading

0 comments on commit dca3f42

Please sign in to comment.