Organization UI controls to manage data.json are not appearing

[adborden]

GSA/inventory-app#7 (comment)

We discovered when bumping to the latest commit for ckanext-datajson, the UI controls to manage the data.json are missing. Rolling back to commit 177c9d8 works.

How to reproduce

1. Create an organization
2. Open the organization page

Expected

Actual

[adborden]

Hmm, realizing that 177c9d8 is not on the datagov branch and that Inventory is running a fork of Catalog's ckanext-datajson 😭

[avdata99]

I just download the inventory app (in develop branch), run the starting commands, follow these steps and worked fine.

I think the master branch on ckanex-datajson has an old setup.py file. We should use datagov or upgrade this file

[avdata99]

Those buttons are showed if the ckanext.datajson.inventory_links_enabled config is True. Maybe @adborden you just need to check if the config has changed.

[adborden]

Thanks @avdata99, that seems to be the issue. So, given that we have two different branches, should we keep the changes from master? How should we merge these to branches?

[avdata99]

Last update on master was 3 years ago @adborden

If GSA is now in production env using datagov branch for catalog and inventory maybe it's a good idea to merge datagov into master directly. We also can open a PR for that and check the differences.

[adborden]

Inventory production is currently using `master`. Let's merge datagov into master and then delete the datagov branch.

…

On Wed, Jan 22, 2020 at 6:11 AM Andres Vazquez ***@***.***> wrote: Last update on master was 3 years ago @adborden <https://github.com/adborden> [image: image] <https://user-images.githubusercontent.com/3237309/72900899-79750900-3d07-11ea-9b2e-ebd4b48fd7c1.png> If GSA is now in production env using datagov branch for *catalog* and *inventory* maybe it's a good idea to merge datagov into master directly. We also can open a PR for that and check the differences. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#52?email_source=notifications&email_token=AAD4OBYMOMW4NPO5OWGWJ33Q7BHZZA5CNFSM4KFNYTJKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEJTVYDY#issuecomment-577199119>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAD4OBY4THUQDW7MIFJMUMTQ7BHZZANCNFSM4KFNYTJA> .

-- Aaron D Borden Lead Engineer | IT Specialist TTS | Data.gov <https://www.data.gov>

[avdata99]

A work in progress PR was opened for this big merge: #53.
I need to work with this

[avdata99]

I did an analysis.
I added a new PR to merge first (conflict fixing and CircleCI errors).

And then it will be ok to merge the branches.
Maybe you can do some manual testing but the changes seem ok.