diff --git a/backend/src/main/java/cn/yunsheng/quality/governance/ClassificationPreviewService.java b/backend/src/main/java/cn/yunsheng/quality/governance/ClassificationPreviewService.java index dfddc9c..f1b533c 100644 --- a/backend/src/main/java/cn/yunsheng/quality/governance/ClassificationPreviewService.java +++ b/backend/src/main/java/cn/yunsheng/quality/governance/ClassificationPreviewService.java @@ -12,19 +12,22 @@ import org.springframework.stereotype.Service; public class ClassificationPreviewService { private final GovernanceSupport g; private final CandidateAcceptanceService access; - private record Key(String release,String stage,List conditions) { Key { conditions=List.copyOf(conditions); } } + private record Key(String release,String kind,String stage,List conditions) { Key { conditions=List.copyOf(conditions); } } private final ImmutableQueryCache>> previews=new ImmutableQueryCache<>(64); public ClassificationPreviewService(GovernanceSupport g,CandidateAcceptanceService access){this.g=g;this.access=access;} public record Condition(String field,String operator,String value){} - public record Request(String stage,String target,List conditions){} + public record Request(String stage,String target,List conditions,String kind){ + public Request(String stage,String target,List conditions){this(stage,target,conditions,"group");} + public boolean project(){return "projectGroup".equals(kind);} + } private static final Map FIELDS=Map.of("@department","f.department","@product","f.product", - "PDT代码","JSON_VALUE(f.components,'$.sourcePdtCode')","销售片区","JSON_VALUE(f.components,'$.sourceSalesRegion')"); + "PDT代码","JSON_VALUE(f.components,'$.sourcePdtCode')","销售片区","JSON_VALUE(f.components,'$.sourceSalesRegion')","客户代码","JSON_VALUE(f.components,'$.sourceCustomerCode')","@group","f.group_name"); public Map preview(Request request,AppUserPrincipal actor){ validate(request);access.requireSourceDetail(actor); var current=g.rows("SELECT release_id FROM current_release WHERE dataset_id='quality'"); if(current.isEmpty())return Map.of("items",List.of(),"matchedRows",0,"changedRows",0,"totalWeight",BigDecimal.ZERO); String release=String.valueOf(current.getFirst().get("releaseId"));access.requireRead(release,actor); - var items=previews.get(new Key(release,request.stage(),request.conditions()),()->load(release,request)); + var items=previews.get(new Key(release,request.project()?"projectGroup":"group",request.stage(),request.conditions()),()->load(release,request)); long matched=0,changed=0;BigDecimal weight=BigDecimal.ZERO; for(var row:items){long count=((Number)row.get("rowCount")).longValue();matched+=count; if(!Objects.equals(row.get("currentGroup"),request.target()))changed+=count; @@ -32,12 +35,13 @@ public class ClassificationPreviewService { return Map.of("releaseId",release,"items",items,"matchedRows",matched,"changedRows",changed,"totalWeight",weight); } static void validate(Request request){ - if(request==null||!Set.of("all","black","bright").contains(Objects.toString(request.stage(),"")) + if(request==null||(request.kind()!=null&&!Set.of("group","projectGroup").contains(request.kind()))||!Set.of("all","black","bright").contains(Objects.toString(request.stage(),"")) ||request.target()==null||request.target().isBlank()||request.target().length()>160 ||request.conditions()==null||request.conditions().isEmpty()||request.conditions().size()>4) throw GovernanceSupport.error(HttpStatus.BAD_REQUEST,"分类规则条件无效"); + if(request.project()&&(request.conditions().size()!=2||request.conditions().stream().anyMatch(c->c==null||!"EQUALS".equals(c.operator()))))throw GovernanceSupport.error(HttpStatus.BAD_REQUEST,"项目组归类须同时指定客户代码和业务分组"); Set fields=new HashSet<>(); - for(var condition:request.conditions())if(condition==null||condition.field()==null||!FIELDS.containsKey(condition.field())||!fields.add(condition.field()) + for(var condition:request.conditions())if(condition==null||condition.field()==null||!Set.copyOf(request.project()?List.of("客户代码","@group"):List.of("@department","@product","PDT代码","销售片区")).contains(condition.field())||!fields.add(condition.field()) ||!Set.of("EQUALS","IS_BLANK").contains(Objects.toString(condition.operator(),"")) ||condition.value()==null||condition.value().length()>200 ||("EQUALS".equals(condition.operator())&&condition.value().isBlank()) @@ -47,14 +51,16 @@ public class ClassificationPreviewService { private List> load(String release,Request request){ List queries=new ArrayList<>();List args=new ArrayList<>(); for(String stage:request.stage().equals("all")?List.of("black","bright"):List.of(request.stage())){ - StringBuilder where=new StringBuilder(" WHERE rm.release_id=? AND (f.group_name IS NULL OR TRIM(f.group_name)='')");args.add(release); + String column=request.project()?"f.project_group":"f.group_name"; + String predicate=request.project()?cn.yunsheng.quality.ingestion.UnclassifiedMappingRebuild.projectBlankSql("f"):"(f.group_name IS NULL OR TRIM(f.group_name)='')"; + StringBuilder where=new StringBuilder(" WHERE rm.release_id=? AND "+predicate);args.add(release); for(var condition:request.conditions()){ String expression=FIELDS.get(condition.field()); if(condition.operator().equals("IS_BLANK"))where.append(" AND (").append(expression).append(" IS NULL OR REGEXP_LIKE(").append(expression).append(",'^[[:space:]]*$'))"); else{where.append(" AND CAST(").append(expression).append(" AS BINARY)=CAST(? AS BINARY)");args.add(condition.value());} } - queries.add("SELECT '"+stage+"' AS stage,f.department,f.month_key AS month,COALESCE(f.group_name,'') AS current_group,COUNT(*) AS row_count,SUM(f.total_weight) AS total_weight " - +"FROM release_member rm JOIN fact_"+stage+" f ON f.build_id=rm.transform_build_id"+where+" GROUP BY f.department,f.month_key,COALESCE(f.group_name,'')"); + queries.add("SELECT '"+stage+"' AS stage,f.department,f.month_key AS month,COALESCE("+column+",'') AS current_group,COUNT(*) AS row_count,SUM(f.total_weight) AS total_weight " + +"FROM release_member rm JOIN fact_"+stage+" f ON f.build_id=rm.transform_build_id"+where+" GROUP BY f.department,f.month_key,COALESCE("+column+",'')"); } return g.rows("SELECT * FROM ("+String.join(" UNION ALL ",queries)+") impact ORDER BY stage,month,current_group",args.toArray()); } diff --git a/backend/src/main/java/cn/yunsheng/quality/governance/MappingIssueController.java b/backend/src/main/java/cn/yunsheng/quality/governance/MappingIssueController.java index 15a7233..6137ab6 100644 --- a/backend/src/main/java/cn/yunsheng/quality/governance/MappingIssueController.java +++ b/backend/src/main/java/cn/yunsheng/quality/governance/MappingIssueController.java @@ -14,6 +14,7 @@ public class MappingIssueController { @PostMapping("/classification-preview") public Map classificationPreview(@RequestBody ClassificationPreviewService.Request request,@AuthenticationPrincipal AppUserPrincipal actor){return preview.preview(request,actor);} @GetMapping("/classification-metadata") public Map classificationMetadata(){return cn.yunsheng.quality.ingestion.ConfigurableMatchRules.metadata();} @GetMapping("/unclassified") public Map unclassified(@RequestParam(defaultValue="1") int page,@RequestParam(defaultValue="50") int pageSize,@AuthenticationPrincipal AppUserPrincipal actor){return unclassified.list(page,pageSize,actor);} + @GetMapping("/unclassified-projects") public Map unclassifiedProjects(@RequestParam(defaultValue="1") int page,@RequestParam(defaultValue="15") int pageSize,@RequestParam(required=false) String customerCode,@RequestParam(required=false) String businessGroup,@RequestParam(required=false) String department,@AuthenticationPrincipal AppUserPrincipal actor){return unclassified.listProjects(page,pageSize,customerCode,businessGroup,department,actor);} @GetMapping public Map list(@RequestParam(required=false) String importRunId,@RequestParam(required=false) String status,@RequestParam(defaultValue="1") int page,@RequestParam(defaultValue="50") int pageSize,@RequestParam(required=false) String mappingType,@RequestParam(required=false) String customerCode,@RequestParam(required=false) String businessGroup,@RequestParam(required=false) String department,@AuthenticationPrincipal AppUserPrincipal actor){return service.list(importRunId,status,page,pageSize,customerCode,businessGroup,department,mappingType,actor);} @GetMapping("/{id}") public Map detail(@PathVariable String id,@AuthenticationPrincipal AppUserPrincipal actor){return service.detail(id,actor);} @PostMapping("/{id}/resolve") @PreAuthorize("hasAnyRole('SYSTEM_ADMIN','DATA_MAINTAINER','RULE_MAINTAINER')") diff --git a/backend/src/main/java/cn/yunsheng/quality/governance/UnclassifiedSourceService.java b/backend/src/main/java/cn/yunsheng/quality/governance/UnclassifiedSourceService.java index 6545330..2a7e8ba 100644 --- a/backend/src/main/java/cn/yunsheng/quality/governance/UnclassifiedSourceService.java +++ b/backend/src/main/java/cn/yunsheng/quality/governance/UnclassifiedSourceService.java @@ -12,6 +12,7 @@ public class UnclassifiedSourceService { private final GovernanceSupport g; private final CandidateAcceptanceService access; private final ImmutableQueryCache>> inventories = new ImmutableQueryCache<>(12); + private final ImmutableQueryCache>> projects=new ImmutableQueryCache<>(12); public UnclassifiedSourceService(GovernanceSupport g, CandidateAcceptanceService access) { this.g = g; this.access = access; @@ -50,4 +51,35 @@ public class UnclassifiedSourceService { GROUP BY f.department,f.product,pdt_code,sales_region,source_key """.formatted(stage, stage); } + + /** 项目组待处理列表只展示当前版本的空归属,避免重复出现已经归类的历史问题。 */ + public Map listProjects(int page,int size,String customer,String group,String department,AppUserPrincipal actor){ + if(page<1||size<1||size>100)throw GovernanceSupport.error(HttpStatus.BAD_REQUEST,"分页无效"); + access.requireSourceDetail(actor); + var current=g.rows("SELECT release_id FROM current_release WHERE dataset_id='quality'"); + if(current.isEmpty())return Map.of("items",List.of(),"total",0,"page",page,"pageSize",size,"filterOptions",MappingIssueDimensions.options(List.of())); + String release=String.valueOf(current.getFirst().get("releaseId"));access.requireRead(release,actor); + var all=projects.get(release,()->{ + Map result=new TreeMap<>(); + for(String stage:List.of("black","bright"))for(var row:g.rows(projectSql(stage),release)){ + String code=String.valueOf(row.get("customerCode")),business=String.valueOf(row.get("businessGroup")),key=code+"|"+business; + var item=result.computeIfAbsent(key,k->new Project(code,business)); + item.count+=((Number)row.get("rowCount")).longValue();if(row.get("totalWeight") instanceof Number n)item.weight=item.weight.add(new java.math.BigDecimal(n.toString())); + if(row.get("department") instanceof String name&&!name.isBlank())item.departments.add(name); + if(row.get("month")!=null)item.periods.add(String.valueOf(row.get("month"))); + } + return result.entrySet().stream().map(entry->{var item=entry.getValue();return Map.of("id",GovernanceSupport.sha(release+"\nPROJECT_GROUP\n"+entry.getKey()),"mappingType","PROJECT_GROUP","sourceKey",entry.getKey(),"customerCode",item.customer,"businessGroup",item.group,"departments",List.copyOf(item.departments),"rowCount",item.count,"totalWeight",item.weight,"status","OPEN","details",Map.of("periods",List.copyOf(item.periods)));}).toList(); + }); + var filtered=all.stream().filter(row->MappingIssueDimensions.matches(row,customer,group,department)).toList(); + int offset=(int)Math.min(filtered.size(),(long)(page-1)*size); + return Map.of("items",filtered.subList(offset,Math.min(filtered.size(),offset+size)),"total",filtered.size(),"page",page,"pageSize",size,"releaseId",release,"filterOptions",MappingIssueDimensions.options(all)); + } + private static class Project{ + final String customer,group;final Set departments=new TreeSet<>(),periods=new TreeSet<>();long count;java.math.BigDecimal weight=java.math.BigDecimal.ZERO; + Project(String customer,String group){this.customer=customer;this.group=group;} + } + static String projectSql(String stage){ + if(!Set.of("black","bright").contains(stage))throw new IllegalArgumentException("来源阶段无效"); + return "SELECT JSON_VALUE(f.components,'$.sourceCustomerCode') customer_code,f.group_name business_group,f.department,f.month_key month,COUNT(*) row_count,SUM(f.total_weight) total_weight FROM release_member m JOIN fact_"+stage+" f ON f.build_id=m.transform_build_id WHERE m.release_id=? AND "+cn.yunsheng.quality.ingestion.UnclassifiedMappingRebuild.projectBlankSql("f")+" AND JSON_VALUE(f.components,'$.sourceCustomerCode') IS NOT NULL AND TRIM(JSON_VALUE(f.components,'$.sourceCustomerCode'))<>'' AND f.group_name IS NOT NULL AND TRIM(f.group_name)<>'' GROUP BY customer_code,business_group,f.department,f.month_key"; + } } diff --git a/backend/src/main/java/cn/yunsheng/quality/ingestion/BusinessRowMapper.java b/backend/src/main/java/cn/yunsheng/quality/ingestion/BusinessRowMapper.java index c94247c..9e4c35d 100644 --- a/backend/src/main/java/cn/yunsheng/quality/ingestion/BusinessRowMapper.java +++ b/backend/src/main/java/cn/yunsheng/quality/ingestion/BusinessRowMapper.java @@ -27,6 +27,7 @@ public final class BusinessRowMapper { private final ConfigurableRuleEngine rules; private final ConfigurableMatchRules matchRules; private final Map savedGroups; + private final Map savedProjects; public BusinessRowMapper(Map categoryLookup, Map projectLookup, String mappingVersion) { this(categoryLookup,projectLookup,mappingVersion,Map.of(),Map.of()); @@ -44,16 +45,18 @@ public final class BusinessRowMapper { this.departmentLookup=departmentLookup;this.productLookup=productLookup; this.rules=rules; this.matchRules=ConfigurableMatchRules.fromDefinition(mappingDefinition); - this.savedGroups=Map.of(); + this.savedGroups=Map.of();this.savedProjects=Map.of(); } - private BusinessRowMapper(BusinessRowMapper base,Map savedGroups){ + private BusinessRowMapper(BusinessRowMapper base,Map savedGroups,Map savedProjects){ this.categoryLookup=base.categoryLookup;this.projectLookup=base.projectLookup;this.mappingVersion=base.mappingVersion; this.departmentLookup=base.departmentLookup;this.productLookup=base.productLookup;this.rules=base.rules;this.matchRules=base.matchRules; - this.savedGroups=Map.copyOf(savedGroups); + this.savedGroups=Map.copyOf(savedGroups);this.savedProjects=Map.copyOf(savedProjects); } public boolean hasUnclassifiedRules(){return matchRules.hasUnclassifiedRules();} - public BusinessRowMapper preserveAssignedGroups(Map groups){return new BusinessRowMapper(this,groups);} + public BusinessRowMapper preserveAssignedGroups(Map groups){return new BusinessRowMapper(this,groups,savedProjects);} + public boolean hasUnclassifiedRules(String target){return matchRules.hasUnclassifiedRules(target);} + public BusinessRowMapper preserveAssignedProjects(Map projects){return new BusinessRowMapper(this,savedGroups,projects);} static String sourceRowKey(String sheet,int row){return sheet+"\n"+row;} public String mappingVersion() { return mappingVersion; } @@ -169,11 +172,11 @@ public final class BusinessRowMapper { String projectKey=joinedKey(customer,category);boolean blankProjectKey=customer==null||customer.isEmpty()||category==null||category.isEmpty(); boolean projectMappingKnown=!blankProjectKey&&projectLookup.containsKey(projectKey); String projectGroup=projectMappingKnown?projectLookup.get(projectKey):null; - ConfigurableMatchRules.Match projectRule=matchRules.applyMatch(stage,"projectGroup",matchSource,computed(department,category,product,projectGroup),projectGroup); + ConfigurableMatchRules.Match projectRule=matchRules.applyProject(stage,matchSource,computed(department,category,product,projectGroup),projectGroup,savedProjects.get(sourceRowKey(input.sheet(),input.physicalRow())),projectMappingKnown&&(projectGroup==null||projectGroup.isBlank())); projectGroup=projectRule.value();boolean knownNullProjectGroup=projectMappingKnown&&(projectGroup==null||projectGroup.isEmpty()); if(knownNullProjectGroup)projectGroup=null; - boolean projectUnmapped=!projectRule.matched()&&!blankProjectKey&&!projectMappingKnown; - String projectGroupStatus=projectRule.matched()?"mapped":projectUnmapped?"unmapped":blankProjectKey?"source_key_blank":knownNullProjectGroup?"mapped_null":"mapped"; + boolean projectUnmapped=projectGroup==null&&!projectRule.matched()&&!blankProjectKey&&!projectMappingKnown; + String projectGroupStatus=projectRule.matched()||projectGroup!=null?"mapped":projectUnmapped?"unmapped":blankProjectKey?"source_key_blank":knownNullProjectGroup?"mapped_null":"mapped"; String categoryStatus=unmappedCategory?"unmapped":blankCategoryKey&&category==null?"source_key_blank":"mapped"; return new PreparedSource(source,raw,new DimensionValues(department,category,product,projectGroup,categoryStatus,projectGroupStatus, pdt,region,customer,sourceDepartment,productLookupKey,unmappedCategory,projectUnmapped)); diff --git a/backend/src/main/java/cn/yunsheng/quality/ingestion/ConfigurableMatchRules.java b/backend/src/main/java/cn/yunsheng/quality/ingestion/ConfigurableMatchRules.java index 6f433f9..125028e 100644 --- a/backend/src/main/java/cn/yunsheng/quality/ingestion/ConfigurableMatchRules.java +++ b/backend/src/main/java/cn/yunsheng/quality/ingestion/ConfigurableMatchRules.java @@ -76,7 +76,7 @@ public final class ConfigurableMatchRules { continue; } for (Object key : rule.keySet()) if (!Set.of("id", "name", "enabled", "priority", "stage", "conditions", "target", "value", "onlyUnclassified").contains(String.valueOf(key))) errors.add(path + " 未知字段: " + key); - if(rule.containsKey("onlyUnclassified") && (!(rule.get("onlyUnclassified") instanceof Boolean) || Boolean.TRUE.equals(rule.get("onlyUnclassified")) && !"group".equals(rule.get("target")))) errors.add(path+" onlyUnclassified仅适用于业务分组且须为布尔值"); + if(rule.containsKey("onlyUnclassified") && (!(rule.get("onlyUnclassified") instanceof Boolean) || Boolean.TRUE.equals(rule.get("onlyUnclassified")) && !Set.of("group","projectGroup").contains(rule.get("target")))) errors.add(path+" onlyUnclassified仅适用于业务分组或项目组且须为布尔值"); String id = text(rule.get("id")); if (id != null) textBudget += id.length(); if (id == null || !id.matches("[A-Za-z0-9][A-Za-z0-9_-]{0,63}")) errors.add(path + " id须为1至64位字母、数字、下划线或连字符"); @@ -168,6 +168,14 @@ public final class ConfigurableMatchRules { return result.matched()||result.value()!=null&&!result.value().isBlank()?result:new Match(false,savedGroup); } + public Match applyProject(String stage,Map raw,Map computed,String current,String savedProject,boolean explicitNull){ + if(savedProject!=null&&!savedProject.isBlank()){ + var ordinary=applyMatch(stage,"projectGroup",raw,computed,current,true); + return ordinary.matched()||ordinary.value()!=null&&!ordinary.value().isBlank()?ordinary:new Match(false,savedProject); + } + return applyMatch(stage,"projectGroup",raw,computed,current,explicitNull); + } + public boolean hasUnclassifiedRules(String target){return rules.stream().anyMatch(rule->target.equals(rule.get("target"))&&Boolean.TRUE.equals(rule.get("onlyUnclassified")));} public boolean hasUnclassifiedRules(){return rules.stream().anyMatch(rule->Boolean.TRUE.equals(rule.get("onlyUnclassified")));} public List> rules() { return rules.stream().map(ConfigurableMatchRules::copyRule).toList(); } diff --git a/backend/src/main/java/cn/yunsheng/quality/ingestion/ImportWorker.java b/backend/src/main/java/cn/yunsheng/quality/ingestion/ImportWorker.java index ebef872..d371abb 100644 --- a/backend/src/main/java/cn/yunsheng/quality/ingestion/ImportWorker.java +++ b/backend/src/main/java/cn/yunsheng/quality/ingestion/ImportWorker.java @@ -236,8 +236,8 @@ public class ImportWorker { List facts = new ArrayList<>(BATCH_SIZE); List issues = new ArrayList<>(); Set availableHeaders = new HashSet<>(); - Map savedGroups=rowMapper.hasUnclassifiedRules()?loadAssignedGroups(jdbc,candidate.stage(),runId,revisionId):Map.of(); - BusinessRowMapper effectiveMapper=rowMapper.preserveAssignedGroups(savedGroups); + Map savedGroups=rowMapper.hasUnclassifiedRules("group")?loadAssignedGroups(jdbc,candidate.stage(),runId,revisionId):Map.of(); + BusinessRowMapper effectiveMapper=rowMapper.preserveAssignedGroups(savedGroups).preserveAssignedProjects(rowMapper.hasUnclassifiedRules("projectGroup")?loadAssignedDimension(jdbc,candidate.stage(),runId,revisionId,"project_group"):Map.of()); long[] rowCount = {0}; int[] blocking = {0}; int[] blankCategory = {0}; @@ -328,11 +328,14 @@ public class ImportWorker { } static Map loadAssignedGroups(JdbcTemplate jdbc,String stage,String runId,String revisionId){ - if(!Set.of("black","bright").contains(stage))throw new IllegalArgumentException("来源阶段无效"); + return loadAssignedDimension(jdbc,stage,runId,revisionId,"group_name"); + } + static Map loadAssignedDimension(JdbcTemplate jdbc,String stage,String runId,String revisionId,String column){ + if(!Set.of("black","bright").contains(stage)||!Set.of("group_name","project_group").contains(column))throw new IllegalArgumentException("来源维度无效"); // 仅复用该任务基线中同一不可变来源修订的归属;新文件或修订不借用旧记录。 Map savedGroups=new HashMap<>(); - jdbc.queryForList("SELECT f.sheet_name,f.physical_row_no,f.group_name FROM fact_"+stage+" f JOIN release_member m ON m.transform_build_id=f.build_id JOIN import_run r ON r.expected_current_release_id=m.release_id WHERE r.id=? AND f.source_revision_id=? AND f.group_name IS NOT NULL AND TRIM(f.group_name)<>''",runId,revisionId) - .forEach(row->savedGroups.put(BusinessRowMapper.sourceRowKey(String.valueOf(row.get("sheet_name")),((Number)row.get("physical_row_no")).intValue()),String.valueOf(row.get("group_name")))); + jdbc.queryForList("SELECT f.sheet_name,f.physical_row_no,f."+column+" assigned_value FROM fact_"+stage+" f JOIN release_member m ON m.transform_build_id=f.build_id JOIN import_run r ON r.expected_current_release_id=m.release_id WHERE r.id=? AND f.source_revision_id=? AND f."+column+" IS NOT NULL AND TRIM(f."+column+")<>''",runId,revisionId) + .forEach(row->savedGroups.put(BusinessRowMapper.sourceRowKey(String.valueOf(row.get("sheet_name")),((Number)row.get("physical_row_no")).intValue()),String.valueOf(row.get("assigned_value")))); return savedGroups; } diff --git a/backend/src/main/java/cn/yunsheng/quality/ingestion/UnclassifiedMappingRebuild.java b/backend/src/main/java/cn/yunsheng/quality/ingestion/UnclassifiedMappingRebuild.java index 56d81c1..b5d0da0 100644 --- a/backend/src/main/java/cn/yunsheng/quality/ingestion/UnclassifiedMappingRebuild.java +++ b/backend/src/main/java/cn/yunsheng/quality/ingestion/UnclassifiedMappingRebuild.java @@ -25,13 +25,15 @@ public final class UnclassifiedMappingRebuild { var result=new ArrayList>(); for(String id:changed){var prior=old.get(id);var rule=next.get(id); if(rule==null){if(!Boolean.TRUE.equals(prior.get("onlyUnclassified")))throw new IllegalArgumentException("不能在未分类维护中移除普通匹配规则");continue;} - if(!Boolean.TRUE.equals(rule.get("onlyUnclassified"))||!"group".equals(rule.get("target")))throw new IllegalArgumentException("未分类规则不能改为覆盖已有分类"); - for(var raw:(List)rule.get("conditions")){var condition=map(raw);if(!Set.of("@department","@product","PDT代码","销售片区").contains(condition.get("field"))||!Set.of("EQUALS","IS_BLANK").contains(condition.get("operator")))throw new IllegalArgumentException("未分类维护仅支持产业部、产品、PDT代码和销售区域条件");} + if(!Boolean.TRUE.equals(rule.get("onlyUnclassified"))||!Set.of("group","projectGroup").contains(rule.get("target")))throw new IllegalArgumentException("未分类规则不能改为覆盖已有分类"); + for(var raw:(List)rule.get("conditions")){var condition=map(raw);var fields="projectGroup".equals(rule.get("target"))?Set.of("客户代码","@group"):Set.of("@department","@product","PDT代码","销售片区");if(!fields.contains(condition.get("field"))||!Set.of("EQUALS","IS_BLANK").contains(condition.get("operator")))throw new IllegalArgumentException("未分类维护条件与分类类型不匹配");} if(Boolean.TRUE.equals(rule.get("enabled")))result.add(rule); } return result; } - record Change(String stage,String parent,String sheet,int row,String month,String department,String product,String oldGroup,String oldProject,String group,String project,Map components){} + record Change(String stage,String parent,String sheet,int row,String month,String department,String product,String oldGroup,String oldProject,String group,String project,boolean groupChanged,boolean projectChanged,Map components){} + static boolean blank(String value){return value==null||value.isBlank();} + public static String projectBlankSql(String alias){if(!Set.of("f").contains(alias))throw new IllegalArgumentException("来源别名无效");return "("+alias+".project_group IS NULL OR TRIM("+alias+".project_group)='') AND COALESCE(JSON_VALUE("+alias+".components,'$.projectGroupStatus'),'')<>'mapped_null'";} public record Candidate(String releaseId,String runId,int scannedRows,int classifiedRows){} private String text(Object value){return value==null?null:String.valueOf(value);} private Map decode(Object value){if(value==null)return new LinkedHashMap<>();return new LinkedHashMap<>(json.readValue(String.valueOf(value),Map.class));} @@ -43,20 +45,48 @@ public final class UnclassifiedMappingRebuild { var matcher=ConfigurableMatchRules.fromDefinition(Map.of("matchRules",changedRules));var projectRules=ConfigurableMatchRules.fromDefinition(definition); var changes=new ArrayList();int scanned=0;var projectLookups=new HashMap>(); for(String stage:List.of("black","bright")){ - var rows=jdbc.queryForList("SELECT f.build_id,f.sheet_name,f.physical_row_no,f.month_key,f.department,f.group_name,f.project_group,f.product,CAST(f.components AS CHAR) components,CAST(f.raw_values AS CHAR) raw_values,CAST(b.parser_config AS CHAR) parser_config FROM release_member m JOIN fact_"+stage+" f ON f.build_id=m.transform_build_id JOIN transform_build b ON b.id=f.build_id WHERE m.release_id=? AND (f.group_name IS NULL OR TRIM(f.group_name)='')",parent); + var candidates=new ArrayList();var args=new ArrayList();args.add(parent); + for(var changed:changedRules){ + if(!"all".equals(changed.get("stage"))&&!stage.equals(changed.get("stage")))continue; + if("group".equals(changed.get("target"))){candidates.add("(f.group_name IS NULL OR TRIM(f.group_name)='')");continue;} + var conditions=new ArrayList();conditions.add(projectBlankSql("f")); + for(var rawCondition:(List)changed.get("conditions")){ + var condition=map(rawCondition);String field="@group".equals(condition.get("field"))?"f.group_name":"JSON_VALUE(f.components,'$.sourceCustomerCode')"; + if("IS_BLANK".equals(condition.get("operator")))conditions.add("("+field+" IS NULL OR TRIM("+field+")='')"); + else{conditions.add("CAST("+field+" AS BINARY)=CAST(? AS BINARY)");args.add(condition.get("value"));} + } + candidates.add("("+String.join(" AND ",conditions)+")"); + } + if(candidates.isEmpty())continue; + var rows=jdbc.queryForList("SELECT f.build_id,f.sheet_name,f.physical_row_no,f.month_key,f.department,f.group_name,f.project_group,f.product,CAST(f.components AS CHAR) components,CAST(f.raw_values AS CHAR) raw_values,CAST(b.parser_config AS CHAR) parser_config FROM release_member m JOIN fact_"+stage+" f ON f.build_id=m.transform_build_id JOIN transform_build b ON b.id=f.build_id WHERE m.release_id=? AND ("+String.join(" OR ",candidates)+")",args.toArray()); scanned+=rows.size(); for(var row:rows){ var components=decode(row.get("components"));var raw=decode(row.get("raw_values"));var restored=BusinessRowMapper.restoreStoredRow(stage,text(row.get("sheet_name")),((Number)row.get("physical_row_no")).intValue(),raw,decode(row.get("parser_config"))); restored.values().forEach((key,value)->raw.put(key,value==null?null:value.display())); raw.put("PDT代码",components.get("sourcePdtCode"));raw.put("销售片区",components.get("sourceSalesRegion"));raw.put("客户代码",components.get("sourceCustomerCode")); - var computed=new LinkedHashMap();computed.put("department",text(row.get("department")));computed.put("group",text(row.get("group_name")));computed.put("product",text(row.get("product")));computed.put("projectGroup",text(row.get("project_group"))); - var match=matcher.applyMatch(stage,"group",raw,computed,text(row.get("group_name")));if(!match.matched())continue; - String month=text(row.get("month_key")),group=match.value(),customer=text(components.get("sourceCustomerCode")); - var lookup=projectLookups.computeIfAbsent(month,key->worker.loadMappings("PROJECT_GROUP",mapping,Integer.parseInt(key.substring(0,4)),Integer.parseInt(key.substring(5,7)))); - boolean blank=customer==null||customer.isBlank();String key=blank?null:customer+"|"+group;boolean known=!blank&&lookup.containsKey(key);String project=known?lookup.get(key):null; - computed.put("group",group);computed.put("projectGroup",project);var projectMatch=projectRules.applyMatch(stage,"projectGroup",raw,computed,project);project=projectMatch.value(); - components.put("categoryMappingStatus","mapped");components.put("projectGroup",project);components.put("projectGroupStatus",projectMatch.matched()?"mapped":blank?"source_key_blank":known?(project==null?"mapped_null":"mapped"):"unmapped"); - changes.add(new Change(stage,text(row.get("build_id")),text(row.get("sheet_name")),((Number)row.get("physical_row_no")).intValue(),month,text(row.get("department")),text(row.get("product")),text(row.get("group_name")),text(row.get("project_group")),group,project,components)); + String oldGroup=text(row.get("group_name")),oldProject=text(row.get("project_group")); + var computed=new LinkedHashMap();computed.put("department",text(row.get("department")));computed.put("group",oldGroup);computed.put("product",text(row.get("product")));computed.put("projectGroup",oldProject); + var groupMatch=matcher.applyMatch(stage,"group",raw,computed,oldGroup);String group=groupMatch.value(),project=oldProject; + boolean canFillProject=blank(oldProject)&&!"mapped_null".equals(components.get("projectGroupStatus")); + if(groupMatch.matched()){ + components.put("categoryMappingStatus","mapped");computed.put("group",group); + if(canFillProject){ + String month=text(row.get("month_key")),customer=text(components.get("sourceCustomerCode")); + var lookup=projectLookups.computeIfAbsent(month,key->worker.loadMappings("PROJECT_GROUP",mapping,Integer.parseInt(key.substring(0,4)),Integer.parseInt(key.substring(5,7)))); + boolean missingKey=blank(customer)||blank(group);String key=missingKey?null:customer+"|"+group;boolean known=!missingKey&&lookup.containsKey(key);project=known?lookup.get(key):null; + boolean explicitNull=known&&blank(project); + computed.put("projectGroup",project);var match=projectRules.applyProject(stage,raw,computed,project,null,explicitNull);project=match.value(); + components.put("projectGroup",project);components.put("projectGroupStatus",match.matched()||!blank(project)?"mapped":missingKey?"source_key_blank":known?"mapped_null":"unmapped"); + } + } + computed.put("group",group);computed.put("projectGroup",project); + if(canFillProject&&blank(project)&&!"mapped_null".equals(components.get("projectGroupStatus"))){ + var projectMatch=matcher.applyMatch(stage,"projectGroup",raw,computed,project); + if(projectMatch.matched()){project=projectMatch.value();components.put("projectGroup",project);components.put("projectGroupStatus","mapped");} + } + boolean groupChanged=!Objects.equals(group,oldGroup),projectChanged=!Objects.equals(project,oldProject); + if(!groupChanged&&!projectChanged)continue; + changes.add(new Change(stage,text(row.get("build_id")),text(row.get("sheet_name")),((Number)row.get("physical_row_no")).intValue(),text(row.get("month_key")),text(row.get("department")),text(row.get("product")),oldGroup,oldProject,group,project,groupChanged,projectChanged,components)); } } String release=UUID.randomUUID().toString(),run=UUID.randomUUID().toString(); @@ -73,7 +103,7 @@ public final class UnclassifiedMappingRebuild { jdbc.update("INSERT INTO defect_component(build_id,stage,sheet_name,physical_row_no,defect_name,weight,source_field) SELECT ?,stage,sheet_name,physical_row_no,defect_name,weight,source_field FROM defect_component WHERE build_id=?",build,old); rollups.copyBuild(old,build);var keys=new LinkedHashSet(); for(var change:changes)if(change.parent().equals(old)){ - int updated=jdbc.update("UPDATE fact_"+change.stage()+" SET group_name=?,project_group=?,components=CAST(? AS JSON) WHERE build_id=? AND sheet_name=? AND physical_row_no=? AND (group_name IS NULL OR TRIM(group_name)='')",change.group(),change.project(),encode(change.components()),build,change.sheet(),change.row());if(updated!=1)throw new IllegalStateException("未分类行已变化,归类未提交"); + int updated=jdbc.update("UPDATE fact_"+change.stage()+" SET group_name=?,project_group=?,components=CAST(? AS JSON) WHERE build_id=? AND sheet_name=? AND physical_row_no=? AND (group_name<=>?) AND (project_group<=>?) AND "+(change.groupChanged()?"(group_name IS NULL OR TRIM(group_name)='')":"(project_group IS NULL OR TRIM(project_group)='')"),change.group(),change.project(),encode(change.components()),build,change.sheet(),change.row(),change.oldGroup(),change.oldProject());if(updated!=1)throw new IllegalStateException("未分类行已变化,归类未提交"); changedOrigins.add(new cn.yunsheng.quality.governance.MappingIssueService.SourceRow(change.stage(),build,change.sheet(),change.row())); keys.add(new MetricsRollupService.GroupKey(change.stage(),change.month(),change.department(),change.oldGroup(),change.oldProject(),change.product()));keys.add(new MetricsRollupService.GroupKey(change.stage(),change.month(),change.department(),change.group(),change.project(),change.product())); } diff --git a/backend/src/test/java/cn/yunsheng/quality/governance/ClassificationPreviewMySqlTest.java b/backend/src/test/java/cn/yunsheng/quality/governance/ClassificationPreviewMySqlTest.java index 01e518f..bf2e4da 100644 --- a/backend/src/test/java/cn/yunsheng/quality/governance/ClassificationPreviewMySqlTest.java +++ b/backend/src/test/java/cn/yunsheng/quality/governance/ClassificationPreviewMySqlTest.java @@ -46,4 +46,25 @@ class ClassificationPreviewMySqlTest { assertEquals(0L,service.preview(new ClassificationPreviewService.Request("all","G",List.of(equal("@department","A' OR 1=1 --"))),actor).get("matchedRows")); assertEquals(3,jdbc.queryForObject("SELECT COUNT(*) FROM fact_black",Integer.class)); } + private void projectFixture(){ + for(String stage:List.of("black","bright")){jdbc.update("DELETE FROM fact_"+stage);jdbc.execute("ALTER TABLE fact_"+stage+" ADD project_group VARCHAR(40)");} + jdbc.update("INSERT INTO fact_black VALUES('b','A','P','G','2026-01',10,JSON_OBJECT('sourceCustomerCode','001','projectGroupStatus','unmapped'),NULL),('b','A','P','G','2026-02',20,JSON_OBJECT('sourceCustomerCode','001','projectGroupStatus','mapped'),'KEEP'),('b','B','P','G','2026-02',60,JSON_OBJECT('sourceCustomerCode','002','projectGroupStatus','unmapped'),NULL)"); + jdbc.update("INSERT INTO fact_bright VALUES('l','A','P','G','2026-03',30,JSON_OBJECT('sourceCustomerCode','001','projectGroupStatus','unmapped'),NULL),('l','A','P','G','2026-04',40,JSON_OBJECT('sourceCustomerCode','001','projectGroupStatus','mapped_null'),NULL)"); + } + @Test void projectPreviewRequiresBothKeysAndExcludesAssignedAndExplicitNullProjects(){ + projectFixture();var request=new ClassificationPreviewService.Request("all","NEW",List.of(equal("客户代码","001"),equal("@group","G")),"projectGroup"); + var result=service.preview(request,actor);assertEquals(2L,result.get("matchedRows"));assertEquals(2L,result.get("changedRows"));assertEquals(0,new java.math.BigDecimal("40").compareTo((java.math.BigDecimal)result.get("totalWeight"))); + assertThrows(org.springframework.web.server.ResponseStatusException.class,()->service.preview(new ClassificationPreviewService.Request("all","NEW",List.of(equal("客户代码","001")),"projectGroup"),actor)); + assertThrows(org.springframework.web.server.ResponseStatusException.class,()->service.preview(new ClassificationPreviewService.Request("all","NEW",List.of(equal("客户代码","001"),equal("@product","P")),"projectGroup"),actor)); + } + @Test void projectInventoryIsCurrentUnclassifiedOnlyAndKeepsCustomerGroupDepartmentFilters(){ + projectFixture();var service=new UnclassifiedSourceService(new GovernanceSupport(jdbc,JsonMapper.builder().build()),mock(CandidateAcceptanceService.class)); + var all=service.listProjects(1,15,null,null,null,actor);assertEquals(2,all.get("total")); + var filtered=service.listProjects(1,15,"001","G","A",actor);assertEquals(1,filtered.get("total"));var item=(Map)((List)filtered.get("items")).getFirst();assertEquals(2L,item.get("rowCount")); + assertEquals(0,service.listProjects(1,15,"001","G","B",actor).get("total")); + for(String stage:List.of("black","bright"))jdbc.update("UPDATE fact_"+stage+" SET project_group='NEW' WHERE JSON_VALUE(components,'$.sourceCustomerCode')='001' AND JSON_VALUE(components,'$.projectGroupStatus')='unmapped'"); + jdbc.update("UPDATE current_release SET release_id='r2'");jdbc.update("INSERT INTO release_member VALUES('r2','b'),('r2','l')"); + assertEquals(0,service.listProjects(1,15,"001",null,null,actor).get("total"));assertEquals(1,service.listProjects(1,15,null,null,null,actor).get("total")); + } + } diff --git a/backend/src/test/java/cn/yunsheng/quality/ingestion/ConfigurableMatchRulesTest.java b/backend/src/test/java/cn/yunsheng/quality/ingestion/ConfigurableMatchRulesTest.java index 30b7ca2..767b3cd 100644 --- a/backend/src/test/java/cn/yunsheng/quality/ingestion/ConfigurableMatchRulesTest.java +++ b/backend/src/test/java/cn/yunsheng/quality/ingestion/ConfigurableMatchRulesTest.java @@ -31,6 +31,18 @@ class ConfigurableMatchRulesTest { assertEquals("工业电机-VCM",mapper.preserveAssignedGroups(saved).transform("black",row("001","VCM产品","华东","产业部"),2026,1).group()); assertEquals("明确的新对应",mapper(Map.of("P1|华东","明确的新对应"),Map.of(),definition).preserveAssignedGroups(saved).transform("black",row("001","普通产品","华东","产业部"),2026,1).group()); } + + @Test void projectScopeCannotOverrideLookupSavedOrExplicitNullAssignments(){ + var rule=new LinkedHashMap(rule("pending-project",-9900,"all","projectGroup","NEW",List.of(condition("客户代码","EQUALS","001"),condition("@group","EQUALS","G"))));rule.put("onlyUnclassified",true); + var definition=Map.of("matchRules",List.of(rule));assertTrue(ConfigurableMatchRules.validate(definition).isEmpty()); + var row=row("001","普通产品","华东","产业部");var groups=Map.of("P1|华东","G"); + var empty=mapper(groups,Map.of(),definition);assertEquals("NEW",empty.transform("black",row,2026,1).components().get("projectGroup")); + var kept=empty.preserveAssignedProjects(Map.of(BusinessRowMapper.sourceRowKey("测试",2),"SAVED" )).transform("black",row,2026,1); + assertEquals("SAVED",kept.components().get("projectGroup"));assertEquals("mapped",kept.components().get("projectGroupStatus"));assertFalse(kept.unmappedProjectGroup()); + assertEquals("LOOKUP",mapper(groups,Map.of("001|G","LOOKUP"),definition).transform("black",row,2026,1).components().get("projectGroup")); + var explicit=new LinkedHashMap();explicit.put("001|G",null);var result=mapper(groups,explicit,definition).transform("black",row,2026,1); + assertNull(result.components().get("projectGroup"));assertEquals("mapped_null",result.components().get("projectGroupStatus")); + } @Test void missingRulesKeepLegacyVcmBehaviorAndExplicitEmptyArrayRemovesIt() { Map categories = Map.of("P1|华东", "原始分组"); var legacy = mapper(categories, Map.of(), Map.of()); diff --git a/backend/src/test/java/cn/yunsheng/quality/ingestion/UnclassifiedMappingRebuildMySqlTest.java b/backend/src/test/java/cn/yunsheng/quality/ingestion/UnclassifiedMappingRebuildMySqlTest.java index cbb51cb..1e97c77 100644 --- a/backend/src/test/java/cn/yunsheng/quality/ingestion/UnclassifiedMappingRebuildMySqlTest.java +++ b/backend/src/test/java/cn/yunsheng/quality/ingestion/UnclassifiedMappingRebuildMySqlTest.java @@ -65,4 +65,29 @@ class UnclassifiedMappingRebuildMySqlTest { assertTrue(ImportWorker.loadAssignedGroups(jdbc,"black",run,bright).isEmpty()); assertTrue(ImportWorker.loadAssignedGroups(jdbc,"black",UUID.randomUUID().toString(),black).isEmpty()); } + @Test void projectMaintenanceOnlyFillsMatchingEmptyProjectsAcrossStages(){ + for(String stage:List.of("black","bright"))jdbc.update("UPDATE fact_"+stage+" SET group_name='G',components=JSON_SET(components,'$.categoryMappingStatus','mapped','$.projectGroupStatus','unmapped')"); + jdbc.update("UPDATE fact_black SET project_group='KEEP',components=JSON_SET(components,'$.projectGroup','KEEP','$.projectGroupStatus','mapped') WHERE physical_row_no=2"); + jdbc.update("UPDATE fact_black SET components=JSON_SET(components,'$.sourceCustomerCode','002') WHERE physical_row_no=3"); + seed("black",black,4,"A","G",3,1); + jdbc.update("UPDATE fact_black SET components=JSON_SET(components,'$.projectGroupStatus','mapped_null') WHERE physical_row_no=4"); + rollups.refreshBuild(black);rollups.refreshBuild(bright); + var pending=new LinkedHashMap(pending());pending.put("target","projectGroup");pending.put("value","NEW_PROJECT");pending.put("conditions",List.of(Map.of("field","客户代码","operator","EQUALS","value","001"),Map.of("field","@group","operator","EQUALS","value","G"))); + var candidate=new TransactionTemplate(new DataSourceTransactionManager(dataSource)).execute(status->new UnclassifiedMappingRebuild(jdbc,json,worker,rollups).create(UUID.randomUUID().toString(),parent,"new-map","rule",Map.of("matchRules",List.of(pending)),List.of(pending),actor)); + assertEquals(2,candidate.scannedRows());assertEquals(2,candidate.classifiedRows()); + assertEquals("KEEP",jdbc.queryForObject("SELECT f.project_group FROM fact_black f JOIN release_member m ON m.transform_build_id=f.build_id WHERE m.release_id=? AND f.physical_row_no=2",String.class,candidate.releaseId())); + assertEquals(2,jdbc.queryForObject("SELECT COUNT(*) FROM fact_black f JOIN release_member m ON m.transform_build_id=f.build_id WHERE m.release_id=? AND f.project_group IS NULL",Integer.class,candidate.releaseId())); + for(String stage:List.of("black","bright")){ + assertEquals("NEW_PROJECT",jdbc.queryForObject("SELECT f.project_group FROM fact_"+stage+" f JOIN release_member m ON m.transform_build_id=f.build_id WHERE m.release_id=? AND f.physical_row_no=1",String.class,candidate.releaseId())); + assertEquals(0,jdbc.queryForObject("SELECT COUNT(*) FROM fact_"+stage+" n JOIN release_member m ON m.transform_build_id=n.build_id JOIN fact_"+stage+" o ON o.build_id=? AND o.sheet_name=n.sheet_name AND o.physical_row_no=n.physical_row_no WHERE m.release_id=? AND NOT(n.group_name<=>o.group_name AND n.raw_values<=>o.raw_values AND n.total_weight<=>o.total_weight AND n.scrap_weight<=>o.scrap_weight AND n.qualified_weight<=>o.qualified_weight)",Integer.class,stage.equals("black")?black:bright,candidate.releaseId())); + } + verify(worker,never()).execute(anyString());verify(worker,never()).loadMappings(anyString(),anyString(),anyInt(),anyInt()); + assertEquals(0,jdbc.queryForObject("SELECT COUNT(*) FROM metric_rollup r JOIN release_member m ON m.transform_build_id=r.build_id WHERE m.release_id=? AND r.project_group='NEW_PROJECT' AND r.source_row_count<>1",Integer.class,candidate.releaseId())); + } + @Test void assigningBusinessGroupDoesNotReplaceAnAlreadyAssignedProject(){ + jdbc.update("UPDATE fact_black SET project_group='KEEP',components=JSON_SET(components,'$.projectGroup','KEEP','$.projectGroupStatus','mapped') WHERE physical_row_no=1");rollups.refreshBuild(black); + var candidate=run(rollups); + assertEquals("KEEP",jdbc.queryForObject("SELECT f.project_group FROM fact_black f JOIN release_member m ON m.transform_build_id=f.build_id WHERE m.release_id=? AND f.physical_row_no=1",String.class,candidate.releaseId())); + } + } diff --git a/backend/src/test/java/cn/yunsheng/quality/ingestion/UnclassifiedMappingScopeTest.java b/backend/src/test/java/cn/yunsheng/quality/ingestion/UnclassifiedMappingScopeTest.java index 8311d59..fc90b5e 100644 --- a/backend/src/test/java/cn/yunsheng/quality/ingestion/UnclassifiedMappingScopeTest.java +++ b/backend/src/test/java/cn/yunsheng/quality/ingestion/UnclassifiedMappingScopeTest.java @@ -11,4 +11,11 @@ class UnclassifiedMappingScopeTest { assertThrows(IllegalArgumentException.class,()->UnclassifiedMappingRebuild.changedRules(after,Map.of("categoryLookup",before.get("categoryLookup"),"matchRules",List.of(rule(false))))); assertTrue(UnclassifiedMappingRebuild.unchanged(Map.of(),Map.of("matchRules",ConfigurableMatchRules.defaultRules()))); } + @Test void projectRulesUseIncrementalPathAndCannotBeDowngraded(){ + var project=new LinkedHashMap(rule(true));project.put("target","projectGroup");project.put("conditions",List.of(Map.of("field","客户代码","operator","EQUALS","value","001"),Map.of("field","@group","operator","EQUALS","value","G"))); + var before=Map.of("matchRules",List.of());var after=Map.of("matchRules",List.of(project)); + assertEquals(List.of(project),UnclassifiedMappingRebuild.changedRules(before,after)); + var ordinary=new LinkedHashMap<>(project);ordinary.put("onlyUnclassified",false);assertThrows(IllegalArgumentException.class,()->UnclassifiedMappingRebuild.changedRules(after,Map.of("matchRules",List.of(ordinary)))); + } + } diff --git a/web/src/ClassificationRuleEditor.tsx b/web/src/ClassificationRuleEditor.tsx index 5c594ac..67f61bf 100644 --- a/web/src/ClassificationRuleEditor.tsx +++ b/web/src/ClassificationRuleEditor.tsx @@ -21,7 +21,7 @@ export function ClassificationRuleEditor({ children, onUnauthorized }: { const [busy,setBusy]=useState(false);const [error,setError]=useState('');const revision=useRef(0); const resetPreview=()=>{revision.current++;setPreview(null);setError('');}; const open=(next:ClassificationSelection)=>{ - setSelection(next);setConditions(classificationConditions(next.row));setStage('all');setTarget(next.kind==='projectGroup'?String((context?.definition.projectGroupLookup as Record|undefined)?.[String(next.row.sourceKey)]??''):'');setName('');resetPreview(); + setSelection(next);setConditions(classificationConditions(next.row));setStage('all');setTarget('');setName('');resetPreview(); }; const validate=()=>{ if(!context?.ready||!selection)throw new Error('请等待当前配置读取完成'); @@ -31,17 +31,17 @@ export function ClassificationRuleEditor({ children, onUnauthorized }: { const generation=++revision.current;setError('');setPreview(null); try{ validate();setBusy(true); - const result=await api.previewClassification({stage,target:target.trim(),conditions}); + const result=await api.previewClassification({kind:project?'projectGroup':'group',stage,target:target.trim(),conditions:project?[{field:'客户代码',operator:'EQUALS',value:String(selection?.row.customerCode)},{field:'@group',operator:'EQUALS',value:String(selection?.row.businessGroup)}]:conditions}); if(generation===revision.current)setPreview(result); }catch(value){if(generation===revision.current&&!onUnauthorized(value))setError(value instanceof Error?value.message:'影响预览失败');} finally{if(generation===revision.current)setBusy(false);} }; const save=()=>{ - try{if(!project&&!preview)throw new Error('请先预览当前条件的影响范围');const definition=validate();context!.update(definition);setSelection(null);message.success(project?'对应关系已加入当前编辑,保存并更新报表后生效':'规则已加入条件匹配,保存并更新报表后统一生效');} + try{if(!preview)throw new Error('请先预览当前条件的影响范围');const definition=validate();context!.update(definition);setSelection(null);message.success('规则已加入条件匹配,保存并更新报表后统一生效');} catch(value){setError(value instanceof Error?value.message:'规则保存失败');} }; return <>{children(open)}{revision.current++;setBusy(false);setSelection(null);}}> {project?

客户代码 {String(selection?.row.customerCode)} · 业务分组 {String(selection?.row.businessGroup)}

:<>
@@ -59,11 +59,11 @@ export function ClassificationRuleEditor({ children, onUnauthorized }: {
)}} - {!project&&
只处理未分类记录,覆盖全部月份和来源文件;已有分类保持不动。
} +
只处理未分类记录,覆盖全部月份和来源文件;已有分类保持不动。
{error&&} {preview&&
命中 {Number(preview.matchedRows).toLocaleString()} 行总重量 {Number(preview.totalWeight).toLocaleString()} kg0?'orange':'default'}>当前归属不同 {Number(preview.changedRows).toLocaleString()} 行 JSON.stringify([row.stage,row.department,row.month,row.currentGroup])} dataSource={(preview.items??[]) as Record[]} - columns={[{title:'阶段',dataIndex:'stage',render:value=>value==='black'?'黑片':'亮片'},{title:'产业部',dataIndex:'department'},{title:'月份',dataIndex:'month'},{title:'当前业务分组',dataIndex:'currentGroup',render:value=>value||'未分类'},{title:'行数',dataIndex:'rowCount',align:'right'},{title:'目标业务分组',render:()=>target}]}/> + columns={[{title:'阶段',dataIndex:'stage',render:value=>value==='black'?'黑片':'亮片'},{title:'产业部',dataIndex:'department'},{title:'月份',dataIndex:'month'},{title:project?'当前项目组':'当前业务分组',dataIndex:'currentGroup',render:value=>value||'未分类'},{title:'行数',dataIndex:'rowCount',align:'right'},{title:project?'目标项目组':'目标业务分组',render:()=>target}]}/> } ; } diff --git a/web/src/ManagementPages.tsx b/web/src/ManagementPages.tsx index 3331eef..c59cd98 100644 --- a/web/src/ManagementPages.tsx +++ b/web/src/ManagementPages.tsx @@ -742,7 +742,6 @@ function MappingIssueResolutionPanel({ onUnauthorized, onEdit }: { onUnauthorize const [items, setItems] = useState[]>([]); const [total, setTotal] = useState(0); const [page, setPage] = useState(1); - const [status, setStatus] = useState('OPEN'); const [customerCode, setCustomerCode] = useState(); const [businessGroup, setBusinessGroup] = useState(); const [department, setDepartment] = useState(); @@ -752,15 +751,15 @@ function MappingIssueResolutionPanel({ onUnauthorized, onEdit }: { onUnauthorize const [error, setError] = useState(''); const { refreshKey } = usePageCache(); - const pages = useRef(new Map>()); + const pages = useRef(new Map>()); const load = async (force = false) => { const revision = ++loadRevision.current; - const key = JSON.stringify([refreshKey, page, status, customerCode, businessGroup, department]); + const key = JSON.stringify([refreshKey, page, customerCode, businessGroup, department]); if (force) pages.current.clear(); setLoading(true); - let request: ReturnType | undefined; + let request: ReturnType | undefined; try { - request = pages.current.get(key) ?? api.mappingIssues({ status: status || undefined, page, pageSize: TABLE_PAGE_SIZE, customerCode, businessGroup, department, mappingType: 'PROJECT_GROUP' }); + request = pages.current.get(key) ?? api.unclassifiedProjects({ page, pageSize: TABLE_PAGE_SIZE, customerCode, businessGroup, department }); pages.current.set(key, request); if (pages.current.size > 12) pages.current.delete(pages.current.keys().next().value!); const result = await request; @@ -771,7 +770,7 @@ function MappingIssueResolutionPanel({ onUnauthorized, onEdit }: { onUnauthorize } catch (value) { if (pages.current.get(key) === request) pages.current.delete(key); if (revision === loadRevision.current && !onUnauthorized(value)) setError(apiMessage(value)); } finally { if (revision === loadRevision.current) setLoading(false); } }; - useEffect(() => { void load(); }, [page, status, customerCode, businessGroup, department]); + useEffect(() => { void load(); }, [page, customerCode, businessGroup, department]); const columns: ColumnsType> = [ { title: '客户代码', dataIndex: 'customerCode', key: 'customerCode', fixed: 'left', width: 120, render: toText }, { title: '业务分组', dataIndex: 'businessGroup', key: 'businessGroup', width: 190, render: toText }, @@ -780,19 +779,19 @@ function MappingIssueResolutionPanel({ onUnauthorized, onEdit }: { onUnauthorize { title: '涉及行数', dataIndex: 'rowCount', key: 'rowCount', align: 'right', width: 110 }, { title: '涉及总重量', dataIndex: 'totalWeight', key: 'totalWeight', align: 'right', width: 130 }, { title: '问题期间', key: 'periods', width: 170, render: (_, row) => { const details = row.details && typeof row.details === 'object' ? row.details as Record : {}; return Array.isArray(details.periods) ? (details.periods as unknown[]).map(toText).join('、') : '—'; } }, - { title: '状态', dataIndex: 'status', key: 'status', width: 120, render: value => {toText(value)} }, + { title: '状态', dataIndex: 'status', key: 'status', width: 120, render: value => {value==='OPEN'?'待处理':toText(value)} }, { title: '操作', key: 'action', width: 120, fixed: 'right', render: (_, row) => }, ]; useMaintenanceRefresh(() => { void load(true); }); return
{error && } -
项目组未分类汇总
共 {total} 条
({ label: value, value }))} onChange={value => { setCustomerCode(value); setPage(1); }} /> ({ label: value, value }))} onChange={value => { setDepartment(value); setPage(1); }} /> -
{loading ?
正在读取未命中问题…
: items.length ?
String(row.id)} pagination={false} indexOffset={(page - 1) * TABLE_PAGE_SIZE} scroll={{ x: 1320 }} /> : }{total > TABLE_PAGE_SIZE && `共 ${count} 条问题`} onChange={setPage} />} + {loading ?
正在读取未命中问题…
: items.length ?
String(row.id)} pagination={false} indexOffset={(page - 1) * TABLE_PAGE_SIZE} scroll={{ x: 1320 }} /> : }{total > TABLE_PAGE_SIZE && `共 ${count} 条问题`} onChange={setPage} />} ; } @@ -919,7 +918,7 @@ function TaskTable({ items, importOnly, user, onUnauthorized, onRefresh }: { ite { title: '处理阶段', dataIndex: 'stage', key: 'stage', width: 150 }, { title: importOnly ? '进度' : '进度', dataIndex: 'progress', key: 'progress', width: 145, align: 'right', render: value => importOnly ? `${toText(value)}%` : toText(value) }, { title: '已处理 / 总数', key: 'processed', width: 140, align: 'right', render: (_, row) => `${toText(row.processed)} / ${toText(row.total)}` }, - { title: '错误码', dataIndex: 'errorCode', key: 'errorCode', width: 150, render: value => value ? {toText(value)} : '—' }, + { title: '错误码', dataIndex: 'errorCode', key: 'errorCode', width: 150, render: value => value ? {value==='OPEN'?'待处理':toText(value)} : '—' }, { title: '错误信息', dataIndex: 'errorMessage', key: 'errorMessage', width: 300, ellipsis: true, render: value => value ? {toText(value)} : '—' }, { title: '创建时间', dataIndex: 'createdAt', key: 'createdAt', width: 205 }, { title: '操作', key: 'detail', fixed: 'right', width: importOnly ? 240 : 150, align: 'center', render: (_, row) => diff --git a/web/src/StructuredConfigEditors.tsx b/web/src/StructuredConfigEditors.tsx index 6d8a7e5..7bddcd2 100644 --- a/web/src/StructuredConfigEditors.tsx +++ b/web/src/StructuredConfigEditors.tsx @@ -268,7 +268,7 @@ export function MatchRulesDefinitionEditor({ value, onChange, metadata, readOnly { title: '判断值', render: (_, condition, index) => ['IS_BLANK', 'IS_NOT_BLANK'].includes(condition.operator) ? 无需填写 : setEditing({ ...editing, conditions: editing.conditions.map((row, rowIndex) => rowIndex === index ? { ...row, value: event.target.value } : row) })} /> }, { title: '', width: 82, render: (_, __, index) => }, ]} /> - rule.id===editing.id && rule.onlyUnclassified===true)} checkedChildren="仅未分类" unCheckedChildren="全部匹配行" onChange={onlyUnclassified=>setEditing({...editing,onlyUnclassified})}/>
setEditing({ ...editing, value: event.target.value })} placeholder="例如:工业电机-VCM" />
+ rule.id===editing.id && rule.onlyUnclassified===true)} checkedChildren="仅未分类" unCheckedChildren="全部匹配行" onChange={onlyUnclassified=>setEditing({...editing,onlyUnclassified})}/>
setEditing({ ...editing, value: event.target.value })} placeholder="例如:工业电机-VCM" />
{error && } } diff --git a/web/src/api.ts b/web/src/api.ts index fb43c87..c480a32 100644 --- a/web/src/api.ts +++ b/web/src/api.ts @@ -243,9 +243,12 @@ export const api = { return request(`/api/import-runs/${encodeURIComponent(id)}/issues?page=${page}&pageSize=${pageSize}`); }, classificationMetadata() { return request<{ defaultRules: unknown[] }>('/api/governance/mapping-issues/classification-metadata'); }, - previewClassification(body: {stage:string;target:string;conditions:{field:string;operator:string;value:string}[]}) { + previewClassification(body: {kind?:'group'|'projectGroup';stage:string;target:string;conditions:{field:string;operator:string;value:string}[]}) { return queryPost>('/api/governance/mapping-issues/classification-preview',body); }, + unclassifiedProjects(params: {page:number;pageSize:number;customerCode?:string;businessGroup?:string;department?:string}) { + return request(`/api/governance/mapping-issues/unclassified-projects?${toQuery(params)}`); + }, unclassifiedSources(page = 1, pageSize = 50) { return request(`/api/governance/mapping-issues/unclassified?${toQuery({ page, pageSize })}`); }, diff --git a/web/src/classificationMaintenance.ts b/web/src/classificationMaintenance.ts index b05798e..6d7b1e6 100644 --- a/web/src/classificationMaintenance.ts +++ b/web/src/classificationMaintenance.ts @@ -32,11 +32,15 @@ export function editClassification(base: Definition, selection: ClassificationSe if (Array.isArray(catalog) && !catalog.some(item => item.name === target && item.enabled === true)) throw new Error('目标分类未登记或已停用,请先在基础数据中维护'); if (kind === 'projectGroup') { if (row.mappingType !== 'PROJECT_GROUP' || !text(row.customerCode) || !text(row.businessGroup) || row.sourceKey !== `${row.customerCode}|${row.businessGroup}`) throw new Error('客户代码或业务分组缺失'); - result.projectGroupLookup = { ...(result.projectGroupLookup as Definition ?? {}), [text(row.sourceKey)]: target }; - const disabled = result.disabledMappings as Definition | undefined; - if (disabled && Array.isArray(disabled.projectGroupLookup)) disabled.projectGroupLookup = disabled.projectGroupLookup.filter(key => key !== row.sourceKey); - // Remove an interval override only when it would mask this explicit edit: require dedicated maintenance instead. - if (Array.isArray(result.effectiveRanges) && result.effectiveRanges.some((raw: unknown) => { const range = raw as Definition; return range.mappingType === 'PROJECT_GROUP' && range.sourceKey === row.sourceKey; })) throw new Error('此分类有期间规则,请在对应关系草稿中修改有效期后再保存'); + const conditions:ClassificationCondition[]=[{field:'客户代码',operator:'EQUALS',value:text(row.customerCode)},{field:'@group',operator:'EQUALS',value:text(row.businessGroup)}]; + const rules=Array.isArray(result.matchRules)?result.matchRules as Definition[]:structuredClone(defaultRules) as Definition[]; + const signature=classificationSignature('all',conditions); + const same=rules.find(rule=>rule.target==='projectGroup'&&classificationSignature(String(rule.stage),rule.conditions as ClassificationCondition[])===signature); + if(same&&same.value!==target&&same.enabled!==false)throw new Error(`相同条件已指向“${String(same.value)}”,请在条件匹配中编辑已有规则`); + const id=same?.id?String(same.id):'project-'+classificationRuleId(row,{stage:'all',conditions}); + if(rules.some(rule=>rule.id===id&&(rule.target!=='projectGroup'||classificationSignature(String(rule.stage),rule.conditions as ClassificationCondition[])!==signature)))throw new Error('规则标识冲突,请在条件匹配中维护'); + result.matchRules=[{id,name:`${target}项目组分类规则`,enabled:true,onlyUnclassified:true,priority:-9890,stage:'all',conditions,target:'projectGroup',value:target},...rules.filter(rule=>rule.id!==id)]; + if((result.matchRules as unknown[]).length>100)throw new Error('条件规则已满100条,请先整理规则'); } else { if (!['black','bright'].includes(text(row.stage))) throw new Error('来源阶段无效'); const conditions = options.conditions ?? classificationConditions(row); diff --git a/web/src/configurationWorkbook.ts b/web/src/configurationWorkbook.ts index 8feea69..4f3f408 100644 --- a/web/src/configurationWorkbook.ts +++ b/web/src/configurationWorkbook.ts @@ -105,7 +105,7 @@ export function importConfigurationTables(base:Definition,tables:ConfigurationTa if(!/^[A-Za-z0-9][A-Za-z0-9_-]{0,63}$/.test(id)||!name||!value||name.length>200||value.length>200)throw new Error(`条件匹配第${n+2}行规则编号、名称或目标分类无效`); if(!STAGES[stage]||!TARGETS[target]||!OPERATORS[operator]||!field||(field.startsWith('@')&&!Object.hasOwn(FIELDS,field))||field.length>200||(!['IS_BLANK','IS_NOT_BLANK'].includes(operator)&&!conditionValue)||conditionValue.length>200)throw new Error(`条件匹配第${n+2}行条件无效`); if(['IS_BLANK','IS_NOT_BLANK'].includes(operator)&&conditionValue)throw new Error(`条件匹配第${n+2}行空值判断不应填写判断值`); - const prior=previous.find(rule=>rule.id===id);const scope=enabled(unclassifiedOnly,false);const metadata={id,name,priority:number(priority,'优先级',-10000,10000),stage,target,value,enabled:enabled(status),...(scope||Object.hasOwn(prior??{},'onlyUnclassified')?{onlyUnclassified:scope}:{})};if(scope&&target!=='group')throw new Error('仅未分类只适用于业务分组规则'); + const prior=previous.find(rule=>rule.id===id);const scope=enabled(unclassifiedOnly,false);const metadata={id,name,priority:number(priority,'优先级',-10000,10000),stage,target,value,enabled:enabled(status),...(scope||Object.hasOwn(prior??{},'onlyUnclassified')?{onlyUnclassified:scope}:{})};if(scope&&!['group','projectGroup'].includes(target))throw new Error('仅未分类只适用于业务分组和项目组规则'); const row=byId.get(id);if(row&&!equal({...row,conditions:undefined},{...metadata,conditions:undefined}))throw new Error(`规则${id}各行的名称、目标、优先级或状态不一致`); const rule=row??{...metadata,conditions:[]};const conditions=rule.conditions as Definition[];const order=number(position,'条件序号',1,20); if(conditions.some(c=>c.order===order))throw new Error(`规则${id}条件序号重复`);conditions.push({order,field,operator,value:conditionValue});byId.set(id,rule); diff --git a/web/src/useDataWorkflowOperation.ts b/web/src/useDataWorkflowOperation.ts index 4181b4a..3e28626 100644 --- a/web/src/useDataWorkflowOperation.ts +++ b/web/src/useDataWorkflowOperation.ts @@ -1,5 +1,6 @@ import { useCallback, useEffect, useRef, useState } from 'react'; import { api } from './api'; +import { WORKSPACE_INVALIDATED } from './pageCache'; import type { DataWorkflowOperation } from './NoCodeDataTypes'; type StoredOperation = { operationId: string; startedAt: string }; @@ -39,7 +40,7 @@ export function useDataWorkflowOperation(slot: string, onComplete?: (value: Data setOperation(current); const status = String(current.status || '').toUpperCase(); if (status === 'COMPLETED' || status === 'FAILED') { - if (status === 'COMPLETED') { savePendingId(null); callbackRef.current?.(current); } + if (status === 'COMPLETED') { savePendingId(null); window.dispatchEvent(new Event(WORKSPACE_INVALIDATED)); callbackRef.current?.(current); } else setError(operationError(current)); return; } diff --git a/web/verification/classification_maintenance.test.mjs b/web/verification/classification_maintenance.test.mjs index 3c63a4e..19a44bf 100644 --- a/web/verification/classification_maintenance.test.mjs +++ b/web/verification/classification_maintenance.test.mjs @@ -23,22 +23,22 @@ test('blank-key source creates a narrowly scoped rule and preserves inherited de test('successive group and project edits accumulate without replacing other mappings or explicit empty rules',()=>{ let result=editClassification({matchRules:[],categoryLookup:{keep:'category'}},selection,'G',defaults); result=editClassification(result,{kind:'projectGroup',row:{mappingType:'PROJECT_GROUP',customerCode:'001',businessGroup:'G',sourceKey:'001|G'}},'P',defaults); - assert.equal(result.projectGroupLookup['001|G'],'P');assert.equal(result.matchRules.length,1);assert.deepEqual(result.categoryLookup,{keep:'category'}); + assert.equal(result.projectGroupLookup,undefined);assert.equal(result.matchRules.length,2);assert.equal(result.matchRules[0].target,'projectGroup');assert.equal(result.matchRules[0].onlyUnclassified,true);assert.deepEqual(result.categoryLookup,{keep:'category'}); assert.throws(()=>editClassification(result,selection,' ',defaults)); assert.throws(()=>editClassification(result,{kind:'projectGroup',row:{customerCode:'001',businessGroup:'G',sourceKey:'002|G'}},'P',defaults)); }); test('interval overrides and conflicting rule identities cannot silently mask a classification edit',()=>{ const project={kind:'projectGroup',row:{mappingType:'PROJECT_GROUP',customerCode:'001',businessGroup:'G',sourceKey:'001|G'}}; - assert.throws(()=>editClassification({effectiveRanges:[{mappingType:'PROJECT_GROUP',sourceKey:'001|G'}]},project,'P',[]),/期间规则/); + const ranges=[{mappingType:'PROJECT_GROUP',sourceKey:'001|G'}];assert.deepEqual(editClassification({effectiveRanges:ranges},project,'P',[]).effectiveRanges,ranges); const id=classificationRuleId(source); assert.throws(()=>editClassification({matchRules:[{id,stage:'bright',conditions:[]}]},selection,'G',[]),/冲突/); }); -test('editing a disabled project relationship enables only that relationship and rejects unavailable targets',()=>{ +test('project maintenance creates only-unclassified rules without changing disabled lookups or existing classifications',()=>{ const selection={kind:'projectGroup',row:{mappingType:'PROJECT_GROUP',customerCode:'001',businessGroup:'G',sourceKey:'001|G'}}; const base={masterData:{projectGroups:[{code:'P',name:'项目组A',enabled:true}]},disabledMappings:{projectGroupLookup:['001|G','002|G']}}; const result=editClassification(base,selection,'项目组A',[]); - assert.deepEqual(result.disabledMappings.projectGroupLookup,['002|G']); + assert.deepEqual(result.disabledMappings.projectGroupLookup,['001|G','002|G']);assert.equal(result.matchRules[0].onlyUnclassified,true);assert.equal(result.matchRules[0].target,'projectGroup');assert.deepEqual(result.matchRules[0].conditions,[{field:'客户代码',operator:'EQUALS',value:'001'},{field:'@group',operator:'EQUALS',value:'G'}]);assert.equal(editClassification(result,selection,'项目组A',[]).matchRules.length,1); assert.deepEqual(base.disabledMappings.projectGroupLookup,['001|G','002|G']); assert.throws(()=>editClassification(base,selection,'不存在的项目组',[]),/未登记/); }); diff --git a/web/verification/configuration_workbook.test.mjs b/web/verification/configuration_workbook.test.mjs index 13297cd..8007e3d 100644 --- a/web/verification/configuration_workbook.test.mjs +++ b/web/verification/configuration_workbook.test.mjs @@ -51,3 +51,9 @@ test('legacy twelve-column workbooks preserve the existing unclassified-only res const tables=configurationTables(base,'matchRules');tables[0].headers.pop();tables[0].rows.forEach(row=>row.pop()); for(const mode of ['MERGE','REPLACE'])assert.equal(importConfigurationTables(base,tables,'matchRules',mode).definition.matchRules[0].onlyUnclassified,true); }); + + test('project unclassified-only rules retain their scope and customer codes through Excel',async()=>{ + const projectRule={...rule,target:'projectGroup',conditions:[{field:'客户代码',operator:'EQUALS',value:'00001'},{field:'@group',operator:'EQUALS',value:'G'}]};const source={matchRules:[projectRule]}; + const workbook=await createConfigurationWorkbook(source,'matchRules');const tables=await readConfigurationWorkbook(await workbook.xlsx.writeBuffer()); + assert.deepEqual(importConfigurationTables(source,tables,'matchRules','REPLACE').definition,source); + }); diff --git a/web/verification/workflow_completion_refresh.test.mjs b/web/verification/workflow_completion_refresh.test.mjs new file mode 100644 index 0000000..c8d30aa --- /dev/null +++ b/web/verification/workflow_completion_refresh.test.mjs @@ -0,0 +1,32 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import {readFileSync} from 'node:fs'; +import ts from 'typescript'; + +const source=ts.transpileModule(readFileSync(new URL('../src/useDataWorkflowOperation.ts',import.meta.url),'utf8'),{compilerOptions:{target:ts.ScriptTarget.ES2022,module:ts.ModuleKind.ESNext}}).outputText.replace(/^import .*;\n/gm,'').replace(/export /g,''); +const tick=()=>new Promise(resolve=>setImmediate(resolve)); +const deferred=()=>{let resolve;const promise=new Promise(done=>{resolve=done;});return{promise,resolve};}; + +test('the actual workflow hook refreshes retained data after completion, rather than while work is pending',async()=>{ + const final=deferred(),events=[],callbacks=[],storage=new Map();let calls=0; + const window={localStorage:storage,setTimeout:fn=>setImmediate(fn),dispatchEvent:event=>events.push(event.type)}; + const localStorage={getItem:key=>storage.get(key)??null,setItem:(key,value)=>storage.set(key,value),removeItem:key=>storage.delete(key)}; + const api={dataWorkflowOperation:async()=>++calls===1?{operationId:'job',status:'RUNNING'}:final.promise}; + const hooks={useState:value=>[value,()=>{}],useRef:current=>({current}),useCallback:fn=>fn,useEffect:fn=>{fn();}}; + const load=new Function('api','window','localStorage','WORKSPACE_INVALIDATED','hooks',`const {useState,useRef,useCallback,useEffect}=hooks;${source};return useDataWorkflowOperation;`); + const hook=load(api,window,localStorage,'quality-workspace-invalidated',hooks)('project',value=>callbacks.push(value)); + await hook.start(async()=>({operationId:'job',status:'QUEUED'}));await tick();await tick(); + assert.equal(calls,2);assert.deepEqual(events,[]);assert.equal(storage.size,1); + final.resolve({operationId:'job',status:'COMPLETED',currentReleaseId:'new-release'});await tick(); + assert.deepEqual(events,['quality-workspace-invalidated']);assert.equal(callbacks[0].currentReleaseId,'new-release');assert.equal(storage.size,0); +}); + +test('failed work never refreshes retained data as though a new version had been published',async()=>{ + const events=[],callbacks=[];const api={dataWorkflowOperation:async()=>({operationId:'job',status:'FAILED',errors:[{message:'rejected'}]})}; + const hooks={useState:value=>[value,()=>{}],useRef:current=>({current}),useCallback:fn=>fn,useEffect:fn=>{fn();}}; + const localStorage={getItem:()=>null,setItem:()=>{},removeItem:()=>{}}; + const window={setTimeout:fn=>setImmediate(fn),dispatchEvent:event=>events.push(event.type)}; + const load=new Function('api','window','localStorage','WORKSPACE_INVALIDATED','hooks',`const {useState,useRef,useCallback,useEffect}=hooks;${source};return useDataWorkflowOperation;`); + const hook=load(api,window,localStorage,'quality-workspace-invalidated',hooks)('project',value=>callbacks.push(value)); + await hook.start(async()=>({operationId:'job',status:'QUEUED'}));await tick();assert.deepEqual(events,[]);assert.deepEqual(callbacks,[]); +});