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

Remove max from row limit setting, combine forms #3693

Merged
merged 6 commits into from
Oct 12, 2021
Merged

Remove max from row limit setting, combine forms #3693

merged 6 commits into from
Oct 12, 2021

Conversation

dafeder
Copy link
Member

@dafeder dafeder commented Oct 11, 2021

This PR consolidates the two datastore settings forms into one, and removes the hard limit imposed by the form on the row count.

QA Steps

  • The SQL Endpoint settings link is gone from the admin menu
  • The row count limit on the datastore settings menu can be set to 20000
  • If the row count field is left blank, it will be set to 500.

@dafeder dafeder marked this pull request as ready for review October 11, 2021 16:28
@dafeder dafeder requested a review from janette October 11, 2021 16:29
@janette
Copy link
Member

janette commented Oct 11, 2021

@dafeder I get an error on the docs page

Fetch error
Bad Request /api/1/metastore/schemas/dataset/items/cedcd327-4e5d-43f9-8eb1-c11850fa7c55/docs

@janette
Copy link
Member

janette commented Oct 11, 2021

Also am allowed to set the limit to anything on the api/1/datastore/sql/?query= endpoint

@dafeder
Copy link
Member Author

dafeder commented Oct 11, 2021

It should fail validation if the limit in the query is higher than the max setting

@dafeder
Copy link
Member Author

dafeder commented Oct 11, 2021

@dafeder I get an error on the docs page

Fetch error
Bad Request /api/1/metastore/schemas/dataset/items/cedcd327-4e5d-43f9-8eb1-c11850fa7c55/docs

Ok I'll look into this.

@clayliddell
Copy link
Contributor

clayliddell commented Oct 11, 2021

@janette I wasn't able to replicate the error you observed on my local environment with a Vanilla DKAN instance.

Also I was able to successfully complete the QA Instructions.

@janette janette merged commit fc77752 into 2.x Oct 12, 2021
@janette
Copy link
Member

janette commented Oct 12, 2021

@dafeder @clayliddell yes, after a fresh build everything is working as expected.

@janette janette deleted the rowlimit-form branch May 19, 2023 14:26
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.

3 participants