Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
46 changes: 46 additions & 0 deletions alembic/versions/ad13850a7245_ui_flip_project_icon.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
"""Ui flip & project icon

Revision ID: ad13850a7245
Revises: 96fbb404381e
Create Date: 2025-06-23 11:35:12.693674

"""

from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = "ad13850a7245"
down_revision = "96fbb404381e"
branch_labels = None
depends_on = None


def upgrade():
connection = op.get_bind()
# ### commands auto generated by Alembic - please adjust! ###
op.add_column(
"user", sa.Column("use_new_cognition_ui", sa.Boolean(), nullable=True)
)
op.add_column(
"project", sa.Column("icon", sa.String(), nullable=True), schema="cognition"
)
# ### end Alembic commands ###

update_dataset_sql = """
UPDATE cognition.project
SET icon = 'IconBolt';"""
connection.execute(update_dataset_sql)

update_dataset_sql = """
UPDATE public.user
SET use_new_cognition_ui = FALSE; """
connection.execute(update_dataset_sql)


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_column("project", "icon", schema="cognition")
op.drop_column("user", "use_new_cognition_ui")
# ### end Alembic commands ###
9 changes: 6 additions & 3 deletions controller/user/manager.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
from typing import Dict, Optional
from typing import Dict, Optional, Any
from submodules.model import User, daemon, enums
from submodules.model.business_objects import user, general
from controller.auth import kratos
from submodules.model.exceptions import EntityNotFoundException
from controller.organization import manager as organization_manager
from datetime import datetime, timedelta
from util.decorator import param_throttle
from submodules.model.util import is_string_true_value


def get_user(user_id: str) -> User:
Expand Down Expand Up @@ -70,11 +71,13 @@ def update_user_role(user_id: str, role: str) -> User:
return user_item


def update_user_language_display(user_id: str, language_display: str) -> User:
def update_user_field(user_id: str, field: str, value: Any) -> User:
user_item = user.get(user_id)
if not user_item:
raise ValueError("User not found")
user_item.language_display = language_display
if field == "use_new_cognition_ui":
value = is_string_true_value(value)
setattr(user_item, field, value)
general.commit()
return user_item

Expand Down
5 changes: 0 additions & 5 deletions fast_api/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -383,11 +383,6 @@ class TokenizedRecordBody(BaseModel):
record_id: StrictStr


class UserLanguageDisplay(BaseModel):
user_id: str
language_display: str


class MappedSortedPaginatedUsers(BaseModel):
sort_key: str
sort_direction: int
Expand Down
11 changes: 6 additions & 5 deletions fast_api/routes/organization.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
MappedSortedPaginatedUsers,
MissingUsersBody,
RemoveUserToOrganizationBody,
UserLanguageDisplay,
)
from controller.auth import manager as auth_manager
from controller.auth.kratos import (
Expand Down Expand Up @@ -47,6 +46,7 @@
"role",
"language_display",
"email",
"use_new_cognition_ui",
}
USER_INFO_RENAME_MAP = {"email": "mail"}
ALL_ORGANIZATIONS_WHITELIST = {
Expand Down Expand Up @@ -247,10 +247,11 @@ def archive_admin_message(
return get_silent_success()


# in use cognition-ui (08.01.25)
@router.post("/set-language-display")
def set_language_display(request: Request, body: UserLanguageDisplay = Body(...)):
user_manager.update_user_language_display(body.user_id, body.language_display)
# in use cognition-ui (23.06.25)
@router.put("/update-user-field/{field}/{value}")
def set_language_display(request: Request, field: str, value: str):
user_id = auth_manager.get_user_id_by_info(request.state.info)
user_manager.update_user_field(user_id, field, value)
return get_silent_success()


Expand Down
2 changes: 1 addition & 1 deletion submodules/model