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

Add schema browser #209

Merged
merged 4 commits into from Jul 30, 2019
Merged

Add schema browser #209

merged 4 commits into from Jul 30, 2019

Conversation

duncandewhurst
Copy link
Member

Merge once #203 merged

Closes #187

@duncandewhurst duncandewhurst changed the title 187 schemabrowser Add schema browser Jul 24, 2019
docs/example.md Outdated
@@ -19,11 +19,11 @@ We used the [spreadsheet template](spreadsheet.md) to prepare a series of releas

This was exported as an Excel file, and converted into JSON using the [OCDS Convert, Validate and Explore tool](http://standard.open-contracting.org/validator/)

The release were then compiled into a record, and are available to browse using the [open source OCDS Show framework](https://github.com/open-contracting/ocds-show/tree/ppp) which provides:
The release were then compiled into a record, and are available to browse using the [open source OCDS Show framework](https://github.com/open-contracting/ocds-show/) which provides:
Copy link
Member

Choose a reason for hiding this comment

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

I think the two links should be to OCDS Show for PPPs, right? https://github.com/open-contracting/ocds-show-ppp I prefer to hyperlink only the words "OCDS Show" and change "framework" to "tool" as it's not clear to me how it is a framework.

Should there be a link to the deployed app? https://open-contracting.github.io/ocds-show-ppp/

release -> releases

Copy link
Member Author

Choose a reason for hiding this comment

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

I think the two links should be to OCDS Show for PPPs, right?

My understanding is that the OCDS Show for PPPs repo only exists so that there can be Github pages deployments of both versions.

The main OCDS show repo includes templates for the PPP schema (just not the theme and different title in the deployed version) and there is more comprehensive documentation in the readme, so I think it's best to link to that one.

Maybe we should add a link from the main OCDS-show readme to the OCDS-show for PPPs repo though?

Should there be a link to the deployed app? https://open-contracting.github.io/ocds-show-ppp/

There is a link to the version deployed as part of the profile, with the example data loaded into it, under the next heading ('Explore the example'). Was there a particular reason to also provide a link to the (empty) Github pages version?

I've addressed the other points in 6bf3ebe

Copy link
Member

Choose a reason for hiding this comment

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

(1) There is a link to OCDS Show from OCDS Show for PPPs, but feel free to suggest changes to make this more clear and the readme more helpful.

I think it's confusing for someone wanting to run a copy of OCDS Show for PPPs to be directed to OCDS Show, which by default doesn't use the PPP templates (they are in the repository, but not used by that app without changes). To use the PPP templates, the user at minimum needs to change index.html, specifically: change record_release.html to record_release_ppp.html, change release.html to release_ppp.html, and uncomment social witness code.

This is not obvious and is extra effort compared to using the repo that already has those changes made.

(2) Presently, the situation is:

  1. Make changes to OCDS Show base templates
  2. Copy those to the PPP templates in OCDS Show
  3. Copy all changes to OCDS Show for PPPs
  4. Copy all changes to OCDS for PPPs profile

This is a lot of steps, and different people at different times have forgotten that this is what is required, and so, for example:

  1. David and Bibiana made changes to base templates, but …
  2. … without copying to PPP templates. Insert extra fields in templates open-contracting/ocds-show#30
  3. None of those changes were copied to OCDS Show for PPPs.
  4. You made changes to the copy in the profile, which would be overwritten the next time we pulled in a copy. Update extension url #178

I've made mistakes, too, and this is just a subset of the more times we have forgotten the process. (I recently cleared up the last of the inconsistencies.)

Clearly, this is overly complicated. Instead of a link like:

../_static/ocds-show/?load=../full_record_package.json

It can be:

https://open-contracting.github.io/ocds-show-ppp/?load=https://standard.open-contracting.org/profiles/ppp/latest/en/_static/full_record_package.json

In which case we no longer need a local copy, eliminating the 4th step. To do that, we'd need to set CORS headers on the standard documentation server.

The 2nd step is the subject of open-contracting/ocds-show#38. The 3rd step is the subject of open-contracting/ocds-show#39

Copy link
Member

Choose a reason for hiding this comment

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

If those changes are made, we'll also need to change the update_ocds_show make command. Basically: trim it down to just update docs/examples by curl'ing the two files from the ocds-show-ppp repository. Then, update the readme accordingly.

Copy link
Member

Choose a reason for hiding this comment

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

Anyhow, we can do those further steps as part of #211

docs/example.md Outdated Show resolved Hide resolved
@jpmckinney
Copy link
Member

To clarify, let's just do my point (1) in this PR (linking to OCDS Show for PPPs instead of OCDS Show). We can do the point (2) in #211.

@duncandewhurst
Copy link
Member Author

I've addressed point (1) - let me know when you're happy for this to be merged.

@jpmckinney
Copy link
Member

I added a bit more context on the OCDS Show for PPPs repo, to help reusers and to direct them to OCDS Show for additional docs.

@jpmckinney jpmckinney merged commit a3b9d41 into 1.0-dev Jul 30, 2019
@jpmckinney jpmckinney deleted the 187-schemabrowser branch July 30, 2019 16:27
@jpmckinney jpmckinney added this to the 1.0.0-beta2 milestone Sep 28, 2019
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.

Add a schema browser
2 participants