feat(secrets-mcp): /entries 按 tags 筛选,发版 0.5.27
- Web:tags 查询参数、folder 计数 SQL、分页与 tab 保留 tags;模板与 i18n - README / AGENTS / CHANGELOG;plans/web-tags-filter 等计划文档
This commit is contained in:
@@ -182,6 +182,8 @@ oauth_accounts (
|
|||||||
|
|
||||||
列表仅展示非敏感字段;**名称**与**操作**列为固定列(不可在「显示列」中关闭)。**文件夹**(对应 `entries.folder`)、类型、备注、标签、关联、密文等为**可选列**,由用户在「显示列」面板中勾选;可见性保存在浏览器 `localStorage`,键为 **`entries_col_vis`**。新增列会并入默认:若用户曾保存过旧版配置,缺失的列键会按当前默认补齐。**文件夹**列默认**显示**,便于在「全部」等跨 folder 视图下区分条目所属隔离空间。
|
列表仅展示非敏感字段;**名称**与**操作**列为固定列(不可在「显示列」中关闭)。**文件夹**(对应 `entries.folder`)、类型、备注、标签、关联、密文等为**可选列**,由用户在「显示列」面板中勾选;可见性保存在浏览器 `localStorage`,键为 **`entries_col_vis`**。新增列会并入默认:若用户曾保存过旧版配置,缺失的列键会按当前默认补齐。**文件夹**列默认**显示**,便于在「全部」等跨 folder 视图下区分条目所属隔离空间。
|
||||||
|
|
||||||
|
筛选栏支持查询参数 **`tags`**(逗号分隔,多标签 **AND**,语义同 `SearchParams.tags` / `tags @> ARRAY[...]`);分页与 folder 标签计数与当前筛选一致。
|
||||||
|
|
||||||
### 导出 / 导入文件
|
### 导出 / 导入文件
|
||||||
|
|
||||||
JSON/TOML/YAML 导出可在每条目上包含 `secret_types`(secret 名 → `text` / `password` / `key` 等),导入时写回 `secrets.type`;**旧版导出无该字段**时导入仍成功,类型按 **`text`** 默认。
|
JSON/TOML/YAML 导出可在每条目上包含 `secret_types`(secret 名 → `text` / `password` / `key` 等),导入时写回 `secrets.type`;**旧版导出无该字段**时导入仍成功,类型按 **`text`** 默认。
|
||||||
|
|||||||
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -2105,7 +2105,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "secrets-mcp"
|
name = "secrets-mcp"
|
||||||
version = "0.5.26"
|
version = "0.5.27"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"askama",
|
"askama",
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ SECRETS_DATABASE_SSL_ROOT_CERT=/etc/secrets/pg-ca.crt
|
|||||||
SECRETS_ENV=production
|
SECRETS_ENV=production
|
||||||
```
|
```
|
||||||
|
|
||||||
- **Web**:`BASE_URL`(登录、Dashboard、设置密码短语、创建 API Key)。**变更记录**页 **`/changelog`**:内容来自 `crates/secrets-mcp/CHANGELOG.md`(构建时嵌入并以 Markdown 渲染);首页页脚与 Dashboard(MCP)页脚均提供入口。**条目**页 `/entries` 支持 folder 标签与条件筛选;表格列可在「显示列」中开关(名称与操作固定),**文件夹**列为可选列且默认显示。列可见性持久化见 [AGENTS.md](AGENTS.md)「Web 条目页表格列」。
|
- **Web**:`BASE_URL`(登录、Dashboard、设置密码短语、创建 API Key)。**变更记录**页 **`/changelog`**:内容来自 `crates/secrets-mcp/CHANGELOG.md`(构建时嵌入并以 Markdown 渲染);首页页脚与 Dashboard(MCP)页脚均提供入口。**条目**页 `/entries` 支持 folder 标签与条件筛选(含 **`tags`** 逗号分隔、多标签同时匹配);表格列可在「显示列」中开关(名称与操作固定),**文件夹**列为可选列且默认显示。列可见性持久化见 [AGENTS.md](AGENTS.md)「Web 条目页表格列」。
|
||||||
- **MCP**:Streamable HTTP 基址 `{BASE_URL}/mcp`,需 `Authorization: Bearer <api_key>` + `X-Encryption-Key: <hex>` 请求头(读密文工具须带密钥)。
|
- **MCP**:Streamable HTTP 基址 `{BASE_URL}/mcp`,需 `Authorization: Bearer <api_key>` + `X-Encryption-Key: <hex>` 请求头(读密文工具须带密钥)。
|
||||||
|
|
||||||
## PostgreSQL TLS 加固
|
## PostgreSQL TLS 加固
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
本文档在构建时嵌入 Web 的 `/changelog` 页面,并由服务端渲染为 HTML。
|
本文档在构建时嵌入 Web 的 `/changelog` 页面,并由服务端渲染为 HTML。
|
||||||
|
|
||||||
|
## [0.5.27] - 2026-04-11
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Web **`/entries`**:按 **tags** 筛选(逗号分隔、trim、多标签 **AND** 语义,与 `SearchParams` / MCP 一致);folder 标签计数、分页与筛选栏状态同步保留 `tags`。
|
||||||
|
|
||||||
## [0.5.26] - 2026-04-11
|
## [0.5.26] - 2026-04-11
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "secrets-mcp"
|
name = "secrets-mcp"
|
||||||
version = "0.5.26"
|
version = "0.5.27"
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
|
|
||||||
[[bin]]
|
[[bin]]
|
||||||
|
|||||||
@@ -45,6 +45,7 @@ struct EntriesPageTemplate {
|
|||||||
filter_folder: String,
|
filter_folder: String,
|
||||||
filter_name: String,
|
filter_name: String,
|
||||||
filter_metadata_query: String,
|
filter_metadata_query: String,
|
||||||
|
filter_tags: String,
|
||||||
filter_type: String,
|
filter_type: String,
|
||||||
current_page: u32,
|
current_page: u32,
|
||||||
total_pages: u32,
|
total_pages: u32,
|
||||||
@@ -125,6 +126,8 @@ pub(super) struct EntriesQuery {
|
|||||||
/// URL query key is `type` (maps to DB column `entries.type`).
|
/// URL query key is `type` (maps to DB column `entries.type`).
|
||||||
#[serde(rename = "type")]
|
#[serde(rename = "type")]
|
||||||
entry_type: Option<String>,
|
entry_type: Option<String>,
|
||||||
|
/// Comma-separated tags (AND semantics); matches `SearchParams.tags`.
|
||||||
|
tags: Option<String>,
|
||||||
page: Option<u32>,
|
page: Option<u32>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -252,6 +255,18 @@ fn relation_views(items: &[RelationEntrySummary]) -> Vec<RelationSummaryView> {
|
|||||||
.collect()
|
.collect()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Parse Web `tags` query: comma-separated, trim, drop empties (AND semantics via `SearchParams`).
|
||||||
|
fn parse_tags_filter(raw: Option<&str>) -> Vec<String> {
|
||||||
|
let Some(s) = raw else {
|
||||||
|
return Vec::new();
|
||||||
|
};
|
||||||
|
s.split(',')
|
||||||
|
.map(str::trim)
|
||||||
|
.filter(|t| !t.is_empty())
|
||||||
|
.map(std::string::ToString::to_string)
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
// ── Handlers ──────────────────────────────────────────────────────────────────
|
// ── Handlers ──────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
pub(super) async fn entries_page(
|
pub(super) async fn entries_page(
|
||||||
@@ -289,13 +304,15 @@ pub(super) async fn entries_page(
|
|||||||
.map(|s| s.trim())
|
.map(|s| s.trim())
|
||||||
.filter(|s| !s.is_empty())
|
.filter(|s| !s.is_empty())
|
||||||
.map(|s| s.to_string());
|
.map(|s| s.to_string());
|
||||||
|
let filter_tags = q.tags.clone().unwrap_or_default();
|
||||||
|
let tag_vec = parse_tags_filter(q.tags.as_deref());
|
||||||
let page = q.page.unwrap_or(1).max(1);
|
let page = q.page.unwrap_or(1).max(1);
|
||||||
let count_params = SearchParams {
|
let count_params = SearchParams {
|
||||||
folder: folder_filter.as_deref(),
|
folder: folder_filter.as_deref(),
|
||||||
entry_type: type_filter.as_deref(),
|
entry_type: type_filter.as_deref(),
|
||||||
name: None,
|
name: None,
|
||||||
name_query: name_filter.as_deref(),
|
name_query: name_filter.as_deref(),
|
||||||
tags: &[],
|
tags: tag_vec.as_slice(),
|
||||||
query: None,
|
query: None,
|
||||||
metadata_query: metadata_query_filter.as_deref(),
|
metadata_query: metadata_query_filter.as_deref(),
|
||||||
sort: "updated",
|
sort: "updated",
|
||||||
@@ -328,6 +345,16 @@ pub(super) async fn entries_page(
|
|||||||
));
|
));
|
||||||
bind_idx += 1;
|
bind_idx += 1;
|
||||||
}
|
}
|
||||||
|
if !tag_vec.is_empty() {
|
||||||
|
let placeholders: Vec<String> = (0..tag_vec.len())
|
||||||
|
.map(|i| format!("${}", bind_idx + i as i32))
|
||||||
|
.collect();
|
||||||
|
folder_sql.push_str(&format!(
|
||||||
|
" AND tags @> ARRAY[{}]::text[]",
|
||||||
|
placeholders.join(", ")
|
||||||
|
));
|
||||||
|
bind_idx += tag_vec.len() as i32;
|
||||||
|
}
|
||||||
let _ = bind_idx;
|
let _ = bind_idx;
|
||||||
folder_sql.push_str(" GROUP BY folder ORDER BY folder");
|
folder_sql.push_str(" GROUP BY folder ORDER BY folder");
|
||||||
let mut folder_query = sqlx::query_as::<_, FolderCountRow>(&folder_sql).bind(user_id);
|
let mut folder_query = sqlx::query_as::<_, FolderCountRow>(&folder_sql).bind(user_id);
|
||||||
@@ -340,6 +367,9 @@ pub(super) async fn entries_page(
|
|||||||
if let Some(v) = metadata_query_filter.as_deref() {
|
if let Some(v) = metadata_query_filter.as_deref() {
|
||||||
folder_query = folder_query.bind(ilike_pattern(v));
|
folder_query = folder_query.bind(ilike_pattern(v));
|
||||||
}
|
}
|
||||||
|
for t in &tag_vec {
|
||||||
|
folder_query = folder_query.bind(t);
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(sqlx::FromRow)]
|
#[derive(sqlx::FromRow)]
|
||||||
struct TypeOptionRow {
|
struct TypeOptionRow {
|
||||||
@@ -414,6 +444,7 @@ pub(super) async fn entries_page(
|
|||||||
entry_type: Option<&str>,
|
entry_type: Option<&str>,
|
||||||
name: Option<&str>,
|
name: Option<&str>,
|
||||||
metadata_query: Option<&str>,
|
metadata_query: Option<&str>,
|
||||||
|
tags: Option<&str>,
|
||||||
page: Option<u32>,
|
page: Option<u32>,
|
||||||
) -> String {
|
) -> String {
|
||||||
let mut pairs: Vec<String> = Vec::new();
|
let mut pairs: Vec<String> = Vec::new();
|
||||||
@@ -437,6 +468,11 @@ pub(super) async fn entries_page(
|
|||||||
{
|
{
|
||||||
pairs.push(format!("metadata_query={}", urlencoding::encode(v)));
|
pairs.push(format!("metadata_query={}", urlencoding::encode(v)));
|
||||||
}
|
}
|
||||||
|
if let Some(tg) = tags
|
||||||
|
&& !tg.is_empty()
|
||||||
|
{
|
||||||
|
pairs.push(format!("tags={}", urlencoding::encode(tg)));
|
||||||
|
}
|
||||||
if let Some(p) = page {
|
if let Some(p) = page {
|
||||||
pairs.push(format!("page={}", p));
|
pairs.push(format!("page={}", p));
|
||||||
}
|
}
|
||||||
@@ -447,6 +483,7 @@ pub(super) async fn entries_page(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let tags_for_href = (!filter_tags.is_empty()).then_some(filter_tags.as_str());
|
||||||
let all_count: i64 = folder_rows.iter().map(|r| r.count).sum();
|
let all_count: i64 = folder_rows.iter().map(|r| r.count).sum();
|
||||||
let mut folder_tabs: Vec<FolderTabView> = Vec::with_capacity(folder_rows.len() + 1);
|
let mut folder_tabs: Vec<FolderTabView> = Vec::with_capacity(folder_rows.len() + 1);
|
||||||
folder_tabs.push(FolderTabView {
|
folder_tabs.push(FolderTabView {
|
||||||
@@ -457,6 +494,7 @@ pub(super) async fn entries_page(
|
|||||||
type_filter.as_deref(),
|
type_filter.as_deref(),
|
||||||
name_filter.as_deref(),
|
name_filter.as_deref(),
|
||||||
metadata_query_filter.as_deref(),
|
metadata_query_filter.as_deref(),
|
||||||
|
tags_for_href,
|
||||||
Some(1),
|
Some(1),
|
||||||
),
|
),
|
||||||
active: folder_filter.is_none(),
|
active: folder_filter.is_none(),
|
||||||
@@ -469,6 +507,7 @@ pub(super) async fn entries_page(
|
|||||||
type_filter.as_deref(),
|
type_filter.as_deref(),
|
||||||
name_filter.as_deref(),
|
name_filter.as_deref(),
|
||||||
metadata_query_filter.as_deref(),
|
metadata_query_filter.as_deref(),
|
||||||
|
tags_for_href,
|
||||||
Some(1),
|
Some(1),
|
||||||
),
|
),
|
||||||
active: folder_filter.as_deref() == Some(name.as_str()),
|
active: folder_filter.as_deref() == Some(name.as_str()),
|
||||||
@@ -534,6 +573,7 @@ pub(super) async fn entries_page(
|
|||||||
filter_folder: folder_filter.unwrap_or_default(),
|
filter_folder: folder_filter.unwrap_or_default(),
|
||||||
filter_name: name_filter.unwrap_or_default(),
|
filter_name: name_filter.unwrap_or_default(),
|
||||||
filter_metadata_query: metadata_query_filter.unwrap_or_default(),
|
filter_metadata_query: metadata_query_filter.unwrap_or_default(),
|
||||||
|
filter_tags,
|
||||||
filter_type: type_filter.unwrap_or_default(),
|
filter_type: type_filter.unwrap_or_default(),
|
||||||
current_page,
|
current_page,
|
||||||
total_pages,
|
total_pages,
|
||||||
@@ -1302,3 +1342,19 @@ pub(super) async fn api_entry_secrets_decrypt(
|
|||||||
|
|
||||||
Ok(Json(json!({ "ok": true, "secrets": secrets })))
|
Ok(Json(json!({ "ok": true, "secrets": secrets })))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tags_filter_tests {
|
||||||
|
use super::parse_tags_filter;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn parse_tags_comma_trim_skip_empty() {
|
||||||
|
let v = parse_tags_filter(Some(" prod , aliyun ,, "));
|
||||||
|
assert_eq!(v, vec!["prod".to_string(), "aliyun".to_string()]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn parse_tags_none_empty() {
|
||||||
|
assert!(parse_tags_filter(None).is_empty());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -543,6 +543,10 @@
|
|||||||
<label for="filter-name" data-i18n="filterNameLabel">名称</label>
|
<label for="filter-name" data-i18n="filterNameLabel">名称</label>
|
||||||
<input id="filter-name" name="name" type="text" value="{{ filter_name }}" data-i18n-ph="filterNamePlaceholder" placeholder="输入关键字" autocomplete="off">
|
<input id="filter-name" name="name" type="text" value="{{ filter_name }}" data-i18n-ph="filterNamePlaceholder" placeholder="输入关键字" autocomplete="off">
|
||||||
</div>
|
</div>
|
||||||
|
<div class="filter-field">
|
||||||
|
<label for="filter-tags" data-i18n="filterTagsLabel">标签</label>
|
||||||
|
<input id="filter-tags" name="tags" type="text" value="{{ filter_tags }}" data-i18n-ph="filterTagsPlaceholder" placeholder="多个标签用逗号分隔" autocomplete="off">
|
||||||
|
</div>
|
||||||
<div class="filter-field">
|
<div class="filter-field">
|
||||||
<label for="filter-metadata-query" data-i18n="filterMetadataLabel">元数据值</label>
|
<label for="filter-metadata-query" data-i18n="filterMetadataLabel">元数据值</label>
|
||||||
<input id="filter-metadata-query" name="metadata_query" type="text" value="{{ filter_metadata_query }}" data-i18n-ph="filterMetadataPlaceholder" placeholder="搜索元数据值" autocomplete="off">
|
<input id="filter-metadata-query" name="metadata_query" type="text" value="{{ filter_metadata_query }}" data-i18n-ph="filterMetadataPlaceholder" placeholder="搜索元数据值" autocomplete="off">
|
||||||
@@ -643,13 +647,13 @@
|
|||||||
{% if total_count > 0 %}
|
{% if total_count > 0 %}
|
||||||
<div class="pagination">
|
<div class="pagination">
|
||||||
{% if current_page > 1 %}
|
{% if current_page > 1 %}
|
||||||
<a href="?{% if !filter_folder.is_empty() %}folder={{ filter_folder | urlencode }}&{% endif %}{% if !filter_type.is_empty() %}type={{ filter_type | urlencode }}&{% endif %}{% if !filter_name.is_empty() %}name={{ filter_name | urlencode }}&{% endif %}{% if !filter_metadata_query.is_empty() %}metadata_query={{ filter_metadata_query | urlencode }}&{% endif %}page={{ current_page - 1 }}" class="page-btn" data-i18n="prevPage">上一页</a>
|
<a href="?{% if !filter_folder.is_empty() %}folder={{ filter_folder | urlencode }}&{% endif %}{% if !filter_type.is_empty() %}type={{ filter_type | urlencode }}&{% endif %}{% if !filter_name.is_empty() %}name={{ filter_name | urlencode }}&{% endif %}{% if !filter_tags.is_empty() %}tags={{ filter_tags | urlencode }}&{% endif %}{% if !filter_metadata_query.is_empty() %}metadata_query={{ filter_metadata_query | urlencode }}&{% endif %}page={{ current_page - 1 }}" class="page-btn" data-i18n="prevPage">上一页</a>
|
||||||
{% else %}
|
{% else %}
|
||||||
<span class="page-btn page-btn-disabled" data-i18n="prevPage">上一页</span>
|
<span class="page-btn page-btn-disabled" data-i18n="prevPage">上一页</span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<span class="page-info">{{ current_page }} / {{ total_pages }}</span>
|
<span class="page-info">{{ current_page }} / {{ total_pages }}</span>
|
||||||
{% if current_page < total_pages %}
|
{% if current_page < total_pages %}
|
||||||
<a href="?{% if !filter_folder.is_empty() %}folder={{ filter_folder | urlencode }}&{% endif %}{% if !filter_type.is_empty() %}type={{ filter_type | urlencode }}&{% endif %}{% if !filter_name.is_empty() %}name={{ filter_name | urlencode }}&{% endif %}{% if !filter_metadata_query.is_empty() %}metadata_query={{ filter_metadata_query | urlencode }}&{% endif %}page={{ current_page + 1 }}" class="page-btn" data-i18n="nextPage">下一页</a>
|
<a href="?{% if !filter_folder.is_empty() %}folder={{ filter_folder | urlencode }}&{% endif %}{% if !filter_type.is_empty() %}type={{ filter_type | urlencode }}&{% endif %}{% if !filter_name.is_empty() %}name={{ filter_name | urlencode }}&{% endif %}{% if !filter_tags.is_empty() %}tags={{ filter_tags | urlencode }}&{% endif %}{% if !filter_metadata_query.is_empty() %}metadata_query={{ filter_metadata_query | urlencode }}&{% endif %}page={{ current_page + 1 }}" class="page-btn" data-i18n="nextPage">下一页</a>
|
||||||
{% else %}
|
{% else %}
|
||||||
<span class="page-btn page-btn-disabled" data-i18n="nextPage">下一页</span>
|
<span class="page-btn page-btn-disabled" data-i18n="nextPage">下一页</span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
@@ -713,6 +717,8 @@ var SECRET_TYPE_OPTIONS = JSON.parse(document.getElementById('secret-type-option
|
|||||||
allTab: '全部',
|
allTab: '全部',
|
||||||
filterNameLabel: '名称',
|
filterNameLabel: '名称',
|
||||||
filterNamePlaceholder: '输入关键字',
|
filterNamePlaceholder: '输入关键字',
|
||||||
|
filterTagsLabel: '标签',
|
||||||
|
filterTagsPlaceholder: '多个标签用逗号分隔',
|
||||||
filterMetadataLabel: '元数据值',
|
filterMetadataLabel: '元数据值',
|
||||||
filterMetadataPlaceholder: '搜索元数据值',
|
filterMetadataPlaceholder: '搜索元数据值',
|
||||||
filterTypeLabel: '类型',
|
filterTypeLabel: '类型',
|
||||||
@@ -799,6 +805,8 @@ var SECRET_TYPE_OPTIONS = JSON.parse(document.getElementById('secret-type-option
|
|||||||
allTab: '全部',
|
allTab: '全部',
|
||||||
filterNameLabel: '名稱',
|
filterNameLabel: '名稱',
|
||||||
filterNamePlaceholder: '輸入關鍵字',
|
filterNamePlaceholder: '輸入關鍵字',
|
||||||
|
filterTagsLabel: '標籤',
|
||||||
|
filterTagsPlaceholder: '多個標籤用逗號分隔',
|
||||||
filterMetadataLabel: '中繼資料值',
|
filterMetadataLabel: '中繼資料值',
|
||||||
filterMetadataPlaceholder: '搜尋中繼資料值',
|
filterMetadataPlaceholder: '搜尋中繼資料值',
|
||||||
filterTypeLabel: '類型',
|
filterTypeLabel: '類型',
|
||||||
@@ -885,6 +893,8 @@ var SECRET_TYPE_OPTIONS = JSON.parse(document.getElementById('secret-type-option
|
|||||||
allTab: 'All',
|
allTab: 'All',
|
||||||
filterNameLabel: 'Name',
|
filterNameLabel: 'Name',
|
||||||
filterNamePlaceholder: 'Enter keywords',
|
filterNamePlaceholder: 'Enter keywords',
|
||||||
|
filterTagsLabel: 'Tags',
|
||||||
|
filterTagsPlaceholder: 'Comma-separated tags',
|
||||||
filterMetadataLabel: 'Metadata value',
|
filterMetadataLabel: 'Metadata value',
|
||||||
filterMetadataPlaceholder: 'Search metadata values',
|
filterMetadataPlaceholder: 'Search metadata values',
|
||||||
filterTypeLabel: 'Type',
|
filterTypeLabel: 'Type',
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
**日期**: 2026-04-11
|
**日期**: 2026-04-11
|
||||||
**来源**: 两个 AI 实现对比评估
|
**来源**: 两个 AI 实现对比评估
|
||||||
**比较对象**:
|
**比较对象**:
|
||||||
|
|
||||||
- `d7720662` (`/Users/voson/work/refining/secrets-cr-fixes-ws`)
|
- `d7720662` (`/Users/voson/work/refining/secrets-cr-fixes-ws`)
|
||||||
- `9f8a68cd` (`/Users/voson/work/refining/secrets/plan-impl`)
|
- `9f8a68cd` (`/Users/voson/work/refining/secrets/plan-impl`)
|
||||||
|
|
||||||
@@ -10,9 +11,10 @@
|
|||||||
|
|
||||||
## 结论
|
## 结论
|
||||||
|
|
||||||
以 **`d7720662`** 为主线采纳。
|
以 `**d7720662`** 为主线采纳。
|
||||||
|
|
||||||
**原因**:
|
**原因**:
|
||||||
|
|
||||||
1. `rollback` 的 live row 加锁与 snapshot 读取都在事务内完成,更符合原计划里对 TOCTOU 的修复要求。
|
1. `rollback` 的 live row 加锁与 snapshot 读取都在事务内完成,更符合原计划里对 TOCTOU 的修复要求。
|
||||||
2. Web JSON API 的 session 校验保留了按 `UiLang` 返回错误信息的行为,没有把错误消息退化成固定英文。
|
2. Web JSON API 的 session 校验保留了按 `UiLang` 返回错误信息的行为,没有把错误消息退化成固定英文。
|
||||||
3. `svc_add` 返回 `entry_id`,MCP 层直接使用返回值建立 parent relation,和计划第 5 项更一致。
|
3. `svc_add` 返回 `entry_id`,MCP 层直接使用返回值建立 parent relation,和计划第 5 项更一致。
|
||||||
@@ -35,8 +37,7 @@
|
|||||||
仅吸收下面两处,手动改写,不直接整文件 cherry-pick:
|
仅吸收下面两处,手动改写,不直接整文件 cherry-pick:
|
||||||
|
|
||||||
1. `crates/secrets-mcp/src/web/entries.rs`
|
1. `crates/secrets-mcp/src/web/entries.rs`
|
||||||
- 把长度校验报错文案改成基于 `crate::validation::*` 常量拼接,避免上限数字硬编码在文案里。
|
- 把长度校验报错文案改成基于 `crate::validation::`* 常量拼接,避免上限数字硬编码在文案里。
|
||||||
|
|
||||||
2. `crates/secrets-core/src/service/env_map.rs`
|
2. `crates/secrets-core/src/service/env_map.rs`
|
||||||
- 补 `env_prefix_with_and_without_prefix` 单测。
|
- 补 `env_prefix_with_and_without_prefix` 单测。
|
||||||
|
|
||||||
@@ -47,18 +48,21 @@
|
|||||||
### 不采纳 `9f8a68cd` 的 `rollback.rs`
|
### 不采纳 `9f8a68cd` 的 `rollback.rs`
|
||||||
|
|
||||||
原因:
|
原因:
|
||||||
|
|
||||||
- 它仍然先在事务外读取 `entries_history`,再开启事务并锁 live row。
|
- 它仍然先在事务外读取 `entries_history`,再开启事务并锁 live row。
|
||||||
- 对“回滚到最近快照”的路径仍存在先读后锁的时间窗口。
|
- 对“回滚到最近快照”的路径仍存在先读后锁的时间窗口。
|
||||||
|
|
||||||
### 不采纳 `9f8a68cd` 的 `web/mod.rs`
|
### 不采纳 `9f8a68cd` 的 `web/mod.rs`
|
||||||
|
|
||||||
原因:
|
原因:
|
||||||
|
|
||||||
- `load_session_user_strict()` / `require_valid_user_json()` 返回固定英文 JSON 错误。
|
- `load_session_user_strict()` / `require_valid_user_json()` 返回固定英文 JSON 错误。
|
||||||
- 会丢失现有多语言错误语义。
|
- 会丢失现有多语言错误语义。
|
||||||
|
|
||||||
### 不采纳 `9f8a68cd` 的 `AddResult.id`
|
### 不采纳 `9f8a68cd` 的 `AddResult.id`
|
||||||
|
|
||||||
原因:
|
原因:
|
||||||
|
|
||||||
- 本轮计划里明确要求 `svc_add` 返回 `entry_id`。
|
- 本轮计划里明确要求 `svc_add` 返回 `entry_id`。
|
||||||
- `d7720662` 的字段命名与 MCP 使用方式更贴近计划要求。
|
- `d7720662` 的字段命名与 MCP 使用方式更贴近计划要求。
|
||||||
|
|
||||||
@@ -83,27 +87,21 @@
|
|||||||
|
|
||||||
1. export/import round-trip 测试
|
1. export/import round-trip 测试
|
||||||
- `password` / `key` / `text` 三种类型导出再导入后保持不变
|
- `password` / `key` / `text` 三种类型导出再导入后保持不变
|
||||||
|
|
||||||
2. legacy import 测试
|
2. legacy import 测试
|
||||||
- 老格式缺失 `secret_types` 时默认回落到 `text`
|
- 老格式缺失 `secret_types` 时默认回落到 `text`
|
||||||
|
|
||||||
3. env map 测试
|
3. env map 测试
|
||||||
- `db.password` vs `db_password`
|
- `db.password` vs `db_password`
|
||||||
- 带 `prefix`
|
- 带 `prefix`
|
||||||
- 多 entry 合并冲突
|
- 多 entry 合并冲突
|
||||||
|
|
||||||
4. rollback 测试
|
4. rollback 测试
|
||||||
- 恢复字段是否符合预期
|
- 恢复字段是否符合预期
|
||||||
- 并发更新 + 回滚不依赖过期值
|
- 并发更新 + 回滚不依赖过期值
|
||||||
|
|
||||||
5. `regenerate_api_key` 测试
|
5. `regenerate_api_key` 测试
|
||||||
- 正常用户返回新 key
|
- 正常用户返回新 key
|
||||||
- 不存在用户返回错误
|
- 不存在用户返回错误
|
||||||
|
|
||||||
6. MCP tool 测试
|
6. MCP tool 测试
|
||||||
- `secrets_find` count 失败路径
|
- `secrets_find` count 失败路径
|
||||||
- `secrets_rollback` 无 encryption key 也可执行
|
- `secrets_rollback` 无 encryption key 也可执行
|
||||||
|
|
||||||
7. Web session / validation 测试
|
7. Web session / validation 测试
|
||||||
- `key_version` mismatch -> `401`
|
- `key_version` mismatch -> `401`
|
||||||
- 用户不存在 / session 损坏 -> 正确错误
|
- 用户不存在 / session 损坏 -> 正确错误
|
||||||
@@ -126,13 +124,13 @@ cargo clippy --locked -- -D warnings
|
|||||||
cargo test --locked
|
cargo test --locked
|
||||||
```
|
```
|
||||||
|
|
||||||
7. 跑发布前检查:
|
1. 跑发布前检查:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
./scripts/release-check.sh
|
./scripts/release-check.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
8. 确认版本和 tag:
|
1. 确认版本和 tag:
|
||||||
- `crates/secrets-mcp/Cargo.toml` 已 bump(合并执行时为 `0.5.21`,因 `crates/**` 有变更)
|
- `crates/secrets-mcp/Cargo.toml` 已 bump(合并执行时为 `0.5.21`,因 `crates/**` 有变更)
|
||||||
- `jj tag list`
|
- `jj tag list`
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ Add a new `metadata_query` filter to `SearchParams` that uses PostgreSQL `jsonb_
|
|||||||
|
|
||||||
#### secrets-core
|
#### secrets-core
|
||||||
|
|
||||||
**`crates/secrets-core/src/service/search.rs`**
|
`**crates/secrets-core/src/service/search.rs`**
|
||||||
|
|
||||||
- Add `metadata_query: Option<&'a str>` field to `SearchParams`
|
- Add `metadata_query: Option<&'a str>` field to `SearchParams`
|
||||||
- In `entry_where_clause_and_next_idx`, when `metadata_query` is set, add:
|
- In `entry_where_clause_and_next_idx`, when `metadata_query` is set, add:
|
||||||
@@ -42,7 +42,7 @@ EXISTS (
|
|||||||
|
|
||||||
#### secrets-mcp (MCP tools)
|
#### secrets-mcp (MCP tools)
|
||||||
|
|
||||||
**`crates/secrets-mcp/src/tools.rs`**
|
`**crates/secrets-mcp/src/tools.rs**`
|
||||||
|
|
||||||
- Add `metadata_query` field to `FindInput`:
|
- Add `metadata_query` field to `FindInput`:
|
||||||
|
|
||||||
@@ -56,7 +56,7 @@ metadata_query: Option<String>,
|
|||||||
|
|
||||||
#### secrets-mcp (Web)
|
#### secrets-mcp (Web)
|
||||||
|
|
||||||
**`crates/secrets-mcp/src/web/entries.rs`**
|
`**crates/secrets-mcp/src/web/entries.rs**`
|
||||||
|
|
||||||
- Add `metadata_query: Option<String>` to `EntriesQuery`
|
- Add `metadata_query: Option<String>` to `EntriesQuery`
|
||||||
- Thread it into all `SearchParams` usages (count, list, folder counts)
|
- Thread it into all `SearchParams` usages (count, list, folder counts)
|
||||||
@@ -64,18 +64,20 @@ metadata_query: Option<String>,
|
|||||||
- Add `metadata_query` to `EntriesPageTemplate` and filter form hidden fields
|
- Add `metadata_query` to `EntriesPageTemplate` and filter form hidden fields
|
||||||
- Include `metadata_query` in pagination `href` links
|
- Include `metadata_query` in pagination `href` links
|
||||||
|
|
||||||
**`crates/secrets-mcp/templates/entries.html`**
|
`**crates/secrets-mcp/templates/entries.html**`
|
||||||
|
|
||||||
- Add a "metadata 值" text input to the filter bar (after name, before type)
|
- Add a "metadata 值" text input to the filter bar (after name, before type)
|
||||||
- Preserve value in the input on re-render
|
- Preserve value in the input on re-render
|
||||||
|
|
||||||
### i18n Keys
|
### i18n Keys
|
||||||
|
|
||||||
|
|
||||||
| Key | zh | zh-Hant | en |
|
| Key | zh | zh-Hant | en |
|
||||||
|-----|-----|---------|-----|
|
| ----------------------- | ------ | ------- | ---------------------- |
|
||||||
| `filterMetaLabel` | 元数据值 | 元数据值 | Metadata value |
|
| `filterMetaLabel` | 元数据值 | 元数据值 | Metadata value |
|
||||||
| `filterMetaPlaceholder` | 搜索元数据值 | 搜尋元資料值 | Search metadata values |
|
| `filterMetaPlaceholder` | 搜索元数据值 | 搜尋元資料值 | Search metadata values |
|
||||||
|
|
||||||
|
|
||||||
### Performance Notes
|
### Performance Notes
|
||||||
|
|
||||||
- The `jsonb_path_query` with `$.**` scans all nested values recursively; this is a sequential scan on the metadata column per row
|
- The `jsonb_path_query` with `$.**` scans all nested values recursively; this is a sequential scan on the metadata column per row
|
||||||
@@ -191,25 +193,23 @@ pub async fn get_relations_for_entries(
|
|||||||
) -> Result<HashMap<Uuid, Vec<RelationSummary>>>
|
) -> Result<HashMap<Uuid, Vec<RelationSummary>>>
|
||||||
```
|
```
|
||||||
|
|
||||||
**`crates/secrets-core/src/service/mod.rs`** — add `pub mod relations;`
|
`**crates/secrets-core/src/service/mod.rs**` — add `pub mod relations;`
|
||||||
|
|
||||||
**`crates/secrets-core/src/db.rs`** — add entry_relations table creation in `migrate()`
|
`**crates/secrets-core/src/db.rs**` — add entry_relations table creation in `migrate()`
|
||||||
|
|
||||||
**`crates/secrets-core/src/error.rs`** — no new error variant needed; use `AppError::Validation { message }` for cycle detection and permission errors
|
`**crates/secrets-core/src/error.rs**` — no new error variant needed; use `AppError::Validation { message }` for cycle detection and permission errors
|
||||||
|
|
||||||
### MCP Tool Changes
|
### MCP Tool Changes
|
||||||
|
|
||||||
**`crates/secrets-mcp/src/tools.rs`**
|
`**crates/secrets-mcp/src/tools.rs**`
|
||||||
|
|
||||||
1. **`secrets_add`** (`AddInput`): add optional `parent_ids: Option<Vec<String>>` field
|
1. `**secrets_add**` (`AddInput`): add optional `parent_ids: Option<Vec<String>>` field
|
||||||
- Description: "UUIDs of parent entries to link. Creates parent→child relations."
|
- Description: "UUIDs of parent entries to link. Creates parent→child relations."
|
||||||
- After creating the entry, call `relations::add_relation` for each parent
|
- After creating the entry, call `relations::add_relation` for each parent
|
||||||
|
2. `**secrets_update**` (`UpdateInput`): add two fields:
|
||||||
2. **`secrets_update`** (`UpdateInput`): add two fields:
|
|
||||||
- `add_parent_ids: Option<Vec<String>>` — "UUIDs of parent entries to link"
|
- `add_parent_ids: Option<Vec<String>>` — "UUIDs of parent entries to link"
|
||||||
- `remove_parent_ids: Option<Vec<String>>` — "UUIDs of parent entries to unlink"
|
- `remove_parent_ids: Option<Vec<String>>` — "UUIDs of parent entries to unlink"
|
||||||
|
3. `**secrets_find**` and `secrets_search` output: add `parents` and `children` arrays to each entry result:
|
||||||
3. **`secrets_find`** and `secrets_search` output: add `parents` and `children` arrays to each entry result:
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"id": "...",
|
"id": "...",
|
||||||
@@ -222,27 +222,22 @@ pub async fn get_relations_for_entries(
|
|||||||
|
|
||||||
### Web Changes
|
### Web Changes
|
||||||
|
|
||||||
**`crates/secrets-mcp/src/web/entries.rs`**
|
`**crates/secrets-mcp/src/web/entries.rs**`
|
||||||
|
|
||||||
1. **New API endpoints:**
|
1. **New API endpoints:**
|
||||||
|
|
||||||
- `POST /api/entries/{id}/relations` — add parent relation
|
- `POST /api/entries/{id}/relations` — add parent relation
|
||||||
- Body: `{ "parent_id": "uuid" }`
|
- Body: `{ "parent_id": "uuid" }`
|
||||||
- Validates same-user ownership and cycle detection
|
- Validates same-user ownership and cycle detection
|
||||||
|
|
||||||
- `DELETE /api/entries/{id}/relations/{parent_id}` — remove parent relation
|
- `DELETE /api/entries/{id}/relations/{parent_id}` — remove parent relation
|
||||||
|
|
||||||
- `GET /api/entries/options?q=xxx` — lightweight search for parent selection modal
|
- `GET /api/entries/options?q=xxx` — lightweight search for parent selection modal
|
||||||
- Returns `[{ "id": "...", "name": "...", "folder": "...", "type": "..." }]`
|
- Returns `[{ "id": "...", "name": "...", "folder": "...", "type": "..." }]`
|
||||||
- Used by the edit dialog's parent selection autocomplete
|
- Used by the edit dialog's parent selection autocomplete
|
||||||
|
|
||||||
2. **Entry list template data** — include parent/child counts per entry row
|
2. **Entry list template data** — include parent/child counts per entry row
|
||||||
|
3. `**api_entry_patch`** — extend `EntryPatchBody` with optional `parent_ids: Option<Vec<Uuid>>`
|
||||||
3. **`api_entry_patch`** — extend `EntryPatchBody` with optional `parent_ids: Option<Vec<Uuid>>`
|
|
||||||
- When present, replace all parent relations for this entry with the given list
|
- When present, replace all parent relations for this entry with the given list
|
||||||
- This is simpler than incremental add/remove in the Web UI context
|
- This is simpler than incremental add/remove in the Web UI context
|
||||||
|
|
||||||
**`crates/secrets-mcp/templates/entries.html`**
|
`**crates/secrets-mcp/templates/entries.html**`
|
||||||
|
|
||||||
1. **List table**: add a "关联" (relations) column showing parent/child counts as clickable chips
|
1. **List table**: add a "关联" (relations) column showing parent/child counts as clickable chips
|
||||||
2. **Edit dialog**: add "上级条目" (parent entries) section
|
2. **Edit dialog**: add "上级条目" (parent entries) section
|
||||||
@@ -255,8 +250,9 @@ pub async fn get_relations_for_entries(
|
|||||||
|
|
||||||
### i18n Keys (Entry Relations)
|
### i18n Keys (Entry Relations)
|
||||||
|
|
||||||
|
|
||||||
| Key | zh | zh-Hant | en |
|
| Key | zh | zh-Hant | en |
|
||||||
|-----|-----|---------|-----|
|
| -------------------------- | ------------ | ------------ | -------------------------------- |
|
||||||
| `colRelations` | 关联 | 關聯 | Relations |
|
| `colRelations` | 关联 | 關聯 | Relations |
|
||||||
| `parentEntriesLabel` | 上级条目 | 上級條目 | Parent entries |
|
| `parentEntriesLabel` | 上级条目 | 上級條目 | Parent entries |
|
||||||
| `childrenEntriesLabel` | 下级条目 | 下級條目 | Child entries |
|
| `childrenEntriesLabel` | 下级条目 | 下級條目 | Child entries |
|
||||||
@@ -267,6 +263,7 @@ pub async fn get_relations_for_entries(
|
|||||||
| `noChildren` | 无下级 | 無下級 | No children |
|
| `noChildren` | 无下级 | 無下級 | No children |
|
||||||
| `relationCycleError` | 无法添加:会形成循环引用 | 無法新增:會形成循環引用 | Cannot add: would create a cycle |
|
| `relationCycleError` | 无法添加:会形成循环引用 | 無法新增:會形成循環引用 | Cannot add: would create a cycle |
|
||||||
|
|
||||||
|
|
||||||
### Audit Logging
|
### Audit Logging
|
||||||
|
|
||||||
Log relation changes in the existing `audit::log_tx` system:
|
Log relation changes in the existing `audit::log_tx` system:
|
||||||
@@ -276,7 +273,7 @@ Log relation changes in the existing `audit::log_tx` system:
|
|||||||
|
|
||||||
### Export / Import
|
### Export / Import
|
||||||
|
|
||||||
**`ExportEntry`** — add optional `parents: Vec<ParentRef>` where:
|
`**ExportEntry`** — add optional `parents: Vec<ParentRef>` where:
|
||||||
|
|
||||||
```rust
|
```rust
|
||||||
pub struct ParentRef {
|
pub struct ParentRef {
|
||||||
@@ -368,25 +365,28 @@ This is idempotent (uses `IF NOT EXISTS`) and will run automatically on next sta
|
|||||||
## Testing Checklist
|
## Testing Checklist
|
||||||
|
|
||||||
### Metadata Search
|
### Metadata Search
|
||||||
- [ ] `metadata_query=1.2.3.4` matches entries where any metadata value contains "1.2.3.4"
|
|
||||||
- [ ] `metadata_query=1.2.3.4` does NOT match entries where only the key contains "1.2.3.4"
|
- `metadata_query=1.2.3.4` matches entries where any metadata value contains "1.2.3.4"
|
||||||
- [ ] `metadata_query` works with nested metadata (e.g. `{"server": {"ip": "1.2.3.4"}}`)
|
- `metadata_query=1.2.3.4` does NOT match entries where only the key contains "1.2.3.4"
|
||||||
- [ ] `metadata_query` combined with `folder`/`type`/`tags` filters works correctly
|
- `metadata_query` works with nested metadata (e.g. `{"server": {"ip": "1.2.3.4"}}`)
|
||||||
- [ ] `metadata_query` with special characters (`%`, `_`) is properly escaped
|
- `metadata_query` combined with `folder`/`type`/`tags` filters works correctly
|
||||||
- [ ] Existing `query` parameter behavior is unchanged
|
- `metadata_query` with special characters (`%`, `_`) is properly escaped
|
||||||
- [ ] Web filter bar preserves `metadata_query` across pagination and folder tab clicks
|
- Existing `query` parameter behavior is unchanged
|
||||||
|
- Web filter bar preserves `metadata_query` across pagination and folder tab clicks
|
||||||
|
|
||||||
### Entry Relations
|
### Entry Relations
|
||||||
- [ ] Can add a parent→child relation between two entries
|
|
||||||
- [ ] Can add multiple parents to a single entry
|
- Can add a parent→child relation between two entries
|
||||||
- [ ] Cannot add self-referencing relation (CHECK constraint)
|
- Can add multiple parents to a single entry
|
||||||
- [ ] Cannot create a direct cycle (A→B→A)
|
- Cannot add self-referencing relation (CHECK constraint)
|
||||||
- [ ] Cannot create an indirect cycle (A→B→C→A)
|
- Cannot create a direct cycle (A→B→A)
|
||||||
- [ ] Cannot link entries from different users
|
- Cannot create an indirect cycle (A→B→C→A)
|
||||||
- [ ] Deleting an entry removes all its relation edges but leaves related entries intact
|
- Cannot link entries from different users
|
||||||
- [ ] MCP `secrets_add` with `parent_ids` creates relations
|
- Deleting an entry removes all its relation edges but leaves related entries intact
|
||||||
- [ ] MCP `secrets_update` with `add_parent_ids`/`remove_parent_ids` modifies relations
|
- MCP `secrets_add` with `parent_ids` creates relations
|
||||||
- [ ] MCP `secrets_find`/`secrets_search` output includes `parents` and `children`
|
- MCP `secrets_update` with `add_parent_ids`/`remove_parent_ids` modifies relations
|
||||||
- [ ] Web entry list shows relation counts
|
- MCP `secrets_find`/`secrets_search` output includes `parents` and `children`
|
||||||
- [ ] Web edit dialog allows adding/removing parents
|
- Web entry list shows relation counts
|
||||||
- [ ] Web entry view shows children with navigation links
|
- Web edit dialog allows adding/removing parents
|
||||||
|
- Web entry view shows children with navigation links
|
||||||
|
|
||||||
|
|||||||
@@ -20,6 +20,7 @@
|
|||||||
### 2. 查看密文弹窗 — 增加管理功能
|
### 2. 查看密文弹窗 — 增加管理功能
|
||||||
|
|
||||||
在每个解密字段行中增加:
|
在每个解密字段行中增加:
|
||||||
|
|
||||||
- **重命名输入框**(inline edit,带 debounce 校验)
|
- **重命名输入框**(inline edit,带 debounce 校验)
|
||||||
- **类型下拉选择**
|
- **类型下拉选择**
|
||||||
- **解绑按钮**
|
- **解绑按钮**
|
||||||
|
|||||||
178
plans/web-tags-filter.md
Normal file
178
plans/web-tags-filter.md
Normal file
@@ -0,0 +1,178 @@
|
|||||||
|
# Web 条目页 tags 筛选计划
|
||||||
|
|
||||||
|
## 目标
|
||||||
|
|
||||||
|
在 Web `/entries` 页面补齐 `tags` 筛选能力,使现有 `tags` 字段在 Web、MCP、数据层三者之间保持一致。
|
||||||
|
|
||||||
|
本次只做最小实现:支持用户在 Web 上输入 tags 条件并筛选条目,不改动数据库结构,不新增 MCP tool 参数,不改动条目编辑语义。
|
||||||
|
|
||||||
|
## 当前状态
|
||||||
|
|
||||||
|
- 数据层已支持 `tags` 过滤:`crates/secrets-core/src/service/search.rs`
|
||||||
|
- MCP 已支持 `tags` 参数:`crates/secrets-mcp/src/tools.rs`
|
||||||
|
- Web `/entries` 仅展示 tags 列与编辑字段,没有筛选入口:
|
||||||
|
- 查询参数缺少 `tags`:`crates/secrets-mcp/src/web/entries.rs`
|
||||||
|
- 模板筛选栏缺少 tags 输入:`crates/secrets-mcp/templates/entries.html`
|
||||||
|
- Web 查询当前固定传 `tags: &[]`
|
||||||
|
|
||||||
|
## 范围
|
||||||
|
|
||||||
|
### 包含
|
||||||
|
|
||||||
|
- `/entries` 页面增加 tags 筛选输入
|
||||||
|
- 后端将 tags 解析并传入 `SearchParams`
|
||||||
|
- 分页、folder tabs、筛选重置后的 URL 状态保持一致
|
||||||
|
- i18n 文案补齐
|
||||||
|
|
||||||
|
### 不包含
|
||||||
|
|
||||||
|
- MCP 工具改造
|
||||||
|
- 数据库迁移或索引变更
|
||||||
|
- `/trash` 页面筛选增强
|
||||||
|
- 新增 tags 自动补全、标签选择器、标签管理页
|
||||||
|
|
||||||
|
## 交互定义
|
||||||
|
|
||||||
|
### 输入方式
|
||||||
|
|
||||||
|
- 在 `/entries` 筛选栏增加一个 `tags` 文本输入框
|
||||||
|
- 输入格式采用逗号分隔,例如:`prod, aliyun`
|
||||||
|
- 服务端按逗号拆分、`trim`、去掉空字符串
|
||||||
|
|
||||||
|
### 匹配语义
|
||||||
|
|
||||||
|
- 继续复用现有搜索层语义:`tags @> ARRAY[...]::text[]`
|
||||||
|
- 即:用户输入多个 tags 时,要求条目同时包含这些 tags(AND 语义)
|
||||||
|
|
||||||
|
### 状态保持
|
||||||
|
|
||||||
|
- 筛选提交后,输入框保留原值
|
||||||
|
- 分页上一页/下一页链接保留 `tags`
|
||||||
|
- folder tabs 切换时保留 `tags`
|
||||||
|
- `重置` 仍回到 `/entries`,清空所有筛选条件
|
||||||
|
|
||||||
|
## 实施步骤
|
||||||
|
|
||||||
|
### 1. 扩展 Web 查询参数与模板上下文
|
||||||
|
|
||||||
|
文件:`crates/secrets-mcp/src/web/entries.rs`
|
||||||
|
|
||||||
|
- 在 `EntriesQuery` 中增加 `tags: Option<String>`
|
||||||
|
- 在 `EntriesPageTemplate` 中增加 `filter_tags: String`
|
||||||
|
- 在 `entries_page` 中读取原始 tags 字符串,用于模板回填
|
||||||
|
- 将原始字符串解析为 `Vec<String>`,供 `SearchParams.tags` 使用
|
||||||
|
|
||||||
|
建议新增一个局部辅助函数,职责仅限于:
|
||||||
|
|
||||||
|
- 接收 `Option<&str>`
|
||||||
|
- 按逗号分割
|
||||||
|
- `trim`
|
||||||
|
- 过滤空值
|
||||||
|
- 返回 `Vec<String>`
|
||||||
|
|
||||||
|
保持逻辑局部化,避免把 tags 解析散落到多个位置。
|
||||||
|
|
||||||
|
### 2. 将 tags 传入条目查询与计数
|
||||||
|
|
||||||
|
文件:`crates/secrets-mcp/src/web/entries.rs`
|
||||||
|
|
||||||
|
- 更新 `count_params`,不再使用 `tags: &[]`
|
||||||
|
- 更新 `list_params`,复用相同 tags 切片
|
||||||
|
- 确保总数统计、分页列表与实际筛选条件一致
|
||||||
|
|
||||||
|
## 3. 让 folder tabs 计数遵循相同 tags 条件
|
||||||
|
|
||||||
|
文件:`crates/secrets-mcp/src/web/entries.rs`
|
||||||
|
|
||||||
|
当前 folder tabs 使用手写 SQL 统计各 folder 数量,需要同步加入 tags 条件,否则会出现:
|
||||||
|
|
||||||
|
- 列表已按 tags 过滤
|
||||||
|
- 但 folder tab 数量仍是未过滤结果
|
||||||
|
|
||||||
|
实现方式:
|
||||||
|
|
||||||
|
- 在构建 `folder_sql` 时,当 tags 非空,追加 `tags @> ARRAY[...]::text[]`
|
||||||
|
- 对应补齐 bind 参数
|
||||||
|
- 保持与 `SearchParams` 的过滤语义完全一致
|
||||||
|
|
||||||
|
## 4. 让 URL 生成函数保留 tags
|
||||||
|
|
||||||
|
文件:`crates/secrets-mcp/src/web/entries.rs`
|
||||||
|
|
||||||
|
- 扩展 `entries_href(...)` 参数,加入 `tags: Option<&str>`
|
||||||
|
- 在 folder tabs 链接中传入当前 tags
|
||||||
|
- 在需要保留筛选状态的地方一并传递 tags
|
||||||
|
|
||||||
|
## 5. 更新模板筛选栏与分页链接
|
||||||
|
|
||||||
|
文件:`crates/secrets-mcp/templates/entries.html`
|
||||||
|
|
||||||
|
- 在筛选表单中新增 tags 输入框
|
||||||
|
- 输入框 value 绑定 `filter_tags`
|
||||||
|
- 为 tags 输入框增加 i18n label / placeholder
|
||||||
|
- 分页链接 `上一页/下一页` 补充 `tags` query 参数
|
||||||
|
|
||||||
|
建议放置位置:名称与元数据值之间或元数据值与类型之间,保持现有筛选栏布局最小改动。
|
||||||
|
|
||||||
|
## 6. 补齐前端文案
|
||||||
|
|
||||||
|
文件:`crates/secrets-mcp/templates/entries.html`
|
||||||
|
|
||||||
|
新增 i18n key:
|
||||||
|
|
||||||
|
- `filterTagsLabel`
|
||||||
|
- `filterTagsPlaceholder`
|
||||||
|
|
||||||
|
建议文案:
|
||||||
|
|
||||||
|
- zh-CN: `标签` / `多个标签用逗号分隔`
|
||||||
|
- zh-Hant: `標籤` / `多個標籤用逗號分隔`
|
||||||
|
- en: `Tags` / `Comma-separated tags`
|
||||||
|
|
||||||
|
## 验收标准
|
||||||
|
|
||||||
|
### 功能验收
|
||||||
|
|
||||||
|
- 访问 `/entries?tags=prod` 时,只返回包含 `prod` 的条目
|
||||||
|
- 访问 `/entries?tags=prod,aliyun` 时,只返回同时包含 `prod` 与 `aliyun` 的条目
|
||||||
|
- tags 两侧空格不影响结果,例如 `prod, aliyun`
|
||||||
|
- 空字符串、重复逗号不会报错,例如 `prod,,aliyun`
|
||||||
|
- 分页后 `tags` 不丢失
|
||||||
|
- 切换 folder tab 后 `tags` 不丢失
|
||||||
|
- 重置后清空 `tags`
|
||||||
|
|
||||||
|
### 一致性验收
|
||||||
|
|
||||||
|
- 页面总数、列表内容、folder tab 数量使用同一组 tags 条件
|
||||||
|
- Web 语义与 MCP / `SearchParams` 语义一致,均为 AND 匹配
|
||||||
|
|
||||||
|
## 风险与注意点
|
||||||
|
|
||||||
|
- folder tabs 计数 SQL 是手写的,最容易漏掉 tags 绑定顺序
|
||||||
|
- `list_params` 基于 `count_params` 结构展开,注意借用生命周期不要引入临时值悬垂
|
||||||
|
- 分页链接和 `entries_href` 若漏传 `tags`,用户会感觉筛选“偶尔失效”
|
||||||
|
- 现阶段不做 tags 规范化;输入 `Prod` 与存储 `prod` 是否匹配,取决于数组元素本身是否完全一致
|
||||||
|
|
||||||
|
## 可选后续
|
||||||
|
|
||||||
|
如果上线后确认 `tags` 仍被频繁使用,可以继续做:
|
||||||
|
|
||||||
|
1. tags chip UI,而不是纯文本输入
|
||||||
|
2. 常用 tags 自动补全
|
||||||
|
3. 在 Web 过滤栏里明确提示“多个标签为同时匹配”
|
||||||
|
4. 评估是否需要大小写规范化策略
|
||||||
|
|
||||||
|
## 验证建议
|
||||||
|
|
||||||
|
实现后至少执行:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cargo fmt -- --check
|
||||||
|
cargo test --locked
|
||||||
|
```
|
||||||
|
|
||||||
|
如果本次提交涉及 `crates/**`,按仓库规则在提交前再执行:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
./scripts/release-check.sh
|
||||||
|
```
|
||||||
Reference in New Issue
Block a user