@@ -76,6 +76,22 @@
|
||||
> `0.1.12`),由 `scripts/version.py` 从 git **算出来**;开发交付的独立说明写入本文件“开发快照”章节,并打 `snapshot/vX.Y.Z` 注释标签 ⇒ 每次开发交付均可追溯,
|
||||
> 但"发布版本"仍然只能由人定(CI 不会自动升版本、不会打 tag)。
|
||||
|
||||
## 开发快照 snapshot/v0.1.31 - 2026-10-18
|
||||
|
||||
### Added
|
||||
|
||||
- 区域配置支持新增、改名业务区域;稳定区域 ID 与部门映射同版本保存,改名不丢失归属。部门按一级、二级、三级及更深层级展示,支持层级/完整路径筛选、多选及批量归属。
|
||||
- 勾选、批量应用、预览和保存分离;取消本次勾选不删除既有映射,批量配置父部门不清除未选子部门的显式规则。预览核对去重人数,保存后独立读取并校验配置版本。
|
||||
|
||||
### Changed
|
||||
|
||||
- 新增治理库迁移 51,为历史区域修订补齐原四区目录;业务目录与映射原子留档,跨页问答、看板、使用统计、个人月明细和周报共用同一版本及名称。旧请求未传目录时沿用当前目录,不恢复固定四区白名单。
|
||||
- 迁移回退发现自定义区域历史时拒绝丢失目录;应用回退可保留加列迁移。统计人数不升级为在职或绩效分母,不改钉钉组织、DobotAI 原始数据及旧 Excel 流程。
|
||||
|
||||
### Security
|
||||
|
||||
- 配置请求拒绝缺失版本、重复 JSON 字段及嵌套 null;区域目录校验稳定 ID、重名及保留键,名称按文本展示,自定义名称不读取原型属性。保留管理员同源写入、租户隔离和双版本冲突保护。
|
||||
|
||||
## 开发快照 snapshot/v0.1.30 - 2026-10-18
|
||||
|
||||
### Changed
|
||||
|
||||
+2
-2
@@ -69,7 +69,7 @@
|
||||
"operationId": "previewQAOrganizationRegions",
|
||||
"summary": "预览当前通讯录版本下的父子部门区域归属和去重人数,不保存修改",
|
||||
"parameters": [{"name":"X-Governance-Action","in":"header","required":true,"schema":{"const":"qa-organization"}}],
|
||||
"requestBody": {"required":true,"content":{"application/json":{"schema":{"type":"object","additionalProperties":false,"required":["directory_id","base_revision","rules"],"properties":{"directory_id":{"type":"string"},"base_revision":{"type":"string"},"rules":{"type":"array","items":{"type":"object","additionalProperties":false,"required":["department_id","region"],"properties":{"department_id":{"type":"string"},"region":{"enum":["国内工业","APAC","EMEA","America"]}}}}}}}}},
|
||||
"requestBody": {"required":true,"content":{"application/json":{"schema":{"type":"object","additionalProperties":false,"required":["directory_id","base_revision","rules"],"properties":{"directory_id":{"type":"string"},"base_revision":{"type":"string"},"regions":{"type":"array","maxItems":100,"description":"可选业务区域目录;缺省沿用当前目录,空数组表示无区域;ID稳定不随名称改动。与rules同一版本原子预览/保存。","items":{"type":"object","additionalProperties":false,"required":["id","name"],"properties":{"id":{"type":"string","minLength":1,"maxLength":256},"name":{"type":"string","minLength":1,"maxLength":256}}}},"rules":{"type":"array","items":{"type":"object","additionalProperties":false,"required":["department_id","region"],"properties":{"department_id":{"type":"string"},"region":{"type":"string","description":"目录中稳定的区域ID,不是固定四区枚举"}}}}}}}}},
|
||||
"responses": {
|
||||
"200": {"$ref": "#/components/responses/Envelope"},
|
||||
"400": {"$ref": "#/components/responses/BadRequest"},
|
||||
@@ -99,7 +99,7 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/v1/qa-ops/usage/people": {"post": {"tags": ["QA operations"], "operationId": "queryQAOperationsMonthlyPeople", "summary": "按北京时间自然月列出当前名册人员的2.0用量(含零记录),仅管理员,不返回原始员工标识,不作为在职/考核名单", "responses": {"200": {"$ref": "#/components/responses/Envelope"}, "400": {"$ref": "#/components/responses/BadRequest"}, "401": {"description": "需要登录"}, "403": {"description": "仅管理员访问"}, "503": {"description": "独立只读源或治理组织存储不可用,不返回伪造的零值"}, "500": {"$ref": "#/components/responses/InternalError"}, "409": {"description": "完整名册缺失或目录/区域版本变化,请同步/重新查询,不返回伪零"}}, "description": "只读查询,不写治理库或生产库;姓名筛选置于 JSON 请求体,不进入 URL;整名册指标不随人员筛选变化。第2页起须带首页目录、区域版本及 end 截止。", "requestBody": {"required": true, "content": {"application/json": {"schema": {"type": "object", "additionalProperties": false, "required": ["month"], "properties": {"month": {"type": "string", "pattern": "^(?!0000)[0-9]{4}-(0[1-9]|1[0-2])$"}, "cutoff": {"type": "string", "format": "date-time"}, "region": {"type": "string", "enum": ["国内工业", "APAC", "EMEA", "America", "unassigned", "cross_region"]}, "department_id": {"type": "string"}, "activity": {"type": "string", "enum": ["all", "used", "zero"]}, "search": {"type": "string", "maxLength": 100}, "page": {"type": "integer", "minimum": 1, "maximum": 100000, "default": 1}, "limit": {"type": "integer", "minimum": 1, "maximum": 100, "default": 30}, "directory_id": {"type": "string"}, "revision_id": {"type": "string"}}}}}}, "parameters": [{"name": "X-Governance-Action", "in": "header", "required": true, "schema": {"type": "string", "enum": ["qa-usage-read"]}}]}},
|
||||
"/api/v1/qa-ops/usage/people": {"post": {"tags": ["QA operations"], "operationId": "queryQAOperationsMonthlyPeople", "summary": "按北京时间自然月列出当前名册人员的2.0用量(含零记录),仅管理员,不返回原始员工标识,不作为在职/考核名单", "responses": {"200": {"$ref": "#/components/responses/Envelope"}, "400": {"$ref": "#/components/responses/BadRequest"}, "401": {"description": "需要登录"}, "403": {"description": "仅管理员访问"}, "503": {"description": "独立只读源或治理组织存储不可用,不返回伪造的零值"}, "500": {"$ref": "#/components/responses/InternalError"}, "409": {"description": "完整名册缺失或目录/区域版本变化,请同步/重新查询,不返回伪零"}}, "description": "只读查询,不写治理库或生产库;姓名筛选置于 JSON 请求体,不进入 URL;整名册指标不随人员筛选变化。第2页起须带首页目录、区域版本及 end 截止。", "requestBody": {"required": true, "content": {"application/json": {"schema": {"type": "object", "additionalProperties": false, "required": ["month"], "properties": {"month": {"type": "string", "pattern": "^(?!0000)[0-9]{4}-(0[1-9]|1[0-2])$"}, "cutoff": {"type": "string", "format": "date-time"}, "region": {"type": "string", "description": "当前组织版本中的区域显示名称,或unassigned/cross_region;无效名称拒绝查询"}, "department_id": {"type": "string"}, "activity": {"type": "string", "enum": ["all", "used", "zero"]}, "search": {"type": "string", "maxLength": 100}, "page": {"type": "integer", "minimum": 1, "maximum": 100000, "default": 1}, "limit": {"type": "integer", "minimum": 1, "maximum": 100, "default": 30}, "directory_id": {"type": "string"}, "revision_id": {"type": "string"}}}}}}, "parameters": [{"name": "X-Governance-Action", "in": "header", "required": true, "schema": {"type": "string", "enum": ["qa-usage-read"]}}]}},
|
||||
"/api/v1/qa-ops/usage": {"get": {"tags": ["QA operations"], "operationId": "getQAOperationsUsage", "summary": "完整筛选范围内按当前通讯录和区域版本回看2.0问答使用;固定租户、管理员访问,不输出绩效结论", "parameters": [{"name": "start", "in": "query", "required": true, "schema": {"type": "string", "format": "date-time"}}, {"name": "end", "in": "query", "required": true, "schema": {"type": "string", "format": "date-time"}}, {"name": "keyword", "in": "query", "schema": {"type": "string", "maxLength": 200}}], "responses": {"200": {"$ref": "#/components/responses/Envelope"}, "400": {"$ref": "#/components/responses/BadRequest"}, "401": {"description": "需要登录"}, "403": {"description": "仅管理员访问"}, "503": {"description": "独立只读源或治理组织存储不可用,不返回伪造的零值"}, "500": {"$ref": "#/components/responses/InternalError"}}}},
|
||||
"/api/v1/qa-ops/quality/query": {"post": {"operationId": "queryQAQualityCounts", "summary": "按完整筛选范围读取指纹/规则元数据并留档统计,最多5000条;summary.rates 返回 quality-rates-human-first-v1、原始分子/分母、百分比与分母构成。覆盖率=covered/(covered+uncovered+partial),正确率=covered_correct/(covered_correct+covered_incorrect);失效/不计入/相应待确认与未评估排除,零分母percent=null。原文仅在读取问答/复核时采集", "parameters": [{"name": "X-Governance-Action", "in": "header", "required": true, "schema": {"type": "string", "enum": ["qa-quality"]}}], "requestBody": {"required": true, "content": {"application/json": {"schema": {"type": "object", "additionalProperties": false, "properties": {"start": {"type": "string", "format": "date-time"}, "end": {"type": "string", "format": "date-time"}, "keyword": {"type": "string", "maxLength": 200}}, "required": ["start", "end"]}}}}, "tags": ["QA operations"], "responses": {"200": {"$ref": "#/components/responses/Envelope"}, "400": {"$ref": "#/components/responses/BadRequest"}, "401": {"description": "需要登录"}, "403": {"description": "仅管理员访问"}, "503": {"description": "独立只读源或治理组织存储不可用,不返回伪造的零值"}, "500": {"$ref": "#/components/responses/InternalError"}, "409": {"description": "输入或复核版本变化/重复操作载荷不一致,未覆盖原结论"}, "404": {"description": "当前授权范围内未找到记录/历史输入"}}}},
|
||||
"/api/v1/qa-ops/records/{id}/reviews": {"post": {"operationId": "saveQAQualityReview", "summary": "治理库追加人工复核,登录身份审计,源端只读,输入/复核乐观锁和nonce幂等;正确时根因为空,不计入须说明原因", "parameters": [{"name": "id", "in": "path", "required": true, "schema": {"type": "string"}}, {"name": "X-Governance-Action", "in": "header", "required": true, "schema": {"type": "string", "enum": ["qa-quality"]}}], "requestBody": {"required": true, "content": {"application/json": {"schema": {"type": "object", "additionalProperties": false, "properties": {"input_hash": {"type": "string", "pattern": "^[a-f0-9]{64}$"}, "input_epoch": {"type": "integer", "minimum": 1}, "base_revision": {"type": "integer", "minimum": 0}, "nonce": {"type": "string", "pattern": "^[A-Za-z0-9_-]{16,128}$"}, "fields": {"type": "object", "additionalProperties": false, "properties": {"coverage": {"type": "string", "enum": ["covered", "uncovered", "partial", "pending", "excluded"]}, "correctness": {"type": "string", "enum": ["correct", "incorrect", "pending"]}, "product_category": {"type": "string", "maxLength": 128}, "problem_type": {"type": "string", "maxLength": 128}, "root_cause": {"type": "string", "maxLength": 2000}, "exclusion_reason": {"type": "string", "maxLength": 2000}}, "required": ["coverage", "correctness"]}, "reason": {"type": "string", "minLength": 1, "maxLength": 4000}}, "required": ["input_hash", "input_epoch", "base_revision", "nonce", "fields", "reason"]}}}}, "tags": ["QA operations"], "responses": {"200": {"$ref": "#/components/responses/Envelope"}, "400": {"$ref": "#/components/responses/BadRequest"}, "401": {"description": "需要登录"}, "403": {"description": "仅管理员访问"}, "503": {"description": "独立只读源或治理组织存储不可用,不返回伪造的零值"}, "500": {"$ref": "#/components/responses/InternalError"}, "409": {"description": "输入或复核版本变化/重复操作载荷不一致,未覆盖原结论"}, "404": {"description": "当前授权范围内未找到记录/历史输入"}}}},
|
||||
|
||||
@@ -13,6 +13,7 @@ type ActorIdentity struct {
|
||||
UnionID string `json:"union_id"`
|
||||
}
|
||||
type OrganizationVersion struct {
|
||||
RegionNames []string `json:"region_names"`
|
||||
State string `json:"state"`
|
||||
DirectoryID string `json:"directory_id"`
|
||||
DirectorySource string `json:"directory_source"`
|
||||
|
||||
@@ -31,7 +31,7 @@ func recordAttribution(ctx context.Context, config Config) (*qaopsorg.Attributio
|
||||
return p, nil
|
||||
}
|
||||
func attributionVersion(p *qaopsorg.Attribution) dobotaiops.OrganizationVersion {
|
||||
return dobotaiops.OrganizationVersion{State: p.Metadata.State, DirectoryID: p.Metadata.DirectoryID, DirectorySource: p.Metadata.DirectorySource, SyncedAt: p.Metadata.DirectorySyncedAt, RevisionID: p.Metadata.RevisionID, Basis: "current_directory"}
|
||||
return dobotaiops.OrganizationVersion{State: p.Metadata.State, DirectoryID: p.Metadata.DirectoryID, DirectorySource: p.Metadata.DirectorySource, SyncedAt: p.Metadata.DirectorySyncedAt, RevisionID: p.Metadata.RevisionID, Basis: "current_directory", RegionNames: p.Metadata.RegionLabels()}
|
||||
}
|
||||
func enrichQARecord(item *dobotaiops.Record, p *qaopsorg.Attribution) {
|
||||
person := p.Resolve(item.Identity.StaffID, item.Identity.UnionID)
|
||||
@@ -92,7 +92,7 @@ type qaUsage struct {
|
||||
|
||||
func summarizeQAUsage(groups dobotaiops.UsageGroups, p *qaopsorg.Attribution, query dobotaiops.RecordQuery) qaUsage {
|
||||
result := qaUsage{Organization: attributionVersion(p), AsOf: groups.AsOf, Start: query.Window.Start, End: query.Window.End, Keyword: query.Keyword, Rows: []qaUsageRow{}}
|
||||
keys := append(append([]string{}, qaopsorg.RegionNames...), "unassigned", "cross_region", "unmatched", "identity_conflict", "no_identity", "directory_missing")
|
||||
keys := append(append([]string{}, p.Metadata.RegionLabels()...), "unassigned", "cross_region", "unmatched", "identity_conflict", "no_identity", "directory_missing")
|
||||
rows := map[string]*qaUsageRow{}
|
||||
members := map[string]map[string]bool{}
|
||||
all := map[string]bool{}
|
||||
@@ -108,7 +108,12 @@ func summarizeQAUsage(groups dobotaiops.UsageGroups, p *qaopsorg.Attribution, qu
|
||||
n = p.Metadata.View.ConflictingPeople
|
||||
default:
|
||||
var ok bool
|
||||
n, ok = p.Metadata.View.Regions[key]
|
||||
for _, region := range p.Metadata.RegionDefinitions() {
|
||||
if region.Name == key {
|
||||
n, ok = p.Metadata.View.Regions[region.ID]
|
||||
break
|
||||
}
|
||||
}
|
||||
valid = ok
|
||||
}
|
||||
if valid {
|
||||
|
||||
@@ -97,11 +97,7 @@ func parseMonthlyFilter(values url.Values, now time.Time) (monthlyFilter, error)
|
||||
if f.Activity != "all" && f.Activity != "used" && f.Activity != "zero" {
|
||||
return f, dobotaiops.ErrInvalidQuery
|
||||
}
|
||||
validRegion := f.Region == "" || f.Region == "unassigned" || f.Region == "cross_region"
|
||||
for _, r := range qaopsorg.RegionNames {
|
||||
validRegion = validRegion || f.Region == r
|
||||
}
|
||||
if !validRegion {
|
||||
if !utf8.ValidString(f.Region) || len(f.Region) > 256 || strings.TrimSpace(f.Region) != f.Region || strings.ContainsAny(f.Region, "\x00\r\n") {
|
||||
return f, dobotaiops.ErrInvalidQuery
|
||||
}
|
||||
if !utf8.ValidString(f.Search) || utf8.RuneCountInString(f.Search) > 100 || strings.ContainsRune(f.Search, 0) {
|
||||
@@ -288,6 +284,16 @@ func qaMonthlyPeople(w http.ResponseWriter, r *http.Request, config Config) {
|
||||
return
|
||||
}
|
||||
}
|
||||
if f.Region != "" && f.Region != "unassigned" && f.Region != "cross_region" {
|
||||
found := false
|
||||
for _, name := range p.Metadata.RegionLabels() {
|
||||
found = found || f.Region == name
|
||||
}
|
||||
if !found {
|
||||
qaOpsError(w, dobotaiops.ErrInvalidQuery)
|
||||
return
|
||||
}
|
||||
}
|
||||
if f.Department != "" {
|
||||
found := false
|
||||
for _, d := range p.Metadata.View.Departments {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package httpapi
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
@@ -36,9 +37,14 @@ func qaOrganization(w http.ResponseWriter, r *http.Request, config Config) {
|
||||
return
|
||||
}
|
||||
var request qaopsorg.SaveRequest
|
||||
decoder := json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20))
|
||||
raw, readErr := io.ReadAll(http.MaxBytesReader(w, r.Body, 1<<20))
|
||||
check := json.NewDecoder(bytes.NewReader(raw))
|
||||
var fields map[string]json.RawMessage
|
||||
var extra any
|
||||
invalidJSON := readErr != nil || json.Unmarshal(raw, &fields) != nil || fields == nil || fields["base_revision"] == nil || walkQualityJSON(check) != nil || check.Decode(&extra) != io.EOF
|
||||
decoder := json.NewDecoder(bytes.NewReader(raw))
|
||||
decoder.DisallowUnknownFields()
|
||||
if decoder.Decode(&request) != nil || decoder.Decode(&struct{}{}) != io.EOF || request.DirectoryID == "" || request.Rules == nil {
|
||||
if invalidJSON || decoder.Decode(&request) != nil || decoder.Decode(&extra) != io.EOF || request.DirectoryID == "" || request.Rules == nil {
|
||||
writeOrgError(w, qaopsorg.ErrInvalid)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -52,6 +52,12 @@ func TestQAOrganizationGuardsIdentityIntentAndErrors(t *testing.T) {
|
||||
{"PUT", base + "/regions", "org-admin", "qa-organization", "", `{} {}`, 400},
|
||||
{"PUT", base + "/regions", "org-admin", "qa-organization", "", `{}`, 400},
|
||||
{"PUT", base + "/regions", "org-admin", "qa-organization", "", `{"directory_id":"d","base_revision":"","rules":null}`, 400},
|
||||
{"PUT", base + "/regions", "org-admin", "qa-organization", "", `{"directory_id":"d","rules":[]}`, 400},
|
||||
{"PUT", base + "/regions", "org-admin", "qa-organization", "", `{"directory_id":"d","base_revision":"","regions":null,"rules":[]}`, 400},
|
||||
{"PUT", base + "/regions", "org-admin", "qa-organization", "", `{"directory_id":"d","base_revision":"","regions":[null],"rules":[]}`, 400},
|
||||
{"PUT", base + "/regions", "org-admin", "qa-organization", "", `{"directory_id":"d","base_revision":"","regions":[{"id":"edu","name":null}],"rules":[]}`, 400},
|
||||
{"PUT", base + "/regions", "org-admin", "qa-organization", "", `{"directory_id":"d","base_revision":"","rules":[],"rules":[]}`, 400},
|
||||
|
||||
{"PUT", base + "/regions", "org-admin", "qa-organization", "", `{"directory_id":"d","base_revision":"","rules":[]}`, 200},
|
||||
{"POST", base + "/preview", "org-admin", "qa-organization", "", `{"directory_id":"d","base_revision":"","rules":[]}`, 200},
|
||||
} {
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
package httpapi
|
||||
|
||||
import (
|
||||
"knowledge-governance/internal/dobotaiops"
|
||||
"knowledge-governance/internal/qaopsorg"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestQAUsageConsumesTheCustomRegionCatalog(t *testing.T) {
|
||||
p, err := qaopsorg.BuildAttribution(qaopsorg.State{State: "ready", DirectoryID: "fixture-directory", Regions: []qaopsorg.RegionDefinition{{ID: "edu", Name: "国内教育"}}, Rules: []qaopsorg.Rule{{DepartmentID: "a", Region: "edu"}}}, qaopsorg.Directory{Departments: []qaopsorg.Department{{ID: "a", Name: "示例部门"}}, People: []qaopsorg.Person{{ID: "fixture-person", DepartmentIDs: []string{"a"}}}})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
usage := summarizeQAUsage(dobotaiops.UsageGroups{Groups: []dobotaiops.UsageGroup{{Identity: dobotaiops.ActorIdentity{StaffID: "fixture-person"}, Total: 3, Succeeded: 2, Failed: 1}}}, p, dobotaiops.RecordQuery{})
|
||||
if usage.Questions != 3 || usage.IdentifiedUsers != 1 {
|
||||
t.Fatal("the historical whitelist dropped custom-region events")
|
||||
}
|
||||
found := false
|
||||
for _, row := range usage.Rows {
|
||||
if row.Key == "国内教育" {
|
||||
found = true
|
||||
if row.Questions != 3 || row.RosterPeople == nil || *row.RosterPeople != 1 || row.Users == nil || *row.Users != 1 {
|
||||
t.Fatal("custom-region counts or roster denominator were lost")
|
||||
}
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
t.Fatal("custom-region row missing")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
DO $$ BEGIN
|
||||
IF EXISTS (SELECT 1 FROM qa_ops_region_revisions WHERE region_definitions <> '[{"id":"国内工业","name":"国内工业"},{"id":"APAC","name":"APAC"},{"id":"EMEA","name":"EMEA"},{"id":"America","name":"America"}]'::jsonb) THEN
|
||||
RAISE EXCEPTION 'custom region catalog exists; application rollback may keep migration 51, destructive catalog rollback refused';
|
||||
END IF;
|
||||
END $$;
|
||||
ALTER TABLE qa_ops_region_revisions DROP COLUMN region_definitions;
|
||||
@@ -0,0 +1 @@
|
||||
ALTER TABLE qa_ops_region_revisions ADD COLUMN region_definitions JSONB NOT NULL DEFAULT '[{"id":"国内工业","name":"国内工业"},{"id":"APAC","name":"APAC"},{"id":"EMEA","name":"EMEA"},{"id":"America","name":"America"}]'::jsonb CHECK (jsonb_typeof(region_definitions)='array');
|
||||
@@ -11,8 +11,8 @@ func TestEmbeddedMigrationsAreVersionSorted(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatalf("loadMigrations() error = %v", err)
|
||||
}
|
||||
if len(migrations) != 50 {
|
||||
t.Fatalf("migration count = %d, want 50", len(migrations))
|
||||
if len(migrations) != 51 {
|
||||
t.Fatalf("migration count = %d, want 51", len(migrations))
|
||||
}
|
||||
if migrations[0].Version != 1 || !strings.Contains(migrations[0].UpSQL, "CREATE TABLE IF NOT EXISTS jobs") {
|
||||
t.Fatalf("migration 1 = %#v", migrations[0])
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
package postgres
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestRegionCatalogMigrationIsAdditiveAndRefusesLossyDown(t *testing.T) {
|
||||
migrations, e := loadMigrations()
|
||||
if e != nil {
|
||||
t.Fatal(e)
|
||||
}
|
||||
var up, down string
|
||||
for _, m := range migrations {
|
||||
if m.Version == 51 {
|
||||
up = m.UpSQL
|
||||
down = m.DownSQL
|
||||
}
|
||||
}
|
||||
for _, fragment := range []string{"ADD COLUMN region_definitions JSONB NOT NULL DEFAULT", "jsonb_typeof(region_definitions)='array'", "国内工业", "APAC", "EMEA", "America"} {
|
||||
if !strings.Contains(up, fragment) {
|
||||
t.Fatal("missing additive/backfill region contract", fragment)
|
||||
}
|
||||
}
|
||||
if !strings.Contains(down, "RAISE EXCEPTION") || !strings.Contains(down, "region_definitions <>") || !strings.Contains(down, "DROP COLUMN region_definitions") {
|
||||
t.Fatal("lossy down migration was not guarded")
|
||||
}
|
||||
}
|
||||
@@ -39,7 +39,7 @@ func BuildAttribution(state State, directory Directory) (*Attribution, error) {
|
||||
if state.State != "ready" || state.DirectoryID == "" {
|
||||
return nil, ErrUnavailable
|
||||
}
|
||||
view, err := Preview(directory, state.Rules)
|
||||
view, err := PreviewRegions(directory, state.Rules, state.RegionDefinitions())
|
||||
if err != nil {
|
||||
return nil, ErrUnavailable
|
||||
}
|
||||
@@ -65,7 +65,7 @@ func BuildAttribution(state State, directory Directory) (*Attribution, error) {
|
||||
if len(regions) == 1 {
|
||||
item.State = "matched"
|
||||
for region := range regions {
|
||||
item.Region = region
|
||||
item.Region = state.RegionLabel(region)
|
||||
}
|
||||
} else if len(regions) > 1 {
|
||||
item.State = "cross_region"
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
package qaopsorg
|
||||
|
||||
import "unicode/utf8"
|
||||
|
||||
// IDs are immutable mapping keys; names are editable labels. Existing keys remain
|
||||
// intact when migrating the historical four-region configuration.
|
||||
type RegionDefinition struct {
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
}
|
||||
|
||||
func DefaultRegions() []RegionDefinition {
|
||||
result := make([]RegionDefinition, 0, len(RegionNames))
|
||||
for _, name := range RegionNames {
|
||||
result = append(result, RegionDefinition{ID: name, Name: name})
|
||||
}
|
||||
return result
|
||||
}
|
||||
func (s State) RegionDefinitions() []RegionDefinition {
|
||||
if s.Regions == nil {
|
||||
return DefaultRegions()
|
||||
}
|
||||
return s.Regions
|
||||
}
|
||||
func (s State) RegionLabels() []string {
|
||||
labels := []string{}
|
||||
for _, region := range s.RegionDefinitions() {
|
||||
labels = append(labels, region.Name)
|
||||
}
|
||||
return labels
|
||||
}
|
||||
func (s State) RegionLabel(id string) string {
|
||||
for _, region := range s.RegionDefinitions() {
|
||||
if region.ID == id {
|
||||
return region.Name
|
||||
}
|
||||
}
|
||||
return ""
|
||||
}
|
||||
func validRegions(regions []RegionDefinition) bool {
|
||||
if len(regions) > 100 {
|
||||
return false
|
||||
}
|
||||
reserved := map[string]bool{"unassigned": true, "cross_region": true, "unmatched": true, "identity_conflict": true, "no_identity": true, "directory_missing": true, "__proto__": true, "constructor": true, "prototype": true}
|
||||
ids, names := map[string]bool{}, map[string]bool{}
|
||||
for _, region := range regions {
|
||||
if !validID(region.ID) || !validID(region.Name) || !utf8.ValidString(region.ID) || !utf8.ValidString(region.Name) || reserved[region.ID] || reserved[region.Name] || ids[region.ID] || names[region.Name] {
|
||||
return false
|
||||
}
|
||||
ids[region.ID] = true
|
||||
names[region.Name] = true
|
||||
}
|
||||
return true
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
package qaopsorg
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestCustomRegionCatalogRejectsAmbiguousOrReservedDefinitions(t *testing.T) {
|
||||
for _, regions := range [][]RegionDefinition{
|
||||
{{ID: "one", Name: "国内教育"}, {ID: "one", Name: "国外工业Amercia"}},
|
||||
{{ID: "one", Name: "国内教育"}, {ID: "two", Name: "国内教育"}},
|
||||
{{ID: "unassigned", Name: "区域"}}, {{ID: "one", Name: "cross_region"}},
|
||||
{{ID: "__proto__", Name: "区域"}}, {{ID: "one", Name: "constructor"}},
|
||||
{{ID: "one", Name: ""}}, {{ID: "one", Name: " 区域"}},
|
||||
} {
|
||||
if _, err := PreviewRegions(exampleDirectory(), nil, regions); err == nil {
|
||||
t.Fatal("invalid region catalog was accepted")
|
||||
}
|
||||
}
|
||||
if _, err := PreviewRegions(exampleDirectory(), []Rule{{DepartmentID: "sales", Region: "missing"}}, []RegionDefinition{{ID: "education", Name: "国内教育"}}); err == nil {
|
||||
t.Fatal("unknown mapping ID accepted")
|
||||
}
|
||||
}
|
||||
|
||||
func TestCustomRegionCatalogBindsStableIDAndRenamePreservesRules(t *testing.T) {
|
||||
directory := exampleDirectory()
|
||||
state := State{State: "ready", DirectoryID: "d", Rules: []Rule{}}
|
||||
var request SaveRequest
|
||||
if err := json.Unmarshal([]byte(`{"directory_id":"d","base_revision":"","regions":[{"id":"education","name":"国内教育"},{"id":"overseas","name":"国外工业Amercia"}],"rules":[{"department_id":"sales","region":"education"},{"department_id":"apac","region":"overseas"}]}`), &request); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
next, err := applyRequest(state, directory, request)
|
||||
if err != nil {
|
||||
t.Fatalf("custom business regions must not be rejected by the old four-name whitelist: %v", err)
|
||||
}
|
||||
if next.View.Regions["education"] != 1 || next.View.Regions["overseas"] != 1 || next.View.ConflictingPeople != 1 {
|
||||
t.Fatal("inheritance or stable-ID person dedup changed")
|
||||
}
|
||||
projection, err := BuildAttribution(next, directory)
|
||||
if err != nil || projection.Resolve("p2", "").Region != "国外工业Amercia" {
|
||||
t.Fatal("attribution did not use the same catalog display name")
|
||||
}
|
||||
raw, _ := json.Marshal(request)
|
||||
var body map[string]any
|
||||
_ = json.Unmarshal(raw, &body)
|
||||
body["regions"].([]any)[1].(map[string]any)["name"] = "国外工业 EMEA"
|
||||
raw, _ = json.Marshal(body)
|
||||
_ = json.Unmarshal(raw, &request)
|
||||
renamed, err := applyRequest(next, directory, request)
|
||||
if err != nil || renamed.Rules[0].Region != next.Rules[0].Region {
|
||||
t.Fatal("renaming changed the stable mapping")
|
||||
}
|
||||
projection, err = BuildAttribution(renamed, directory)
|
||||
if err != nil || projection.Resolve("p2", "").Region != "国外工业 EMEA" {
|
||||
t.Fatal("renamed catalog not consumed by attribution")
|
||||
}
|
||||
}
|
||||
@@ -46,12 +46,18 @@ type PreviewResult struct {
|
||||
|
||||
// Identity is department ID. Names and legacy keyword rules never decide ownership.
|
||||
func Preview(directory Directory, rules []Rule) (PreviewResult, error) {
|
||||
return PreviewRegions(directory, rules, DefaultRegions())
|
||||
}
|
||||
func PreviewRegions(directory Directory, rules []Rule, regions []RegionDefinition) (PreviewResult, error) {
|
||||
result := PreviewResult{Departments: []DepartmentView{}, Regions: map[string]int{}, MissingDepartments: []string{}, TotalPeople: len(directory.People)}
|
||||
if len(directory.Departments) == 0 || len(directory.Departments) > 20000 || len(directory.People) == 0 || len(directory.People) > 100000 || len(rules) > 20000 {
|
||||
return result, ErrInvalid
|
||||
}
|
||||
for _, region := range RegionNames {
|
||||
result.Regions[region] = 0
|
||||
if !validRegions(regions) {
|
||||
return result, ErrInvalid
|
||||
}
|
||||
for _, region := range regions {
|
||||
result.Regions[region.ID] = 0
|
||||
}
|
||||
departments := make(map[string]Department, len(directory.Departments))
|
||||
for _, d := range directory.Departments {
|
||||
|
||||
+32
-21
@@ -26,20 +26,22 @@ type Import struct {
|
||||
Directory Directory `json:"directory"`
|
||||
}
|
||||
type SaveRequest struct {
|
||||
DirectoryID string `json:"directory_id"`
|
||||
BaseRevision string `json:"base_revision"`
|
||||
Rules []Rule `json:"rules"`
|
||||
Regions []RegionDefinition `json:"regions,omitempty"`
|
||||
DirectoryID string `json:"directory_id"`
|
||||
BaseRevision string `json:"base_revision"`
|
||||
Rules []Rule `json:"rules"`
|
||||
}
|
||||
type State struct {
|
||||
State string `json:"state"`
|
||||
DirectoryID string `json:"directory_id"`
|
||||
DirectorySource string `json:"directory_source"`
|
||||
DirectorySyncedAt *time.Time `json:"directory_synced_at"`
|
||||
RevisionID string `json:"revision_id"`
|
||||
UpdatedBy string `json:"updated_by"`
|
||||
UpdatedAt *time.Time `json:"updated_at"`
|
||||
Rules []Rule `json:"rules"`
|
||||
View PreviewResult `json:"view"`
|
||||
Regions []RegionDefinition `json:"regions"`
|
||||
State string `json:"state"`
|
||||
DirectoryID string `json:"directory_id"`
|
||||
DirectorySource string `json:"directory_source"`
|
||||
DirectorySyncedAt *time.Time `json:"directory_synced_at"`
|
||||
RevisionID string `json:"revision_id"`
|
||||
UpdatedBy string `json:"updated_by"`
|
||||
UpdatedAt *time.Time `json:"updated_at"`
|
||||
Rules []Rule `json:"rules"`
|
||||
View PreviewResult `json:"view"`
|
||||
}
|
||||
type Store struct {
|
||||
pool *pgxpool.Pool
|
||||
@@ -53,12 +55,14 @@ type orgQuerier interface {
|
||||
QueryRow(context.Context, string, ...any) pgx.Row
|
||||
}
|
||||
|
||||
const readStateSQL = `SELECT d.id,d.source,d.synced_at,d.payload,COALESCE(r.id,''),COALESCE(r.rules,'[]'::jsonb),COALESCE(r.updated_by,''),r.created_at
|
||||
const defaultRegionsJSON = `[{"id":"国内工业","name":"国内工业"},{"id":"APAC","name":"APAC"},{"id":"EMEA","name":"EMEA"},{"id":"America","name":"America"}]`
|
||||
|
||||
const readStateSQL = `SELECT d.id,d.source,d.synced_at,d.payload,COALESCE(r.id,''),COALESCE(r.rules,'[]'::jsonb),COALESCE(r.updated_by,''),r.created_at,COALESCE(r.region_definitions,'` + defaultRegionsJSON + `'::jsonb)
|
||||
FROM qa_ops_organization_state st JOIN qa_ops_directory_snapshots d ON d.tenant_key=st.tenant_key AND d.id=st.directory_id
|
||||
LEFT JOIN qa_ops_region_revisions r ON r.tenant_key=st.tenant_key AND r.id=st.revision_id WHERE st.tenant_key=$1`
|
||||
|
||||
func (s *Store) read(ctx context.Context, q orgQuerier, lock bool) (State, Directory, error) {
|
||||
state := State{State: "empty", Rules: []Rule{}, View: PreviewResult{Departments: []DepartmentView{}, Regions: map[string]int{}, MissingDepartments: []string{}}}
|
||||
state := State{Regions: DefaultRegions(), State: "empty", Rules: []Rule{}, View: PreviewResult{Departments: []DepartmentView{}, Regions: map[string]int{}, MissingDepartments: []string{}}}
|
||||
for _, r := range RegionNames {
|
||||
state.View.Regions[r] = 0
|
||||
}
|
||||
@@ -67,15 +71,15 @@ func (s *Store) read(ctx context.Context, q orgQuerier, lock bool) (State, Direc
|
||||
if lock {
|
||||
query += " FOR UPDATE OF st"
|
||||
}
|
||||
var payload, rules []byte
|
||||
err := q.QueryRow(ctx, query, s.tenant).Scan(&state.DirectoryID, &state.DirectorySource, &state.DirectorySyncedAt, &payload, &state.RevisionID, &rules, &state.UpdatedBy, &state.UpdatedAt)
|
||||
var payload, rules, regions []byte
|
||||
err := q.QueryRow(ctx, query, s.tenant).Scan(&state.DirectoryID, &state.DirectorySource, &state.DirectorySyncedAt, &payload, &state.RevisionID, &rules, &state.UpdatedBy, &state.UpdatedAt, ®ions)
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return state, directory, nil
|
||||
}
|
||||
if err != nil || json.Unmarshal(payload, &directory) != nil || json.Unmarshal(rules, &state.Rules) != nil {
|
||||
if err != nil || json.Unmarshal(payload, &directory) != nil || json.Unmarshal(rules, &state.Rules) != nil || json.Unmarshal(regions, &state.Regions) != nil || state.Regions == nil {
|
||||
return State{}, directory, ErrUnavailable
|
||||
}
|
||||
state.View, err = Preview(directory, state.Rules)
|
||||
state.View, err = PreviewRegions(directory, state.Rules, state.RegionDefinitions())
|
||||
if err != nil {
|
||||
return State{}, directory, ErrUnavailable
|
||||
}
|
||||
@@ -106,7 +110,11 @@ func applyRequest(state State, directory Directory, request SaveRequest) (State,
|
||||
if request.DirectoryID != state.DirectoryID || request.BaseRevision != state.RevisionID {
|
||||
return State{}, ErrConflict
|
||||
}
|
||||
view, err := Preview(directory, request.Rules)
|
||||
regions := request.Regions
|
||||
if regions == nil {
|
||||
regions = state.RegionDefinitions()
|
||||
}
|
||||
view, err := PreviewRegions(directory, request.Rules, regions)
|
||||
if err != nil {
|
||||
return State{}, err
|
||||
}
|
||||
@@ -123,6 +131,7 @@ func applyRequest(state State, directory Directory, request SaveRequest) (State,
|
||||
}
|
||||
}
|
||||
state.View = view
|
||||
state.Regions = append([]RegionDefinition{}, regions...)
|
||||
state.Rules = append([]Rule{}, request.Rules...)
|
||||
sort.Slice(state.Rules, func(i, j int) bool { return state.Rules[i].DepartmentID < state.Rules[j].DepartmentID })
|
||||
return state, nil
|
||||
@@ -151,7 +160,9 @@ func (s *Store) SaveRules(ctx context.Context, request SaveRequest, actor string
|
||||
sort.Slice(before, func(i, j int) bool { return before[i].DepartmentID < before[j].DepartmentID })
|
||||
oldJSON, _ := json.Marshal(before)
|
||||
newJSON, _ := json.Marshal(next.Rules)
|
||||
if current.RevisionID != "" && string(oldJSON) == string(newJSON) {
|
||||
oldRegions, _ := json.Marshal(current.RegionDefinitions())
|
||||
newRegions, _ := json.Marshal(next.RegionDefinitions())
|
||||
if current.RevisionID != "" && string(oldJSON) == string(newJSON) && string(oldRegions) == string(newRegions) {
|
||||
if tx.Commit(ctx) != nil {
|
||||
return State{}, ErrUnavailable
|
||||
}
|
||||
@@ -164,7 +175,7 @@ func (s *Store) SaveRules(ctx context.Context, request SaveRequest, actor string
|
||||
next.RevisionID = "reg-" + hex.EncodeToString(nonce[:])
|
||||
next.UpdatedBy = actor
|
||||
var at time.Time
|
||||
if err = tx.QueryRow(ctx, `INSERT INTO qa_ops_region_revisions(tenant_key,id,directory_id,rules,updated_by) VALUES($1,$2,$3,$4,$5) RETURNING created_at`, s.tenant, next.RevisionID, next.DirectoryID, newJSON, actor).Scan(&at); err != nil {
|
||||
if err = tx.QueryRow(ctx, `INSERT INTO qa_ops_region_revisions(tenant_key,id,directory_id,rules,updated_by,region_definitions) VALUES($1,$2,$3,$4,$5,$6) RETURNING created_at`, s.tenant, next.RevisionID, next.DirectoryID, newJSON, actor, newRegions).Scan(&at); err != nil {
|
||||
return State{}, ErrUnavailable
|
||||
}
|
||||
next.UpdatedAt = &at
|
||||
|
||||
@@ -134,6 +134,65 @@ func TestOrganizationStoreRoundTripAndOptimisticConflict(t *testing.T) {
|
||||
if err = pool.QueryRow(ctx, "SELECT count(*) FROM qa_ops_region_revisions WHERE tenant_key=$1", "fixture-tenant").Scan(&revisions); err != nil || revisions != 2 {
|
||||
t.Fatal("revision history changed unexpectedly")
|
||||
}
|
||||
|
||||
t.Run("custom catalog persists with the mapping and rename advances revision", func(t *testing.T) {
|
||||
custom := qaopsorg.NewStore(pool, "catalog-fixture")
|
||||
imported, e := custom.ReplaceDirectory(ctx, input)
|
||||
if e != nil {
|
||||
t.Fatal(e)
|
||||
}
|
||||
request := qaopsorg.SaveRequest{DirectoryID: imported.DirectoryID, Regions: []qaopsorg.RegionDefinition{{ID: "education", Name: "国内教育"}}, Rules: []qaopsorg.Rule{{DepartmentID: "a", Region: "education"}}}
|
||||
preview, e := custom.PreviewRules(ctx, request)
|
||||
if e != nil || preview.View.Regions["education"] != 1 {
|
||||
t.Fatal("custom preview failed", e)
|
||||
}
|
||||
unchanged, _ := custom.GetView(ctx)
|
||||
if unchanged.RevisionID != "" {
|
||||
t.Fatal("catalog preview wrote data")
|
||||
}
|
||||
saved, e := custom.SaveRules(ctx, request, "catalog-admin")
|
||||
if e != nil {
|
||||
t.Fatal(e)
|
||||
}
|
||||
fresh, e := pgxpool.New(ctx, dsn)
|
||||
if e != nil {
|
||||
t.Fatal(e)
|
||||
}
|
||||
defer fresh.Close()
|
||||
read, e := qaopsorg.NewStore(fresh, "catalog-fixture").GetView(ctx)
|
||||
if e != nil || len(read.Regions) != 1 || read.Regions[0].Name != "国内教育" || read.Rules[0].Region != "education" {
|
||||
t.Fatal("catalog was not persisted with its rules", e)
|
||||
}
|
||||
request.BaseRevision = saved.RevisionID
|
||||
request.Regions[0].Name = "国外工业Amercia"
|
||||
renamed, e := custom.SaveRules(ctx, request, "catalog-admin")
|
||||
if e != nil || renamed.RevisionID == saved.RevisionID {
|
||||
t.Fatal("rename did not create an atomic revision", e)
|
||||
}
|
||||
projection, e := custom.GetAttribution(ctx)
|
||||
if e != nil || projection.Resolve("u1", "").Region != "国外工业Amercia" {
|
||||
t.Fatal("renamed labels not shared by the read paths")
|
||||
}
|
||||
if _, e = custom.SaveRules(ctx, request, "stale-admin"); !errors.Is(e, qaopsorg.ErrConflict) {
|
||||
t.Fatal("rename allowed stale overwrite")
|
||||
}
|
||||
request.BaseRevision = renamed.RevisionID
|
||||
repeated, e := custom.SaveRules(ctx, request, "catalog-admin")
|
||||
if e != nil || repeated.RevisionID != renamed.RevisionID {
|
||||
t.Fatal("unchanged catalog appended another revision")
|
||||
}
|
||||
if e = postgresstore.RollbackLatestMigration(ctx, pool); e == nil {
|
||||
t.Fatal("down migration discarded a custom catalog")
|
||||
}
|
||||
if _, e = custom.GetView(ctx); e != nil {
|
||||
t.Fatal("refused down migration damaged last-good catalog")
|
||||
}
|
||||
for _, table := range []string{"qa_ops_organization_state", "qa_ops_region_revisions", "qa_ops_directory_snapshots"} {
|
||||
if _, e = pool.Exec(ctx, "DELETE FROM "+table+" WHERE tenant_key=$1", "catalog-fixture"); e != nil {
|
||||
t.Fatal(e)
|
||||
}
|
||||
}
|
||||
})
|
||||
// This test exercises migration 48, not whichever unrelated migration is latest.
|
||||
for {
|
||||
var latest int64
|
||||
|
||||
@@ -73,7 +73,7 @@ export function QAMonthlyView({ data, loading, error, onRetry, onPage }: ViewPro
|
||||
<tr key={row.key}>
|
||||
<td>{row.name || '姓名未同步'}</td>
|
||||
<td>{row.departments.join(';') || '无部门记录'}</td>
|
||||
<td>{usageLabels[row.region || row.state]}</td>
|
||||
<td>{usageLabels[row.region || row.state] ?? (row.region || row.state)}</td>
|
||||
<td>{row.questions}</td>
|
||||
<td>{row.succeeded}</td>
|
||||
<td>{row.failed}</td>
|
||||
@@ -117,6 +117,7 @@ export function QAMonthly() {
|
||||
const [request, setRequest] = useState<MonthlyQuery>({ month: draft.month })
|
||||
const [data, setData] = useState<MonthlyPeople | null>(null),
|
||||
[options, setOptions] = useState<MonthlyPeople['department_options']>([]),
|
||||
[regionOptions, setRegionOptions] = useState<string[]>([]),
|
||||
[loading, setLoading] = useState(false),
|
||||
[error, setError] = useState('')
|
||||
useEffect(() => {
|
||||
@@ -129,6 +130,7 @@ export function QAMonthly() {
|
||||
if (!controller.signal.aborted) {
|
||||
setData(next)
|
||||
setOptions(next.department_options)
|
||||
setRegionOptions(next.organization.region_names ?? [])
|
||||
}
|
||||
})
|
||||
.catch((reason) => {
|
||||
@@ -196,9 +198,9 @@ export function QAMonthly() {
|
||||
区域 / 状态
|
||||
<select value={draft.region} disabled={loading} onChange={(e) => change('region', e.target.value)}>
|
||||
<option value="">全部区域 / 状态</option>
|
||||
{['国内工业', 'APAC', 'EMEA', 'America', 'unassigned', 'cross_region'].map((key) => (
|
||||
{[...regionOptions, 'unassigned', 'cross_region'].map((key) => (
|
||||
<option key={key} value={key}>
|
||||
{usageLabels[key]}
|
||||
{usageLabels[key] ?? key}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
|
||||
@@ -51,6 +51,30 @@ const props = {
|
||||
onRemoveMissing: vi.fn(),
|
||||
}
|
||||
describe('region mapping workbench', () => {
|
||||
it('separates multiselect from bulk application and renders hierarchy and editable region names', () => {
|
||||
const custom = {
|
||||
...state,
|
||||
regions: [{ id: 'APAC', name: '国外工业Amercia' }],
|
||||
view: { ...state.view, regions: { APAC: 1 } },
|
||||
}
|
||||
const html = renderToStaticMarkup(<RegionMappingView {...props} state={custom} />)
|
||||
for (const label of [
|
||||
'区域设置',
|
||||
'添加区域',
|
||||
'一级部门',
|
||||
'二级部门',
|
||||
'三级部门',
|
||||
'四级及更深',
|
||||
'批量归属',
|
||||
'全选当前列表',
|
||||
'取消本次勾选',
|
||||
'国外工业Amercia',
|
||||
])
|
||||
expect(html).toContain(label)
|
||||
expect(html).toMatch(/disabled=""[^>]*>批量归属/)
|
||||
expect(html).not.toContain('将 示例公司/')
|
||||
})
|
||||
|
||||
it('shows real synchronization stages without inventing progress and protects dirty drafts', () => {
|
||||
const syncStatus = {
|
||||
configured: true,
|
||||
@@ -80,7 +104,7 @@ describe('region mapping workbench', () => {
|
||||
const bodyRule = css.match(/\.qa-region-table td\s*\{([^}]+)\}/)?.[1] ?? ''
|
||||
expect(bodyRule).toMatch(/white-space:\s*normal/)
|
||||
expect(bodyRule).toMatch(/overflow-wrap:\s*anywhere/)
|
||||
const statusRule = css.match(/\.qa-region-table td:nth-child\(4\)\s*\{([^}]+)\}/)?.[1] ?? ''
|
||||
const statusRule = css.match(/\.qa-region-table td\.qa-region-basis\s*\{([^}]+)\}/)?.[1] ?? ''
|
||||
expect(statusRule).toMatch(/white-space:\s*nowrap/)
|
||||
})
|
||||
it('shows a dated historical roster, conflicts and no invented performance verdict', () => {
|
||||
|
||||
+216
-39
@@ -1,11 +1,24 @@
|
||||
import { useEffect, useRef, useState } from 'react'
|
||||
import { changeRegionRule, fetchOrganization, previewOrganization, regionNames, saveOrganization } from './qaOrg'
|
||||
import type { Organization, RegionRule } from './qaOrg'
|
||||
import {
|
||||
changeRegionRule,
|
||||
fetchOrganization,
|
||||
previewOrganization,
|
||||
organizationRegions,
|
||||
parseRegionDefinitions,
|
||||
saveOrganization,
|
||||
} from './qaOrg'
|
||||
import type { Organization, RegionRule, RegionDefinition } from './qaOrg'
|
||||
import './qaRegions.css'
|
||||
import { applyBulkRegionRules, departmentLevels } from './qaRegionSelection'
|
||||
import { completedSyncAction, directorySyncActive, fetchDirectorySync, startDirectorySync } from './qaOrgSync'
|
||||
import type { DirectorySyncStatus } from './qaOrgSync'
|
||||
import { newOperationID } from './operationKey'
|
||||
interface Props {
|
||||
regions?: RegionDefinition[]
|
||||
selectedIDs?: string[]
|
||||
onCatalog?: (regions: RegionDefinition[]) => void
|
||||
onSelect?: (ids: string[]) => void
|
||||
onApply?: () => void
|
||||
syncStatus?: DirectorySyncStatus | null
|
||||
syncError?: string
|
||||
syncSubmitting?: boolean
|
||||
@@ -28,10 +41,35 @@ interface Props {
|
||||
onReload: () => void
|
||||
}
|
||||
export function RegionMappingView(p: Props) {
|
||||
const display = p.preview ?? p.state
|
||||
const available = p.state?.state === 'ready'
|
||||
const departments =
|
||||
display?.view.departments.filter((d) => d.path.toLowerCase().includes(p.search.toLowerCase())) ?? []
|
||||
const [newName, setNewName] = useState(''),
|
||||
[level, setLevel] = useState(''),
|
||||
[catalogError, setCatalogError] = useState('')
|
||||
const display = p.preview ?? p.state,
|
||||
available = p.state?.state === 'ready'
|
||||
const regions = p.regions ?? organizationRegions(p.state),
|
||||
selected = p.selectedIDs ?? []
|
||||
const all = display?.view.departments ?? [],
|
||||
nodes = new Map(all.map((d) => [d.id, d]))
|
||||
const rows = all.map((d) => ({ department: d, levels: departmentLevels(all, d.id, nodes) }))
|
||||
const departments = rows.filter(
|
||||
({ department: d, levels }) =>
|
||||
d.path.toLowerCase().includes(p.search.toLowerCase()) && (!level || levels.length === Number(level))
|
||||
)
|
||||
const maximum = rows.reduce((n, r) => Math.max(n, r.levels.length), 0)
|
||||
const label = (id: string, catalog = regions) => catalog.find((r) => r.id === id)?.name ?? id
|
||||
const choose = (id: string, checked: boolean) =>
|
||||
p.onSelect?.(checked ? [...new Set([...selected, id])] : selected.filter((x) => x !== id))
|
||||
const add = () => {
|
||||
if (!newName.trim()) return
|
||||
const next = [...regions, { id: 'region-' + newOperationID(), name: newName.trim() }]
|
||||
try {
|
||||
p.onCatalog?.(parseRegionDefinitions(next))
|
||||
setNewName('')
|
||||
setCatalogError('')
|
||||
} catch {
|
||||
setCatalogError('区域名称无效,请核对长度、重名或保留名称')
|
||||
}
|
||||
}
|
||||
return (
|
||||
<section className="qa-regions" aria-label="区域归属配置">
|
||||
<div className="qa-region-heading">
|
||||
@@ -85,7 +123,6 @@ export function RegionMappingView(p: Props) {
|
||||
{p.state.revision_id || '尚未保存'}
|
||||
</p>
|
||||
) : null}
|
||||
|
||||
{p.error ? (
|
||||
<p role="alert" className="error-banner">
|
||||
{p.error}
|
||||
@@ -98,13 +135,66 @@ export function RegionMappingView(p: Props) {
|
||||
<p className="qa-ops-empty">暂无通讯录,请先同步。</p>
|
||||
) : (
|
||||
<>
|
||||
<section className="qa-region-catalog" aria-label="区域设置">
|
||||
<h4>区域设置</h4>
|
||||
{catalogError ? (
|
||||
<p role="alert" className="error-banner">
|
||||
{catalogError}
|
||||
</p>
|
||||
) : null}
|
||||
<div className="qa-region-names">
|
||||
{regions.map((r) => (
|
||||
<label key={r.id}>
|
||||
区域名称
|
||||
<input
|
||||
aria-label={`区域名称 ${r.id}`}
|
||||
value={r.name}
|
||||
maxLength={100}
|
||||
disabled={p.busy}
|
||||
onChange={(e) =>
|
||||
p.onCatalog?.(regions.map((x) => (x.id === r.id ? { ...x, name: e.target.value } : x)))
|
||||
}
|
||||
/>
|
||||
</label>
|
||||
))}
|
||||
</div>
|
||||
<form
|
||||
onSubmit={(e) => {
|
||||
e.preventDefault()
|
||||
add()
|
||||
}}
|
||||
className="qa-region-add"
|
||||
>
|
||||
<input
|
||||
aria-label="新区域名称"
|
||||
value={newName}
|
||||
maxLength={100}
|
||||
disabled={p.busy}
|
||||
placeholder="输入业务区域名称"
|
||||
onChange={(e) => setNewName(e.target.value)}
|
||||
/>
|
||||
<button
|
||||
disabled={
|
||||
p.busy || !newName.trim() || regions.length >= 100 || regions.some((r) => r.name === newName.trim())
|
||||
}
|
||||
>
|
||||
添加区域
|
||||
</button>
|
||||
</form>
|
||||
</section>
|
||||
<div className="qa-region-filters">
|
||||
<label>
|
||||
选择区域
|
||||
<select value={p.selectedRegion} disabled={p.busy} onChange={(e) => p.onRegion(e.target.value)}>
|
||||
{regionNames.map((r) => (
|
||||
<option key={r}>{r}</option>
|
||||
))}
|
||||
{regions.length ? (
|
||||
regions.map((r) => (
|
||||
<option key={r.id} value={r.id}>
|
||||
{r.name}
|
||||
</option>
|
||||
))
|
||||
) : (
|
||||
<option value="">请先添加区域</option>
|
||||
)}
|
||||
</select>
|
||||
</label>
|
||||
<label>
|
||||
@@ -116,6 +206,47 @@ export function RegionMappingView(p: Props) {
|
||||
placeholder="输入部门名称或完整路径"
|
||||
/>
|
||||
</label>
|
||||
<label>
|
||||
部门层级
|
||||
<select aria-label="部门层级" value={level} onChange={(e) => setLevel(e.target.value)}>
|
||||
<option value="">全部层级</option>
|
||||
{Array.from({ length: maximum }, (_, i) => (
|
||||
<option key={i} value={i + 1}>
|
||||
第 {i + 1} 级
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
</label>
|
||||
</div>
|
||||
<div className="qa-region-bulk">
|
||||
<label>
|
||||
<input
|
||||
type="checkbox"
|
||||
aria-label="全选当前列表"
|
||||
disabled={p.busy || !departments.length}
|
||||
checked={departments.length > 0 && departments.every((r) => selected.includes(r.department.id))}
|
||||
onChange={(e) => {
|
||||
const visible = new Set(departments.map((r) => r.department.id))
|
||||
p.onSelect?.(
|
||||
e.target.checked
|
||||
? [...new Set([...selected, ...visible])]
|
||||
: selected.filter((id) => !visible.has(id))
|
||||
)
|
||||
}}
|
||||
/>
|
||||
全选当前列表
|
||||
</label>
|
||||
<span>已勾选 {selected.length} 个部门</span>
|
||||
<button
|
||||
type="button"
|
||||
disabled={p.busy || !selected.length || !regions.some((r) => r.id === p.selectedRegion)}
|
||||
onClick={p.onApply}
|
||||
>
|
||||
批量归属
|
||||
</button>
|
||||
<button type="button" disabled={p.busy || !selected.length} onClick={() => p.onSelect?.([])}>
|
||||
取消本次勾选
|
||||
</button>
|
||||
<button type="button" disabled={p.busy || !p.dirty} onClick={p.onPreview}>
|
||||
预览影响
|
||||
</button>
|
||||
@@ -127,18 +258,16 @@ export function RegionMappingView(p: Props) {
|
||||
<div className="qa-region-preview" aria-label="归属人数预览">
|
||||
<strong>{p.preview ? '预览结果(未保存)' : '已保存归属'}</strong>
|
||||
<span>通讯录人数:{display.view.total_people}</span>
|
||||
{regionNames.map((r) => (
|
||||
<span key={r}>
|
||||
{r}:{display.view.regions[r]}
|
||||
{organizationRegions(display).map((r) => (
|
||||
<span key={r.id}>
|
||||
{r.name}:{display.view.regions[r.id]}
|
||||
</span>
|
||||
))}
|
||||
<span>未归属:{display.view.unassigned_people}</span>
|
||||
<span>跨区域待核对:{display.view.conflicting_people}</span>
|
||||
</div>
|
||||
) : null}
|
||||
{p.dirty && !p.preview ? (
|
||||
<p className="qa-ops-muted">勾选已修改,人数仍为已保存结果;请预览后保存。</p>
|
||||
) : null}
|
||||
{p.dirty && !p.preview ? <p className="qa-ops-muted">人数仍为已保存结果;请预览后保存。</p> : null}
|
||||
{display?.view.missing_departments.length ? (
|
||||
<div role="alert" className="qa-ops-warning">
|
||||
部分已配置部门不在当前通讯录中,原规则保留,需核对:
|
||||
@@ -156,29 +285,60 @@ export function RegionMappingView(p: Props) {
|
||||
<table className="qa-region-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>直接配置</th>
|
||||
<th>选择</th>
|
||||
<th>一级部门</th>
|
||||
<th>二级部门</th>
|
||||
<th>三级部门</th>
|
||||
<th>四级及更深</th>
|
||||
<th>完整部门路径</th>
|
||||
<th>直接配置</th>
|
||||
<th>{p.dirty && !p.preview ? '已保存归属' : '生效归属'}</th>
|
||||
<th>依据</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{departments.map((d) => (
|
||||
<tr key={d.id}>
|
||||
<td>
|
||||
<input
|
||||
type="checkbox"
|
||||
aria-label={`将 ${d.path} 直接归入 ${p.selectedRegion}`}
|
||||
checked={p.rules.some((r) => r.department_id === d.id && r.region === p.selectedRegion)}
|
||||
disabled={p.busy}
|
||||
onChange={(e) => p.onToggle(d.id, e.target.checked)}
|
||||
/>
|
||||
</td>
|
||||
<td>{d.path}</td>
|
||||
<td>{d.region || '未归属'}</td>
|
||||
<td>{d.explicit ? '直接配置' : d.inherited_from ? '继承上级' : '未配置'}</td>
|
||||
</tr>
|
||||
))}
|
||||
{departments.map(({ department: d, levels }) => {
|
||||
const direct = p.rules.find((r) => r.department_id === d.id)
|
||||
return (
|
||||
<tr key={d.id} data-department-id={d.id}>
|
||||
<td>
|
||||
<input
|
||||
type="checkbox"
|
||||
aria-label={`选择部门 ${d.path}`}
|
||||
checked={selected.includes(d.id)}
|
||||
disabled={p.busy}
|
||||
onChange={(e) => choose(d.id, e.target.checked)}
|
||||
/>
|
||||
</td>
|
||||
<td>{levels[0] || '—'}</td>
|
||||
<td>{levels[1] || '—'}</td>
|
||||
<td>{levels[2] || '—'}</td>
|
||||
<td>{levels.slice(3).join(' / ') || '—'}</td>
|
||||
<td>{d.path}</td>
|
||||
<td>
|
||||
{direct ? (
|
||||
<>
|
||||
<span>{label(direct.region)}</span>
|
||||
<button
|
||||
type="button"
|
||||
aria-label={`清除直接配置 ${d.path}`}
|
||||
disabled={p.busy}
|
||||
onClick={() => p.onToggle(d.id, false)}
|
||||
>
|
||||
清除
|
||||
</button>
|
||||
</>
|
||||
) : (
|
||||
'—'
|
||||
)}
|
||||
</td>
|
||||
<td>{d.region ? label(d.region, organizationRegions(display)) : '未归属'}</td>
|
||||
<td className="qa-region-basis">
|
||||
{d.explicit ? '直接配置' : d.inherited_from ? '继承上级' : '未配置'}
|
||||
</td>
|
||||
</tr>
|
||||
)
|
||||
})}
|
||||
</tbody>
|
||||
</table>
|
||||
{!departments.length ? <p>没有匹配的部门路径</p> : null}
|
||||
@@ -188,8 +348,8 @@ export function RegionMappingView(p: Props) {
|
||||
</section>
|
||||
)
|
||||
}
|
||||
function signature(rules: RegionRule[]) {
|
||||
return JSON.stringify([...rules].sort((a, b) => a.department_id.localeCompare(b.department_id)))
|
||||
function signature(rules: RegionRule[], regions: RegionDefinition[]) {
|
||||
return JSON.stringify({ rules: [...rules].sort((a, b) => a.department_id.localeCompare(b.department_id)), regions })
|
||||
}
|
||||
export function QARegions() {
|
||||
const [syncStatus, setSyncStatus] = useState<DirectorySyncStatus | null>(null),
|
||||
@@ -203,7 +363,9 @@ export function QARegions() {
|
||||
const [state, setState] = useState<Organization | null>(null),
|
||||
[preview, setPreview] = useState<Organization | null>(null),
|
||||
[rules, setRules] = useState<RegionRule[]>([])
|
||||
const [region, setRegion] = useState<string>(regionNames[0]),
|
||||
const [regions, setRegions] = useState<RegionDefinition[]>([]),
|
||||
[selected, setSelected] = useState<string[]>([])
|
||||
const [region, setRegion] = useState<string>(''),
|
||||
[search, setSearch] = useState(''),
|
||||
[busy, setBusy] = useState(false),
|
||||
[error, setError] = useState(''),
|
||||
@@ -212,6 +374,11 @@ export function QARegions() {
|
||||
const accept = (value: Organization) => {
|
||||
setState(value)
|
||||
setRules(value.rules)
|
||||
setRegions(organizationRegions(value))
|
||||
setRegion((current) =>
|
||||
organizationRegions(value).some((r) => r.id === current) ? current : (organizationRegions(value)[0]?.id ?? '')
|
||||
)
|
||||
setSelected([])
|
||||
setPreview(null)
|
||||
}
|
||||
const load = async () => {
|
||||
@@ -238,7 +405,7 @@ export function QARegions() {
|
||||
void load()
|
||||
return () => request.current?.abort()
|
||||
}, [])
|
||||
const dirty = Boolean(state && signature(rules) !== signature(state.rules))
|
||||
const dirty = Boolean(state && signature(rules, regions) !== signature(state.rules, organizationRegions(state)))
|
||||
dirtyRef.current = dirty
|
||||
const loadRef = useRef(load)
|
||||
loadRef.current = load
|
||||
@@ -320,8 +487,8 @@ export function QARegions() {
|
||||
setNotice('')
|
||||
try {
|
||||
const value = await (save
|
||||
? saveOrganization(state, rules, controller.signal)
|
||||
: previewOrganization(state, rules, controller.signal))
|
||||
? saveOrganization({ ...state, regions: parseRegionDefinitions(regions) }, rules, controller.signal)
|
||||
: previewOrganization({ ...state, regions: parseRegionDefinitions(regions) }, rules, controller.signal))
|
||||
if (!controller.signal.aborted) {
|
||||
if (save) {
|
||||
const readback = await fetchOrganization(controller.signal)
|
||||
@@ -342,6 +509,16 @@ export function QARegions() {
|
||||
}
|
||||
return (
|
||||
<RegionMappingView
|
||||
regions={regions}
|
||||
selectedIDs={selected}
|
||||
onCatalog={(next) => {
|
||||
setRegions(next)
|
||||
setPreview(null)
|
||||
setNotice('')
|
||||
setError('')
|
||||
}}
|
||||
onSelect={setSelected}
|
||||
onApply={() => edit(applyBulkRegionRules(rules, selected, region))}
|
||||
syncStatus={syncStatus}
|
||||
syncError={syncError}
|
||||
syncSubmitting={syncSubmitting}
|
||||
|
||||
@@ -20,6 +20,16 @@ const usage = parseQAUsage({
|
||||
rows: [{ key: 'unmatched', questions: 2, succeeded: 1, failed: 1, other: 0, users: null, roster_people: null }],
|
||||
})
|
||||
describe('usage statistics evidence', () => {
|
||||
it('renders a custom label without inheriting Object prototype properties', () => {
|
||||
const custom = {
|
||||
...usage,
|
||||
organization: { ...usage.organization, region_names: ['toString'] },
|
||||
rows: usage.rows.map((r) => ({ ...r, key: 'toString' })),
|
||||
}
|
||||
const html = renderToStaticMarkup(<QAUsageView data={custom} loading={false} error="" onRetry={() => {}} />)
|
||||
expect(html).toContain('toString')
|
||||
})
|
||||
|
||||
it('shows a current-roster basis and unknown counts without performance claims', () => {
|
||||
const html = renderToStaticMarkup(<QAUsageView data={usage} loading={false} error="" onRetry={() => {}} />)
|
||||
expect(html).toContain('按当前通讯录回看')
|
||||
|
||||
+1
-1
@@ -57,7 +57,7 @@ export function QAUsageView({ data, loading, error, onRetry }: Props) {
|
||||
<tbody>
|
||||
{data.rows.map((row) => (
|
||||
<tr key={row.key}>
|
||||
<td>{usageLabels[row.key]}</td>
|
||||
<td>{usageLabels[row.key] ?? row.key}</td>
|
||||
<td>{row.questions}</td>
|
||||
<td>{row.succeeded}</td>
|
||||
<td>{row.failed}</td>
|
||||
|
||||
@@ -2,6 +2,18 @@ import { describe, it, expect, vi } from 'vitest'
|
||||
import { parseQAMonthly, fetchQAMonthly, beijingMonth } from './qaMonthly'
|
||||
import { monthlyFixture } from './qaMonthly.fixture'
|
||||
describe('personal natural-month contracts', () => {
|
||||
it('accepts renamed custom regions only from the shared organization catalog', () => {
|
||||
const custom = {
|
||||
...monthlyFixture,
|
||||
organization: { ...monthlyFixture.organization, region_names: ['国内教育'] },
|
||||
rows: monthlyFixture.rows.map((r, i) => (i === 0 ? { ...r, region: '国内教育' } : r)),
|
||||
}
|
||||
expect(parseQAMonthly(custom).rows[0].region).toBe('国内教育')
|
||||
expect(() =>
|
||||
parseQAMonthly({ ...custom, organization: { ...custom.organization, region_names: ['别的区域'] } })
|
||||
).toThrow()
|
||||
})
|
||||
|
||||
it('sends personnel filters only in a same-origin no-store read body', async () => {
|
||||
const fake = vi.fn().mockResolvedValue(new Response(JSON.stringify({ data: monthlyFixture }), { status: 200 }))
|
||||
vi.stubGlobal('fetch', fake)
|
||||
|
||||
@@ -60,7 +60,6 @@ const instant = (v: unknown): string => {
|
||||
const t = text(v)
|
||||
return Number.isFinite(Date.parse(t)) ? t : fail()
|
||||
}
|
||||
const regions = ['国内工业', 'APAC', 'EMEA', 'America']
|
||||
export function parseQAMonthly(value: unknown): MonthlyPeople {
|
||||
const v = obj(value),
|
||||
organization = parseQAOrganizationVersion(v.organization)
|
||||
@@ -117,7 +116,7 @@ export function parseQAMonthly(value: unknown): MonthlyPeople {
|
||||
keys.has(key) ||
|
||||
name.length > 1000 ||
|
||||
!['matched', 'unassigned', 'cross_region'].includes(state) ||
|
||||
(state === 'matched' && !regions.includes(region)) ||
|
||||
(state === 'matched' && !(organization.region_names ?? []).includes(region)) ||
|
||||
(state !== 'matched' && region !== '')
|
||||
)
|
||||
fail()
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { parseQAQuality } from './qaQuality'
|
||||
import { regionNames, parseRegionDefinitions } from './qaOrg'
|
||||
import type { QAQuality } from './qaQuality'
|
||||
export const qaColumns = [
|
||||
{ key: 'question_chinese', label: '中文问题' },
|
||||
@@ -20,6 +21,7 @@ export const qaColumns = [
|
||||
|
||||
export type QAColumn = (typeof qaColumns)[number]['key']
|
||||
export interface QAOrganizationVersion {
|
||||
region_names?: string[]
|
||||
state: 'ready' | 'empty'
|
||||
directory_id: string
|
||||
directory_source: string
|
||||
@@ -40,7 +42,14 @@ export interface QARecordOrganization {
|
||||
export function parseQAOrganizationVersion(value: unknown): QAOrganizationVersion {
|
||||
const v = object(value)
|
||||
if (!['ready', 'empty'].includes(text(v.state)) || v.basis !== 'current_directory') return invalid()
|
||||
const region_names =
|
||||
v.region_names === undefined
|
||||
? [...regionNames]
|
||||
: Array.isArray(v.region_names)
|
||||
? parseRegionDefinitions(v.region_names.map((name) => ({ id: name, name }))).map((r) => r.name)
|
||||
: invalid()
|
||||
const result = {
|
||||
region_names,
|
||||
state: v.state as QAOrganizationVersion['state'],
|
||||
directory_id: text(v.directory_id),
|
||||
directory_source: text(v.directory_source),
|
||||
|
||||
@@ -30,6 +30,35 @@ export const directoryFixture = {
|
||||
},
|
||||
}
|
||||
describe('department region configuration', () => {
|
||||
it('uses configurable stable region IDs rather than a four-name whitelist', () => {
|
||||
const catalog = [
|
||||
{ id: 'education', name: '国内教育' },
|
||||
{ id: 'west', name: '国外工业Amercia' },
|
||||
]
|
||||
const state = parseOrganization({
|
||||
...directoryFixture,
|
||||
regions: catalog,
|
||||
rules: [{ department_id: 'root', region: 'education' }],
|
||||
view: {
|
||||
...directoryFixture.view,
|
||||
departments: [{ ...directoryFixture.view.departments[0], region: 'education', explicit: true }],
|
||||
regions: { education: 1, west: 0 },
|
||||
unassigned_people: 0,
|
||||
},
|
||||
})
|
||||
expect(state.regions).toEqual(catalog)
|
||||
expect(state.rules[0].region).toBe('education')
|
||||
expect(state.view.regions.education).toBe(1)
|
||||
})
|
||||
|
||||
it('rejects undeclared region counts rather than silently dropping them', () => {
|
||||
expect(() =>
|
||||
parseOrganization({
|
||||
...directoryFixture,
|
||||
view: { ...directoryFixture.view, regions: { ...directoryFixture.view.regions, undeclared: 0 } },
|
||||
})
|
||||
).toThrow()
|
||||
})
|
||||
it('parses an honest dated snapshot without exposing employee identities', () => {
|
||||
const state = parseOrganization(directoryFixture)
|
||||
expect(state.directory_source).toBe('weekly_report_snapshot')
|
||||
|
||||
+53
-7
@@ -1,4 +1,45 @@
|
||||
export const regionNames = ['国内工业', 'APAC', 'EMEA', 'America'] as const
|
||||
export interface RegionDefinition {
|
||||
id: string
|
||||
name: string
|
||||
}
|
||||
export const defaultRegions = (): RegionDefinition[] => regionNames.map((name) => ({ id: name, name }))
|
||||
const reservedRegions = [
|
||||
'unassigned',
|
||||
'cross_region',
|
||||
'unmatched',
|
||||
'identity_conflict',
|
||||
'no_identity',
|
||||
'directory_missing',
|
||||
'__proto__',
|
||||
'constructor',
|
||||
'prototype',
|
||||
]
|
||||
export function parseRegionDefinitions(raw: unknown): RegionDefinition[] {
|
||||
if (!Array.isArray(raw) || raw.length > 100) return invalid()
|
||||
const ids = new Set<string>(),
|
||||
names = new Set<string>()
|
||||
return raw.map((item) => {
|
||||
const r = obj(item),
|
||||
id = str(r.id),
|
||||
name = str(r.name)
|
||||
for (const value of [id, name])
|
||||
if (
|
||||
!value ||
|
||||
value.trim() !== value ||
|
||||
new TextEncoder().encode(value).length > 256 ||
|
||||
/[\x00\r\n]/.test(value) ||
|
||||
reservedRegions.includes(value)
|
||||
)
|
||||
return invalid()
|
||||
if (ids.has(id) || names.has(name)) return invalid()
|
||||
ids.add(id)
|
||||
names.add(name)
|
||||
return { id, name }
|
||||
})
|
||||
}
|
||||
export const organizationRegions = (state: Organization | null): RegionDefinition[] =>
|
||||
state?.regions ?? defaultRegions()
|
||||
export interface RegionRule {
|
||||
department_id: string
|
||||
region: string
|
||||
@@ -13,6 +54,7 @@ export interface DepartmentRegion {
|
||||
inherited_from: string
|
||||
}
|
||||
export interface Organization {
|
||||
regions?: RegionDefinition[]
|
||||
state: 'empty' | 'ready'
|
||||
directory_id: string
|
||||
directory_source: string
|
||||
@@ -49,7 +91,9 @@ export function instant(value: unknown): string | null {
|
||||
export function parseOrganization(value: unknown): Organization {
|
||||
const s = obj(value),
|
||||
v = obj(s.view),
|
||||
regions = obj(v.regions)
|
||||
regions = obj(v.regions),
|
||||
definitions = s.regions === undefined ? defaultRegions() : parseRegionDefinitions(s.regions),
|
||||
regionIDs = definitions.map((r) => r.id)
|
||||
if (
|
||||
(s.state !== 'empty' && s.state !== 'ready') ||
|
||||
!Array.isArray(s.rules) ||
|
||||
@@ -60,13 +104,12 @@ export function parseOrganization(value: unknown): Organization {
|
||||
const rules = s.rules.map((raw) => {
|
||||
const r = obj(raw)
|
||||
const region = str(r.region)
|
||||
if (!regionNames.some((x) => x === region)) return invalid()
|
||||
if (!regionIDs.includes(region)) return invalid()
|
||||
return { department_id: str(r.department_id), region }
|
||||
})
|
||||
const departments = v.departments.map((raw) => {
|
||||
const d = obj(raw)
|
||||
if (typeof d.explicit !== 'boolean' || (d.region !== '' && !regionNames.some((x) => x === d.region)))
|
||||
return invalid()
|
||||
if (typeof d.explicit !== 'boolean' || (d.region !== '' && !regionIDs.includes(String(d.region)))) return invalid()
|
||||
return {
|
||||
id: str(d.id),
|
||||
parent_id: str(d.parent_id),
|
||||
@@ -86,9 +129,12 @@ export function parseOrganization(value: unknown): Organization {
|
||||
const total = count(v.total_people),
|
||||
unassigned = count(v.unassigned_people),
|
||||
conflicting = count(v.conflicting_people)
|
||||
const regionCounts = Object.fromEntries(regionNames.map((r) => [r, count(regions[r])]))
|
||||
if (Object.keys(regions).length !== regionIDs.length || Object.keys(regions).some((id) => !regionIDs.includes(id)))
|
||||
return invalid()
|
||||
const regionCounts = Object.fromEntries(regionIDs.map((r) => [r, count(regions[r])]))
|
||||
if (Object.values(regionCounts).reduce((a, b) => a + b, 0) + unassigned + conflicting !== total) return invalid()
|
||||
const result: Organization = {
|
||||
regions: definitions,
|
||||
state: s.state,
|
||||
directory_id: str(s.directory_id),
|
||||
directory_source: str(s.directory_source),
|
||||
@@ -140,13 +186,13 @@ export const previewOrganization = (state: Organization, rules: RegionRule[], si
|
||||
requestOrganization(
|
||||
'/preview',
|
||||
'POST',
|
||||
{ directory_id: state.directory_id, base_revision: state.revision_id, rules },
|
||||
{ directory_id: state.directory_id, base_revision: state.revision_id, regions: organizationRegions(state), rules },
|
||||
signal
|
||||
)
|
||||
export const saveOrganization = (state: Organization, rules: RegionRule[], signal?: AbortSignal) =>
|
||||
requestOrganization(
|
||||
'/regions',
|
||||
'PUT',
|
||||
{ directory_id: state.directory_id, base_revision: state.revision_id, rules },
|
||||
{ directory_id: state.directory_id, base_revision: state.revision_id, regions: organizationRegions(state), rules },
|
||||
signal
|
||||
)
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { applyBulkRegionRules, departmentLevels } from './qaRegionSelection'
|
||||
import type { DepartmentRegion } from './qaOrg'
|
||||
describe('department multi-selection', () => {
|
||||
it('applies only explicitly selected IDs without deleting child overrides or mutating saved rules', () => {
|
||||
const saved = [
|
||||
{ department_id: 'child', region: 'west' },
|
||||
{ department_id: 'sibling', region: 'education' },
|
||||
]
|
||||
const draft = applyBulkRegionRules(saved, ['parent', 'other', 'parent'], 'education')
|
||||
expect(draft).toEqual([
|
||||
...saved,
|
||||
{ department_id: 'parent', region: 'education' },
|
||||
{ department_id: 'other', region: 'education' },
|
||||
])
|
||||
expect(saved).toHaveLength(2)
|
||||
expect(applyBulkRegionRules(draft, [], 'west')).toEqual(draft)
|
||||
})
|
||||
it('derives every hierarchy level from parent IDs, not slashes in names or a three-level cutoff', () => {
|
||||
const departments = Array.from({ length: 5 }, (_, i) => ({
|
||||
id: String(i),
|
||||
parent_id: i ? String(i - 1) : '',
|
||||
name: `部门/${i}`,
|
||||
path: '',
|
||||
region: '',
|
||||
explicit: false,
|
||||
inherited_from: '',
|
||||
})) as DepartmentRegion[]
|
||||
expect(departmentLevels(departments, '4')).toEqual(departments.map((d) => d.name))
|
||||
expect(() =>
|
||||
departmentLevels([...departments, { ...departments[0], id: 'cycle', parent_id: 'cycle' }], 'cycle')
|
||||
).toThrow()
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,27 @@
|
||||
import type { DepartmentRegion, RegionRule } from './qaOrg'
|
||||
export function applyBulkRegionRules(rules: RegionRule[], ids: string[], region: string): RegionRule[] {
|
||||
const selected = new Set(ids)
|
||||
if (!selected.size) return [...rules]
|
||||
if (!region) throw new Error('请先选择区域')
|
||||
return [
|
||||
...rules.filter((r) => !selected.has(r.department_id)),
|
||||
...Array.from(selected, (department_id) => ({ department_id, region })),
|
||||
]
|
||||
}
|
||||
export function departmentLevels(
|
||||
departments: DepartmentRegion[],
|
||||
id: string,
|
||||
nodes = new Map(departments.map((d) => [d.id, d]))
|
||||
): string[] {
|
||||
const seen = new Set<string>(),
|
||||
names: string[] = []
|
||||
let current = id
|
||||
while (current) {
|
||||
const node = nodes.get(current)
|
||||
if (!node || seen.has(current) || names.length > 100) throw new Error('通讯录部门层级无效,请重新同步')
|
||||
seen.add(current)
|
||||
names.unshift(node.name)
|
||||
current = node.parent_id
|
||||
}
|
||||
return names
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
import { it, expect } from 'vitest'
|
||||
import { parseQAUsage } from './qaUsage'
|
||||
it('keeps custom region usage instead of rejecting or silently dropping its counts', () => {
|
||||
const wire = {
|
||||
organization: {
|
||||
state: 'ready',
|
||||
directory_id: 'd',
|
||||
directory_source: 'weekly_report_live',
|
||||
synced_at: '2026-10-17T00:00:00Z',
|
||||
revision_id: 'r',
|
||||
basis: 'current_directory',
|
||||
region_names: ['国内教育'],
|
||||
},
|
||||
as_of: '2026-10-17T01:00:00Z',
|
||||
start: '2026-10-16T00:00:00Z',
|
||||
end: '2026-10-17T00:00:00Z',
|
||||
keyword: '',
|
||||
questions: 2,
|
||||
identified_users: 1,
|
||||
rows: [{ key: '国内教育', questions: 2, succeeded: 1, failed: 1, other: 0, users: 1, roster_people: 2 }],
|
||||
}
|
||||
expect(parseQAUsage(wire).rows[0].key).toBe('国内教育')
|
||||
expect(() => parseQAUsage({ ...wire, organization: { ...wire.organization, region_names: ['其他'] } })).toThrow()
|
||||
})
|
||||
+73
-3
@@ -59,6 +59,8 @@
|
||||
border-collapse: collapse;
|
||||
text-align: left;
|
||||
font-size: 13px;
|
||||
table-layout: fixed;
|
||||
min-width: 960px;
|
||||
}
|
||||
.qa-region-table th,
|
||||
.qa-region-table td {
|
||||
@@ -74,11 +76,10 @@
|
||||
white-space: nowrap;
|
||||
}
|
||||
.qa-region-table td:nth-child(2) {
|
||||
min-width: 240px;
|
||||
min-width: 0;
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
.qa-region-table td:nth-child(3),
|
||||
.qa-region-table td:nth-child(4) {
|
||||
.qa-region-table td.qa-region-basis {
|
||||
white-space: nowrap;
|
||||
}
|
||||
.qa-region-table input[type='checkbox'] {
|
||||
@@ -111,6 +112,75 @@
|
||||
outline: 2px solid #1765c1;
|
||||
outline-offset: 2px;
|
||||
}
|
||||
.qa-region-catalog {
|
||||
border-bottom: 1px solid var(--line, #d8e1eb);
|
||||
padding-bottom: 14px;
|
||||
min-width: 0;
|
||||
}
|
||||
.qa-region-catalog h4 {
|
||||
margin: 0 0 10px;
|
||||
}
|
||||
.qa-region-names {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(170px, 1fr));
|
||||
gap: 10px;
|
||||
}
|
||||
.qa-region-names label {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
color: var(--text-muted, #5e6d82);
|
||||
font-size: 12px;
|
||||
min-width: 0;
|
||||
}
|
||||
.qa-region-catalog input {
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
box-sizing: border-box;
|
||||
padding: 8px 10px;
|
||||
border: 1px solid var(--line, #d8e1eb);
|
||||
border-radius: 5px;
|
||||
background: var(--panel, #fff);
|
||||
color: inherit;
|
||||
}
|
||||
.qa-region-add,
|
||||
.qa-region-bulk {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 8px 12px;
|
||||
align-items: center;
|
||||
}
|
||||
.qa-region-add {
|
||||
margin-top: 10px;
|
||||
}
|
||||
.qa-region-add input {
|
||||
max-width: 320px;
|
||||
}
|
||||
.qa-region-bulk label {
|
||||
display: flex;
|
||||
gap: 6px;
|
||||
align-items: center;
|
||||
}
|
||||
.qa-region-tree-scroll {
|
||||
max-height: 60vh;
|
||||
}
|
||||
.qa-region-table th {
|
||||
white-space: normal;
|
||||
}
|
||||
.qa-region-table th:first-child {
|
||||
width: 36px;
|
||||
}
|
||||
.qa-region-table th:nth-child(6) {
|
||||
width: 23%;
|
||||
}
|
||||
.qa-region-table th:last-child {
|
||||
width: 65px;
|
||||
}
|
||||
.qa-region-table td button {
|
||||
padding: 3px 6px;
|
||||
font-size: 11px;
|
||||
margin-top: 4px;
|
||||
}
|
||||
@media (max-width: 700px) {
|
||||
.qa-region-filters {
|
||||
align-items: stretch;
|
||||
|
||||
+15
-5
@@ -30,7 +30,7 @@ const stamp = (v: unknown) => {
|
||||
const s = text(v)
|
||||
return !Number.isNaN(Date.parse(s)) ? s : bad()
|
||||
}
|
||||
export const usageLabels: Record<string, string> = {
|
||||
export const usageLabels: Record<string, string> = Object.assign(Object.create(null), {
|
||||
国内工业: '国内工业',
|
||||
APAC: 'APAC',
|
||||
EMEA: 'EMEA',
|
||||
@@ -41,14 +41,24 @@ export const usageLabels: Record<string, string> = {
|
||||
identity_conflict: '身份冲突',
|
||||
no_identity: '身份信息缺失',
|
||||
directory_missing: '尚无完整通讯录',
|
||||
}
|
||||
})
|
||||
export function parseQAUsage(value: unknown): QAUsage {
|
||||
const v = obj(value)
|
||||
const v = obj(value),
|
||||
organization = parseQAOrganizationVersion(v.organization)
|
||||
const allowed = new Set([
|
||||
...(organization.region_names ?? []),
|
||||
'unassigned',
|
||||
'cross_region',
|
||||
'unmatched',
|
||||
'identity_conflict',
|
||||
'no_identity',
|
||||
'directory_missing',
|
||||
])
|
||||
if (!Array.isArray(v.rows)) return bad()
|
||||
const rows = v.rows.map((raw) => {
|
||||
const r = obj(raw)
|
||||
const key = text(r.key)
|
||||
if (!Object.hasOwn(usageLabels, key)) return bad()
|
||||
if (!allowed.has(key)) return bad()
|
||||
const row = {
|
||||
key,
|
||||
questions: count(r.questions),
|
||||
@@ -62,7 +72,7 @@ export function parseQAUsage(value: unknown): QAUsage {
|
||||
return row
|
||||
})
|
||||
const result = {
|
||||
organization: parseQAOrganizationVersion(v.organization),
|
||||
organization,
|
||||
as_of: stamp(v.as_of),
|
||||
start: stamp(v.start),
|
||||
end: stamp(v.end),
|
||||
|
||||
Reference in New Issue
Block a user