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
2 changes: 1 addition & 1 deletion backend/apps/system/api/apikey.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ async def grid(session: SessionDep, current_user: CurrentUser) -> list[ApikeyGri
@router.post("")
@system_log(LogConfig(operation_type=OperationType.CREATE, module=OperationModules.API_KEY,result_id_expr='result.self'))
async def create(session: SessionDep, current_user: CurrentUser):
count = session.exec(select(func.count()).select_from(ApiKeyModel)).one()
count = session.exec(select(func.count()).select_from(ApiKeyModel).where(ApiKeyModel.uid == current_user.id)).one()
if count >= 5:
raise ValueError("Maximum of 5 API keys allowed")
access_key = secrets.token_urlsafe(16)
Expand Down
30 changes: 28 additions & 2 deletions frontend/src/components/layout/Apikey.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<script lang="ts" setup>
import { computed, onMounted, reactive, ref } from 'vue'
import { useI18n } from 'vue-i18n'
import SuccessFilled from '@/assets/svg/gou_icon.svg'
import CircleCloseFilled from '@/assets/svg/icon_ban_filled.svg'
import icon_warning_filled from '@/assets/svg/icon_info_colorful.svg'
import icon_add_outlined from '@/assets/svg/icon_add_outlined.svg'
import icon_visible_outlined_blod from '@/assets/embedded/icon_visible_outlined_blod.svg'
Expand Down Expand Up @@ -146,7 +148,7 @@ onMounted(() => {
style="width: 100%"
@sort-change="sortChange"
>
<el-table-column prop="access_key" label="Access Key" width="256">
<el-table-column prop="access_key" label="Access Key" width="206">
<template #default="scope">
<div class="user-status-container">
<div :title="scope.row.access_key" class="ellipsis" style="max-width: 208px">
Expand All @@ -169,7 +171,7 @@ onMounted(() => {
</div>
</template>
</el-table-column>
<el-table-column prop="secret_key" label="Secret Key" width="256">
<el-table-column prop="secret_key" label="Secret Key" width="206">
<template #default="scope">
<div class="user-status-container">
<div
Expand Down Expand Up @@ -216,6 +218,19 @@ onMounted(() => {
</div>
</template>
</el-table-column>

<el-table-column prop="status" width="100" :label="t('datasource.enabled_status')">
<template #default="scope">
<div class="api-status-container" :class="[scope.row.status ? 'active' : 'disabled']">
<el-icon size="16">
<SuccessFilled v-if="scope.row.status" />
<CircleCloseFilled v-else />
</el-icon>
<span>{{ $t(`user.${scope.row.status ? 'enabled' : 'disabled'}`) }}</span>
</div>
</template>
</el-table-column>

<el-table-column prop="create_time" width="180" sortable :label="t('user.creation_time')">
<template #default="scope">
<span>{{ formatTimestamp(scope.row.create_time, 'YYYY-MM-DD HH:mm:ss') }}</span>
Expand Down Expand Up @@ -334,6 +349,17 @@ onMounted(() => {
}
}
}
.api-status-container {
display: flex;
align-items: center;
font-weight: 400;
font-size: 14px;
line-height: 22px;

.ed-icon {
margin-right: 8px;
}
}
.user-status-container {
display: flex;
align-items: center;
Expand Down