Skip to content

fix(datasource): sort fieldList results with enabled fields first #899

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.

Sign up for GitHub

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

Open
llanc wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(datasource): sort fieldList results with enabled fields first #899

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions backend/apps/datasource/crud/field.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@ def delete_field_by_ds_id(session: SessionDep, id: int):


def get_fields_by_table_id(session: SessionDep, id: int, field: FieldObj):
order = (CoreField.checked.desc(), CoreField.field_index.asc())
if field and field.fieldName:
return session.query(CoreField).filter(
and_(CoreField.table_id == id, or_(CoreField.field_name.like(f'%{field.fieldName}%'),
CoreField.field_name.like(f'%{field.fieldName.lower()}%'),
CoreField.field_name.like(f'%{field.fieldName.upper()}%')))).order_by(
CoreField.field_index.asc()).all()
*order).all()
else:
return session.query(CoreField).filter(CoreField.table_id == id).order_by(CoreField.field_index.asc()).all()
return session.query(CoreField).filter(CoreField.table_id == id).order_by(*order).all()


def update_field(session: SessionDep, item: CoreField):
Expand Down