diff --git a/.github/scripts/test_update_dependency_changes.py b/.github/scripts/test_update_dependency_changes.py new file mode 100644 index 0000000000..f8cf0100f3 --- /dev/null +++ b/.github/scripts/test_update_dependency_changes.py @@ -0,0 +1,406 @@ +#!/usr/bin/env python3 +""" +Comprehensive test suite for update_dependency_changes.py + +Tests cover: +- Basic update/add/remove scenarios +- Version revert scenarios +- Complex multi-step change sequences +- Edge cases and duplicate operations +- Document format validation +""" + +import sys +import os +sys.path.insert(0, os.path.dirname(__file__)) + +from update_dependency_changes import merge_changes, render_section + + +def test_update_then_revert(): + """Test: PR1 updates A->B, PR2 reverts B->A. Should be removed.""" + print("Test 1: Update then revert") + existing = ( + {"PackageA": ("1.0.0", "2.0.0", "#1")}, # updated + {}, # added + {} # removed + ) + new = ( + {"PackageA": ("2.0.0", "1.0.0", "#2")}, # updated back + {}, + {} + ) + updated, added, removed = merge_changes(existing, new) + assert "PackageA" not in updated, f"Expected PackageA removed, got: {updated}" + assert len(added) == 0 and len(removed) == 0 + print("✓ Passed: Package correctly removed from updates\n") + + +def test_add_then_remove_same_version(): + """Test: PR1 adds v1.0, PR2 removes v1.0. Should be completely removed.""" + print("Test 2: Add then remove same version") + existing = ( + {}, + {"PackageB": ("1.0.0", "#1")}, # added + {} + ) + new = ( + {}, + {}, + {"PackageB": ("1.0.0", "#2")} # removed + ) + updated, added, removed = merge_changes(existing, new) + assert "PackageB" not in added, f"Expected PackageB removed from added, got: {added}" + assert "PackageB" not in removed, f"Expected PackageB removed from removed, got: {removed}" + assert "PackageB" not in updated + print("✓ Passed: Package correctly removed from all sections\n") + + +def test_remove_then_add_same_version(): + """Test: PR1 removes v1.0, PR2 adds v1.0. Should be removed.""" + print("Test 3: Remove then add same version") + existing = ( + {}, + {}, + {"PackageC": ("1.0.0", "#1")} # removed + ) + new = ( + {}, + {"PackageC": ("1.0.0", "#2")}, # added back + {} + ) + updated, added, removed = merge_changes(existing, new) + assert "PackageC" not in updated, f"Expected PackageC removed from updated, got: {updated}" + assert "PackageC" not in added, f"Expected PackageC removed from added, got: {added}" + assert "PackageC" not in removed, f"Expected PackageC removed from removed, got: {removed}" + print("✓ Passed: Package correctly removed from all sections\n") + + +def test_add_then_remove_different_version(): + """Test: PR1 adds v1.0, PR2 removes v2.0. Should show as removed v2.0.""" + print("Test 4: Add then remove different version") + existing = ( + {}, + {"PackageD": ("1.0.0", "#1")}, # added + {} + ) + new = ( + {}, + {}, + {"PackageD": ("2.0.0", "#2")} # removed different version + ) + updated, added, removed = merge_changes(existing, new) + assert "PackageD" not in added, f"Expected PackageD removed from added, got: {added}" + assert "PackageD" in removed, f"Expected PackageD in removed, got: {removed}" + assert removed["PackageD"][0] == "2.0.0", f"Expected version 2.0.0, got: {removed['PackageD']}" + print(f"✓ Passed: Package correctly tracked as removed with version {removed['PackageD'][0]}\n") + + +def test_update_in_added(): + """Test: PR1 adds v1.0, PR2 updates to v2.0. Should show as updated 1.0->2.0.""" + print("Test 5: Update a package that was added") + existing = ( + {}, + {"PackageE": ("1.0.0", "#1")}, # added + {} + ) + new = ( + {"PackageE": ("1.0.0", "2.0.0", "#2")}, # updated + {}, + {} + ) + updated, added, removed = merge_changes(existing, new) + assert "PackageE" not in added, f"Expected PackageE removed from added, got: {added}" + assert "PackageE" in updated, f"Expected PackageE in updated, got: {updated}" + assert updated["PackageE"] == ("1.0.0", "2.0.0", "#1, #2"), \ + f"Expected ('1.0.0', '2.0.0', '#1, #2'), got: {updated['PackageE']}" + print(f"✓ Passed: Package correctly converted to updated: {updated['PackageE']}\n") + + +def test_multiple_updates(): + """Test: PR1 updates A->B, PR2 updates B->C. Should show A->C.""" + print("Test 6: Multiple updates") + existing = ( + {"PackageF": ("1.0.0", "2.0.0", "#1")}, # updated + {}, + {} + ) + new = ( + {"PackageF": ("2.0.0", "3.0.0", "#2")}, # updated again + {}, + {} + ) + updated, added, removed = merge_changes(existing, new) + assert "PackageF" in updated + assert updated["PackageF"] == ("1.0.0", "3.0.0", "#1, #2"), \ + f"Expected ('1.0.0', '3.0.0', '#1, #2'), got: {updated['PackageF']}" + print(f"✓ Passed: Package correctly shows full range: {updated['PackageF']}\n") + + +def test_multiple_updates_back_to_original(): + """Test: PR1 updates 1->2, PR2 updates 2->3, PR3 updates 3->1. Should be removed.""" + print("Test 7: Multiple updates ending back at original version") + # Simulate PR1 and PR2 already merged + existing = ( + {"PackageG": ("1.0.0", "3.0.0", "#1, #2")}, # updated through PR1 and PR2 + {}, + {} + ) + # PR3 changes back to 1.0.0 + new = ( + {"PackageG": ("3.0.0", "1.0.0", "#3")}, # updated back to original + {}, + {} + ) + updated, added, removed = merge_changes(existing, new) + assert "PackageG" not in updated, f"Expected PackageG removed, got: {updated}" + assert len(added) == 0 and len(removed) == 0 + print("✓ Passed: Package correctly removed (version returned to original)\n") + + +def test_update_remove_add_same_version(): + """Test: PR1 updates 1->2, PR2 updates 2->3, PR3 removes, PR4 adds v3. Should show updated 1->3.""" + print("Test 8: Update-Update-Remove-Add same version") + # After PR1, PR2, PR3 + existing = ( + {}, + {}, + {"PackageH": ("1.0.0", "#1, #2, #3")} # removed (original was 1.0.0) + ) + # PR4 adds back the same version that was removed + new = ( + {}, + {"PackageH": ("3.0.0", "#4")}, # added + {} + ) + updated, added, removed = merge_changes(existing, new) + assert "PackageH" in updated, f"Expected PackageH in updated, got: updated={updated}, added={added}, removed={removed}" + assert updated["PackageH"] == ("1.0.0", "3.0.0", "#1, #2, #3, #4"), \ + f"Expected ('1.0.0', '3.0.0', '#1, #2, #3, #4'), got: {updated['PackageH']}" + print(f"✓ Passed: Package correctly shows as updated: {updated['PackageH']}\n") + + +def test_update_remove_add_original_version(): + """Test: PR1 updates 1->2, PR2 updates 2->3, PR3 removes, PR4 adds v1. Should be removed.""" + print("Test 9: Update-Update-Remove-Add original version") + # After PR1, PR2, PR3 + existing = ( + {}, + {}, + {"PackageI": ("1.0.0", "#1, #2, #3")} # removed (original was 1.0.0) + ) + # PR4 adds back the original version + new = ( + {}, + {"PackageI": ("1.0.0", "#4")}, # added back to original + {} + ) + updated, added, removed = merge_changes(existing, new) + assert "PackageI" not in updated, f"Expected PackageI removed, got: updated={updated}" + assert "PackageI" not in added, f"Expected PackageI removed, got: added={added}" + assert "PackageI" not in removed, f"Expected PackageI removed, got: removed={removed}" + print("✓ Passed: Package correctly removed (added back to original version)\n") + + +def test_update_remove_add_different_version(): + """Test: PR1 updates 1->2, PR2 updates 2->3, PR3 removes, PR4 adds v4. Should show updated 1->4.""" + print("Test 10: Update-Update-Remove-Add different version") + # After PR1, PR2, PR3 + existing = ( + {}, + {}, + {"PackageJ": ("1.0.0", "#1, #2, #3")} # removed (original was 1.0.0) + ) + # PR4 adds a completely different version + new = ( + {}, + {"PackageJ": ("4.0.0", "#4")}, # added new version + {} + ) + updated, added, removed = merge_changes(existing, new) + assert "PackageJ" in updated, f"Expected PackageJ in updated, got: updated={updated}, added={added}, removed={removed}" + assert updated["PackageJ"] == ("1.0.0", "4.0.0", "#1, #2, #3, #4"), \ + f"Expected ('1.0.0', '4.0.0', '#1, #2, #3, #4'), got: {updated['PackageJ']}" + print(f"✓ Passed: Package correctly shows as updated: {updated['PackageJ']}\n") + + +def test_add_update_remove(): + """Test: PR1 adds v1, PR2 updates to v2, PR3 removes v2. Should be completely removed.""" + print("Test 11: Add-Update-Remove") + # After PR1 and PR2 + existing = ( + {"PackageK": ("1.0.0", "2.0.0", "#1, #2")}, # updated (was added in PR1, updated in PR2) + {}, + {} + ) + # PR3 removes v2 + new = ( + {}, + {}, + {"PackageK": ("2.0.0", "#3")} # removed + ) + updated, added, removed = merge_changes(existing, new) + assert "PackageK" not in updated, f"Expected PackageK removed from updated, got: {updated}" + assert "PackageK" not in added, f"Expected PackageK removed from added, got: {added}" + assert "PackageK" in removed, f"Expected PackageK in removed, got: {removed}" + # The removed should track from the original first version + assert removed["PackageK"][0] == "1.0.0", f"Expected removed from 1.0.0, got: {removed['PackageK']}" + print(f"✓ Passed: Package correctly shows as removed from original: {removed['PackageK']}\n") + + +def test_add_remove_add_same_version(): + """Test: PR1 adds v1, PR2 removes v1, PR3 adds v1 again. Should show as added v1.""" + print("Test 12: Add-Remove-Add same version") + # After PR1 and PR2 (added then removed) + existing = ( + {}, + {}, + {} # Completely removed after PR2 + ) + # PR3 adds v1 again + new = ( + {}, + {"PackageL": ("1.0.0", "#3")}, # added + {} + ) + updated, added, removed = merge_changes(existing, new) + assert "PackageL" in added, f"Expected PackageL in added, got: added={added}" + assert added["PackageL"] == ("1.0.0", "#3"), f"Expected ('1.0.0', '#3'), got: {added['PackageL']}" + print(f"✓ Passed: Package correctly shows as added: {added['PackageL']}\n") + + +def test_update_remove_remove(): + """Test: PR1 updates 1->2, PR2 removes v2, PR3 tries to remove again. Should show removed from v1.""" + print("Test 13: Update-Remove (duplicate remove)") + # After PR1 and PR2 + existing = ( + {}, + {}, + {"PackageM": ("1.0.0", "#1, #2")} # removed (original was 1.0.0) + ) + # PR3 tries to remove again (edge case, might not happen in practice) + new = ( + {}, + {}, + {"PackageM": ("1.0.0", "#3")} # removed again + ) + updated, added, removed = merge_changes(existing, new) + assert "PackageM" in removed, f"Expected PackageM in removed, got: {removed}" + # Should keep the original information + assert removed["PackageM"][0] == "1.0.0", f"Expected removed from 1.0.0, got: {removed['PackageM']}" + print(f"✓ Passed: Package correctly maintains removed state: {removed['PackageM']}\n") + + +def test_add_add(): + """Test: PR1 adds v1, PR2 adds v2 (version changed externally). Should show added v2.""" + print("Test 14: Add-Add (version changed between PRs)") + # After PR1 + existing = ( + {}, + {"PackageN": ("1.0.0", "#1")}, # added + {} + ) + # PR2 adds different version (edge case) + new = ( + {}, + {"PackageN": ("2.0.0", "#2")}, # added different version + {} + ) + updated, added, removed = merge_changes(existing, new) + assert "PackageN" in added, f"Expected PackageN in added, got: {added}" + assert added["PackageN"][0] == "2.0.0", f"Expected version 2.0.0, got: {added['PackageN']}" + print(f"✓ Passed: Package correctly shows latest added version: {added['PackageN']}\n") + + +def test_complex_chain_ending_in_original(): + """Test: Complex chain - Add v1, Update to v2, Remove, Add v2, Update to v1. Should be removed.""" + print("Test 15: Complex chain ending at nothing changed") + # After PR1 (add), PR2 (update), PR3 (remove), PR4 (add back) + existing = ( + {"PackageO": ("1.0.0", "2.0.0", "#1, #2, #3, #4")}, # Complex history + {}, + {} + ) + # PR5 updates back to v1 (original from perspective of first state) + new = ( + {"PackageO": ("2.0.0", "1.0.0", "#5")}, # back to start + {}, + {} + ) + updated, added, removed = merge_changes(existing, new) + assert "PackageO" not in updated, f"Expected PackageO removed, got: {updated}" + print(f"✓ Passed: Complex chain correctly removed when ending at original\n") + + +def test_document_format(): + """Test: Verify the document rendering format.""" + print("Test 16: Document format validation") + + updated = { + "Microsoft.Extensions.Logging": ("8.0.0", "8.0.1", "#123"), + "Newtonsoft.Json": ("13.0.1", "13.0.3", "#456, #789"), + } + + added = { + "Azure.Identity": ("1.10.0", "#567"), + } + + removed = { + "System.Text.Json": ("7.0.0", "#890"), + } + + document = render_section("9.0.0", updated, added, removed) + + # Verify document structure + assert "## 9.0.0" in document, "Version header missing" + assert "| Package | Old Version | New Version | PR |" in document, "Updated table header missing" + assert "Microsoft.Extensions.Logging" in document, "Updated package missing" + assert "**Added:**" in document, "Added section missing" + assert "Azure.Identity" in document, "Added package missing" + assert "**Removed:**" in document, "Removed section missing" + assert "System.Text.Json" in document, "Removed package missing" + + print("✓ Passed: Document format is correct") + print("\nSample output:") + print("-" * 60) + print(document) + print("-" * 60 + "\n") + + +def run_all_tests(): + """Run all test cases.""" + print("=" * 70) + print("Testing update_dependency_changes.py") + print("=" * 70 + "\n") + + test_update_then_revert() + test_add_then_remove_same_version() + test_remove_then_add_same_version() + test_add_then_remove_different_version() + test_update_in_added() + test_multiple_updates() + test_multiple_updates_back_to_original() + test_update_remove_add_same_version() + test_update_remove_add_original_version() + test_update_remove_add_different_version() + test_add_update_remove() + test_add_remove_add_same_version() + test_update_remove_remove() + test_add_add() + test_complex_chain_ending_in_original() + test_document_format() + + print("=" * 70) + print("All 16 tests passed! ✓") + print("=" * 70) + print("\nTest coverage summary:") + print(" ✓ Basic scenarios (update, add, remove)") + print(" ✓ Version revert handling") + print(" ✓ Complex multi-step sequences") + print(" ✓ Edge cases and duplicates") + print(" ✓ Document format validation") + print("=" * 70) + + +if __name__ == "__main__": + run_all_tests() diff --git a/.github/scripts/update_dependency_changes.py b/.github/scripts/update_dependency_changes.py new file mode 100644 index 0000000000..05e0019470 --- /dev/null +++ b/.github/scripts/update_dependency_changes.py @@ -0,0 +1,331 @@ +import subprocess +import re +import os +import sys +import xml.etree.ElementTree as ET + + +HEADER = "# Package Version Changes\n" +DOC_PATH = os.environ.get("DOC_PATH", "docs/en/package-version-changes.md") + + +def get_version(): + """Read the current version from common.props.""" + try: + tree = ET.parse("common.props") + root = tree.getroot() + version_elem = root.find(".//Version") + if version_elem is not None: + return version_elem.text + except FileNotFoundError: + print("Error: 'common.props' file not found.", file=sys.stderr) + except ET.ParseError as ex: + print(f"Error: Failed to parse 'common.props': {ex}", file=sys.stderr) + return None + + +def get_diff(base_ref): + """Get diff of Directory.Packages.props against the base branch.""" + result = subprocess.run( + ["git", "diff", f"origin/{base_ref}", "--", "Directory.Packages.props"], + capture_output=True, + text=True, + ) + if result.returncode != 0: + raise RuntimeError( + f"Failed to get diff for base ref 'origin/{base_ref}': {result.stderr}" + ) + return result.stdout + + +def get_existing_doc_from_base(base_ref): + """Read the existing document from the base branch.""" + result = subprocess.run( + ["git", "show", f"origin/{base_ref}:{DOC_PATH}"], + capture_output=True, + text=True, + ) + if result.returncode == 0: + return result.stdout + return "" + + +def parse_diff_packages(lines, prefix): + """Parse package versions from diff lines with the given prefix (+ or -).""" + packages = {} + # Use separate patterns to handle different attribute orders + include_pattern = re.compile(r'Include="([^"]+)"') + version_pattern = re.compile(r'Version="([^"]+)"') + for line in lines: + if line.startswith(prefix) and "PackageVersion" in line and not line.startswith(prefix * 3): + include_match = include_pattern.search(line) + version_match = version_pattern.search(line) + if include_match and version_match: + packages[include_match.group(1)] = version_match.group(1) + return packages + + +def classify_changes(old_packages, new_packages, pr_number): + """Classify diff into updated, added, and removed with PR attribution.""" + updated = {} + added = {} + removed = {} + + all_packages = sorted(set(list(old_packages.keys()) + list(new_packages.keys()))) + + for pkg in all_packages: + if pkg in old_packages and pkg in new_packages: + if old_packages[pkg] != new_packages[pkg]: + updated[pkg] = (old_packages[pkg], new_packages[pkg], pr_number) + elif pkg in new_packages: + added[pkg] = (new_packages[pkg], pr_number) + else: + removed[pkg] = (old_packages[pkg], pr_number) + + return updated, added, removed + + +def parse_existing_section(section_text): + """Parse an existing markdown section to extract package records with PR info.""" + updated = {} + added = {} + removed = {} + + mode = "updated" + for line in section_text.split("\n"): + if "**Added:**" in line: + mode = "added" + continue + if "**Removed:**" in line: + mode = "removed" + continue + if not line.startswith("|") or line.startswith("| Package") or line.startswith("|---"): + continue + + parts = [p.strip() for p in line.split("|")[1:-1]] + if mode == "updated" and len(parts) >= 3: + pr = parts[3] if len(parts) >= 4 else "" + updated[parts[0]] = (parts[1], parts[2], pr) + elif len(parts) >= 2: + pr = parts[2] if len(parts) >= 3 else "" + if mode == "added": + added[parts[0]] = (parts[1], pr) + else: + removed[parts[0]] = (parts[1], pr) + + return updated, added, removed + + +def merge_prs(existing_pr, new_pr): + """Merge PR numbers, avoiding duplicates.""" + if not existing_pr or not existing_pr.strip(): + return new_pr + if not new_pr or not new_pr.strip(): + return existing_pr + + # Parse existing PRs + existing_prs = [p.strip() for p in existing_pr.split(",") if p.strip()] + # Add new PR if not already present + if new_pr not in existing_prs: + existing_prs.append(new_pr) + return ", ".join(existing_prs) + + +def merge_changes(existing, new): + """Merge new changes into existing records for the same version.""" + ex_updated, ex_added, ex_removed = existing + new_updated, new_added, new_removed = new + + merged_updated = dict(ex_updated) + merged_added = dict(ex_added) + merged_removed = dict(ex_removed) + + for pkg, (old_ver, new_ver, pr) in new_updated.items(): + if pkg in merged_updated: + existing_old_ver, existing_new_ver, existing_pr = merged_updated[pkg] + merged_pr = merge_prs(existing_pr, pr) + merged_updated[pkg] = (existing_old_ver, new_ver, merged_pr) + elif pkg in merged_added: + existing_ver, existing_pr = merged_added[pkg] + merged_pr = merge_prs(existing_pr, pr) + # Convert added to updated since the version changed again + del merged_added[pkg] + merged_updated[pkg] = (existing_ver, new_ver, merged_pr) + else: + merged_updated[pkg] = (old_ver, new_ver, pr) + + for pkg, (ver, pr) in new_added.items(): + if pkg in merged_removed: + removed_ver, removed_pr = merged_removed.pop(pkg) + merged_pr = merge_prs(removed_pr, pr) + merged_updated[pkg] = (removed_ver, ver, merged_pr) + elif pkg in merged_added: + existing_ver, existing_pr = merged_added[pkg] + merged_pr = merge_prs(existing_pr, pr) + merged_added[pkg] = (ver, merged_pr) + else: + merged_added[pkg] = (ver, pr) + + for pkg, (ver, pr) in new_removed.items(): + if pkg in merged_added: + existing_ver, existing_pr = merged_added[pkg] + # Only delete if versions match (added then removed the same version) + if existing_ver == ver: + del merged_added[pkg] + else: + # Version changed between add and remove, convert to updated then removed + del merged_added[pkg] + merged_removed[pkg] = (ver, merge_prs(existing_pr, pr)) + elif pkg in merged_updated: + old_ver, new_ver, existing_pr = merged_updated.pop(pkg) + merged_pr = merge_prs(existing_pr, pr) + # Only keep as removed if the final state is different from original + merged_removed[pkg] = (old_ver, merged_pr) + else: + merged_removed[pkg] = (ver, pr) + + # Remove updated entries where old and new versions are the same + merged_updated = {k: v for k, v in merged_updated.items() if v[0] != v[1]} + + # Remove added entries that are also in removed with the same version + for pkg in list(merged_added.keys()): + if pkg in merged_removed: + added_ver, added_pr = merged_added[pkg] + removed_ver, removed_pr = merged_removed[pkg] + if added_ver == removed_ver: + # Package was added and removed at the same version, cancel out + del merged_added[pkg] + del merged_removed[pkg] + + return merged_updated, merged_added, merged_removed + + +def render_section(version, updated, added, removed): + """Render a version section as markdown.""" + lines = [f"## {version}\n"] + + if updated: + lines.append("| Package | Old Version | New Version | PR |") + lines.append("|---------|-------------|-------------|-----|") + for pkg in sorted(updated): + old_ver, new_ver, pr = updated[pkg] + lines.append(f"| {pkg} | {old_ver} | {new_ver} | {pr} |") + lines.append("") + + if added: + lines.append("**Added:**\n") + lines.append("| Package | Version | PR |") + lines.append("|---------|---------|-----|") + for pkg in sorted(added): + ver, pr = added[pkg] + lines.append(f"| {pkg} | {ver} | {pr} |") + lines.append("") + + if removed: + lines.append("**Removed:**\n") + lines.append("| Package | Version | PR |") + lines.append("|---------|---------|-----|") + for pkg in sorted(removed): + ver, pr = removed[pkg] + lines.append(f"| {pkg} | {ver} | {pr} |") + lines.append("") + + return "\n".join(lines) + + +def parse_document(content): + """Split document into a list of (version, section_text) tuples.""" + sections = [] + current_version = None + current_lines = [] + + for line in content.split("\n"): + match = re.match(r"^## (.+)$", line) + if match: + if current_version: + sections.append((current_version, "\n".join(current_lines))) + current_version = match.group(1).strip() + current_lines = [line] + elif current_version: + current_lines.append(line) + + if current_version: + sections.append((current_version, "\n".join(current_lines))) + + return sections + + +def main(): + if len(sys.argv) < 3: + print("Usage: update_dependency_changes.py ") + sys.exit(1) + + base_ref = sys.argv[1] + pr_arg = sys.argv[2] + + # Validate PR number is numeric + if not re.fullmatch(r"\d+", pr_arg): + print("Invalid PR number; must be numeric.") + sys.exit(1) + + # Validate base_ref doesn't contain dangerous characters + if not re.fullmatch(r"[a-zA-Z0-9/_.-]+", base_ref): + print("Invalid base ref; contains invalid characters.") + sys.exit(1) + + pr_number = f"#{pr_arg}" + + version = get_version() + if not version: + print("Could not read version from common.props.") + sys.exit(1) + + diff = get_diff(base_ref) + if not diff: + print("No diff found for Directory.Packages.props.") + sys.exit(0) + + diff_lines = diff.split("\n") + old_packages = parse_diff_packages(diff_lines, "-") + new_packages = parse_diff_packages(diff_lines, "+") + + new_updated, new_added, new_removed = classify_changes(old_packages, new_packages, pr_number) + + if not new_updated and not new_added and not new_removed: + print("No package version changes detected.") + sys.exit(0) + + # Load existing document from the base branch + existing_content = get_existing_doc_from_base(base_ref) + sections = parse_document(existing_content) if existing_content else [] + + # Find existing section for this version + version_index = None + for i, (v, _) in enumerate(sections): + if v == version: + version_index = i + break + + if version_index is not None: + existing = parse_existing_section(sections[version_index][1]) + merged = merge_changes(existing, (new_updated, new_added, new_removed)) + section_text = render_section(version, *merged) + sections[version_index] = (version, section_text) + else: + section_text = render_section(version, new_updated, new_added, new_removed) + sections.insert(0, (version, section_text)) + + # Write document + doc_dir = os.path.dirname(DOC_PATH) + if doc_dir: + os.makedirs(doc_dir, exist_ok=True) + with open(DOC_PATH, "w") as f: + f.write(HEADER + "\n") + for _, text in sections: + f.write(text.rstrip("\n") + "\n\n") + + print(f"Updated {DOC_PATH} for version {version}") + + +if __name__ == "__main__": + main() diff --git a/.github/workflows/nuget-packages-version-change-detector.yml b/.github/workflows/nuget-packages-version-change-detector.yml new file mode 100644 index 0000000000..45dba3332b --- /dev/null +++ b/.github/workflows/nuget-packages-version-change-detector.yml @@ -0,0 +1,71 @@ +# Automatically detects and documents NuGet package version changes in PRs. +# Triggers on changes to Directory.Packages.props and: +# - Adds 'dependency-change' label to the PR +# - Updates docs/en/package-version-changes.md with version changes +# - Commits the documentation back to the PR branch +# Note: Only runs for PRs from the same repository (not forks) to ensure write permissions. +name: Nuget Packages Version Change Detector + +on: + pull_request: + paths: + - 'Directory.Packages.props' + types: + - opened + - synchronize + - reopened + - ready_for_review + +permissions: + contents: read + +concurrency: + group: dependency-changes-${{ github.event.pull_request.number }} + cancel-in-progress: false + +jobs: + label: + if: ${{ !github.event.pull_request.draft && !startsWith(github.head_ref, 'auto-merge/') && github.event.pull_request.head.repo.full_name == github.repository && !contains(github.event.head_commit.message, '[skip ci]') }} + permissions: + contents: write + pull-requests: write + runs-on: ubuntu-latest + env: + DOC_PATH: docs/en/package-version-changes.md + steps: + - run: gh pr edit "$PR_NUMBER" --add-label "dependency-change" + env: + PR_NUMBER: ${{ github.event.pull_request.number }} + GH_TOKEN: ${{ secrets.MLM_Token }} + GH_REPO: ${{ github.repository }} + + - uses: actions/checkout@v4 + with: + ref: ${{ github.event.pull_request.head.ref }} + fetch-depth: 1 + + - name: Fetch base branch + run: git fetch origin ${{ github.event.pull_request.base.ref }}:refs/remotes/origin/${{ github.event.pull_request.base.ref }} --depth=1 + + - uses: actions/setup-python@v5 + with: + python-version: '3.x' + + - run: python .github/scripts/update_dependency_changes.py ${{ github.event.pull_request.base.ref }} ${{ github.event.pull_request.number }} + + - name: Commit changes + run: | + set -e + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" + git add "$DOC_PATH" + if git diff --staged --quiet; then + echo "No changes to commit." + else + git commit -m "docs: update package version changes [skip ci]" + if ! git push; then + echo "Error: Failed to push changes. This may be due to conflicts or permission issues." + exit 1 + fi + echo "Successfully committed and pushed documentation changes." + fi diff --git a/.github/workflows/update-studio-docs.yml b/.github/workflows/update-studio-docs.yml new file mode 100644 index 0000000000..541ceeaf30 --- /dev/null +++ b/.github/workflows/update-studio-docs.yml @@ -0,0 +1,658 @@ +name: Update ABP Studio Docs + +on: + repository_dispatch: + types: [update_studio_docs] + workflow_dispatch: + inputs: + version: + description: 'Studio version (e.g., 2.1.10)' + required: true + name: + description: 'Release name' + required: true + notes: + description: 'Raw release notes' + required: true + url: + description: 'Release URL' + required: true + target_branch: + description: 'Target branch (default: dev)' + required: false + default: 'dev' + +jobs: + update-docs: + runs-on: ubuntu-latest + permissions: + contents: write + pull-requests: write + models: read + + steps: + # ------------------------------------------------- + # Extract payload (repository_dispatch or workflow_dispatch) + # ------------------------------------------------- + - name: Extract payload + id: payload + run: | + if [ "${{ github.event_name }}" = "repository_dispatch" ]; then + echo "version=${{ github.event.client_payload.version }}" >> $GITHUB_OUTPUT + echo "name=${{ github.event.client_payload.name }}" >> $GITHUB_OUTPUT + echo "url=${{ github.event.client_payload.url }}" >> $GITHUB_OUTPUT + echo "target_branch=${{ github.event.client_payload.target_branch || 'dev' }}" >> $GITHUB_OUTPUT + + # Save notes to environment variable (multiline) + { + echo "RAW_NOTES<> $GITHUB_ENV + else + echo "version=${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT + echo "name=${{ github.event.inputs.name }}" >> $GITHUB_OUTPUT + echo "url=${{ github.event.inputs.url }}" >> $GITHUB_OUTPUT + echo "target_branch=${{ github.event.inputs.target_branch || 'dev' }}" >> $GITHUB_OUTPUT + + # Save notes to environment variable (multiline) + { + echo "RAW_NOTES<> $GITHUB_ENV + fi + + - name: Validate payload + env: + VERSION: ${{ steps.payload.outputs.version }} + NAME: ${{ steps.payload.outputs.name }} + URL: ${{ steps.payload.outputs.url }} + TARGET_BRANCH: ${{ steps.payload.outputs.target_branch }} + run: | + if [ -z "$VERSION" ] || [ "$VERSION" = "null" ]; then + echo "❌ Missing: version" + exit 1 + fi + if [ -z "$NAME" ] || [ "$NAME" = "null" ]; then + echo "❌ Missing: name" + exit 1 + fi + if [ -z "$URL" ] || [ "$URL" = "null" ]; then + echo "❌ Missing: url" + exit 1 + fi + if [ -z "$RAW_NOTES" ]; then + echo "❌ Missing: release notes" + exit 1 + fi + + echo "✅ Payload validated" + echo " Version: $VERSION" + echo " Name: $NAME" + echo " Target Branch: $TARGET_BRANCH" + + # ------------------------------------------------- + # Checkout target branch + # ------------------------------------------------- + - name: Checkout + uses: actions/checkout@v4 + with: + ref: ${{ steps.payload.outputs.target_branch }} + fetch-depth: 0 + + - name: Configure git + run: | + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" + + # ------------------------------------------------- + # Create working branch + # ------------------------------------------------- + - name: Create branch + env: + VERSION: ${{ steps.payload.outputs.version }} + run: | + BRANCH="docs/studio-${VERSION}" + + # Delete remote branch if exists (idempotent) + git push origin --delete "$BRANCH" 2>/dev/null || true + + git checkout -B "$BRANCH" + echo "BRANCH=$BRANCH" >> $GITHUB_ENV + + # ------------------------------------------------- + # Analyze existing release notes format + # ------------------------------------------------- + - name: Analyze existing format + id: analyze + run: | + FILE="docs/en/studio/release-notes.md" + + if [ -f "$FILE" ] && [ -s "$FILE" ]; then + { + echo "EXISTING_FORMAT<> $GITHUB_OUTPUT + else + { + echo "EXISTING_FORMAT<> $GITHUB_OUTPUT + fi + + # ------------------------------------------------- + # Try AI formatting (OPTIONAL - never fails workflow) + # ------------------------------------------------- + - name: Format release notes with AI + id: ai + continue-on-error: true + uses: actions/ai-inference@v1 + with: + model: openai/gpt-4.1 + prompt: | + You are a technical writer for ABP Studio release notes. + + Existing release notes format: + ${{ steps.analyze.outputs.EXISTING_FORMAT }} + + New release: + Version: ${{ steps.payload.outputs.version }} + Name: ${{ steps.payload.outputs.name }} + Raw notes: + ${{ env.RAW_NOTES }} + + CRITICAL RULES: + 1. Extract ONLY essential, user-facing changes + 2. Format as bullet points starting with "- " + 3. Keep it concise and professional + 4. Match the style of existing release notes + 5. Skip internal/technical details unless critical + 6. Return ONLY the bullet points (no version header, no date) + 7. One change per line + + Output example: + - Fixed books sample for blazor-webapp tiered solution + - Enhanced Module Installation UI + - Added AI Management option to Startup Templates + + Return ONLY the formatted bullet points. + + # ------------------------------------------------- + # Fallback: Use raw notes if AI unavailable + # ------------------------------------------------- + - name: Prepare final release notes + run: | + mkdir -p .tmp + + AI_RESPONSE="${{ steps.ai.outputs.response }}" + + if [ -n "$AI_RESPONSE" ] && [ "$AI_RESPONSE" != "null" ]; then + echo "✅ Using AI-formatted release notes" + echo "$AI_RESPONSE" > .tmp/final-notes.txt + else + echo "⚠️ AI unavailable - using aggressive cleaning on raw release notes" + + # Clean and format raw notes with aggressive filtering + echo "$RAW_NOTES" | while IFS= read -r line; do + # Skip empty lines + [ -z "$line" ] && continue + + # Skip section headers + [[ "$line" =~ ^#+.*What.*Changed ]] && continue + [[ "$line" =~ ^##[[:space:]] ]] && continue + + # Skip full changelog links + [[ "$line" =~ ^\*\*Full\ Changelog ]] && continue + [[ "$line" =~ ^Full\ Changelog ]] && continue + + # Remove leading bullet/asterisk + line=$(echo "$line" | sed 's/^[[:space:]]*[*-][[:space:]]*//') + + # Aggressive cleaning: remove entire " by @user in https://..." suffix + line=$(echo "$line" | sed 's/[[:space:]]*by @[a-zA-Z0-9_-]*[[:space:]]*in https:\/\/github\.com\/[^[:space:]]*//g') + + # Remove remaining "by @username" or "by username" + line=$(echo "$line" | sed 's/[[:space:]]*by @[a-zA-Z0-9_-]*[[:space:]]*$//g') + line=$(echo "$line" | sed 's/[[:space:]]*by [a-zA-Z0-9_-]*[[:space:]]*$//g') + + # Remove standalone @mentions + line=$(echo "$line" | sed 's/@[a-zA-Z0-9_-]*//g') + + # Clean trailing periods if orphaned + line=$(echo "$line" | sed 's/\.[[:space:]]*$//') + + # Trim all whitespace + line=$(echo "$line" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//') + + # Skip if line is empty or too short + [ -z "$line" ] && continue + [ ${#line} -lt 5 ] && continue + + # Capitalize first letter if lowercase + line="$(echo ${line:0:1} | tr '[:lower:]' '[:upper:]')${line:1}" + + # Add clean bullet and output + echo "- $line" + done > .tmp/final-notes.txt + fi + + # Safety check: verify we have content + if [ ! -s .tmp/final-notes.txt ]; then + echo "⚠️ No valid release notes extracted, using minimal fallback" + echo "- Release ${{ steps.payload.outputs.version }}" > .tmp/final-notes.txt + fi + + echo "=== Final release notes ===" + cat .tmp/final-notes.txt + echo "===========================" + + # ------------------------------------------------- + # Update release-notes.md (move "Latest" tag correctly) + # ------------------------------------------------- + - name: Update release-notes.md + env: + VERSION: ${{ steps.payload.outputs.version }} + NAME: ${{ steps.payload.outputs.name }} + URL: ${{ steps.payload.outputs.url }} + run: | + FILE="docs/en/studio/release-notes.md" + DATE="$(date +%Y-%m-%d)" + + mkdir -p docs/en/studio + + # Check if version already exists (idempotent) + if [ -f "$FILE" ] && grep -q "^## $VERSION " "$FILE"; then + echo "⚠️ Version $VERSION already exists in release notes - skipping update" + echo "VERSION_UPDATED=false" >> $GITHUB_ENV + exit 0 + fi + + # Read final notes + NOTES_CONTENT="$(cat .tmp/final-notes.txt)" + + # Create new entry + NEW_ENTRY="## $VERSION ($DATE) Latest + + $NOTES_CONTENT + " + + # Process file + if [ ! -f "$FILE" ]; then + # Create new file + cat > "$FILE" < "$FILE.new" + + mv "$FILE.new" "$FILE" + fi + + echo "VERSION_UPDATED=true" >> $GITHUB_ENV + + echo "=== Updated release-notes.md preview ===" + head -30 "$FILE" + echo "========================================" + + # ------------------------------------------------- + # Fetch latest stable ABP version (no preview/rc/beta) + # ------------------------------------------------- + - name: Fetch latest stable ABP version + id: abp + run: | + # Fetch all releases + RELEASES=$(curl -fsS \ + -H "Accept: application/vnd.github+json" \ + -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \ + "https://api.github.com/repos/abpframework/abp/releases?per_page=20") + + # Filter stable releases (exclude preview, rc, beta, dev) + ABP_VERSION=$(echo "$RELEASES" | jq -r ' + [.[] | select( + (.prerelease == false) and + (.tag_name | test("preview|rc|beta|dev"; "i") | not) + )] | first | .tag_name + ') + + if [ -z "$ABP_VERSION" ] || [ "$ABP_VERSION" = "null" ]; then + echo "❌ Could not determine latest stable ABP version" + exit 1 + fi + + echo "✅ Latest stable ABP version: $ABP_VERSION" + echo "ABP_VERSION=$ABP_VERSION" >> $GITHUB_ENV + + # ------------------------------------------------- + # Update version-mapping.md (smart range expansion) + # ------------------------------------------------- + - name: Update version-mapping.md + env: + STUDIO_VERSION: ${{ steps.payload.outputs.version }} + run: | + FILE="docs/en/studio/version-mapping.md" + ABP_VERSION="${{ env.ABP_VERSION }}" + + mkdir -p docs/en/studio + + # Create file if doesn't exist + if [ ! -f "$FILE" ]; then + cat > "$FILE" <> $GITHUB_ENV + exit 0 + fi + + # Use Python for smart version range handling + python3 <<'PYTHON_EOF' + import os + import re + from packaging.version import Version, InvalidVersion + + studio_ver = os.environ["STUDIO_VERSION"] + abp_ver = os.environ["ABP_VERSION"] + file_path = "docs/en/studio/version-mapping.md" + + try: + studio = Version(studio_ver) + except InvalidVersion: + print(f"❌ Invalid Studio version: {studio_ver}") + exit(1) + + with open(file_path, 'r') as f: + lines = f.readlines() + + # Find table start (skip SEO and headers) + table_start = 0 + table_end = 0 + for i, line in enumerate(lines): + if line.strip().startswith('|') and '**ABP Studio Version**' in line: + table_start = i + elif table_start > 0 and line.strip() and not line.strip().startswith('|'): + table_end = i + break + + if table_start == 0: + print("❌ Could not find version mapping table") + exit(1) + + # If no end found, table goes to end of file + if table_end == 0: + table_end = len(lines) + + # Extract sections + before_table = lines[:table_start] # Everything before table + table_header = lines[table_start:table_start+2] # Header + separator + data_rows = [l for l in lines[table_start+2:table_end] if l.strip().startswith('|')] # Data rows + after_table = lines[table_end:] # Everything after table + + new_rows = [] + handled = False + + def parse_version_range(version_str): + """Parse '2.1.5 - 2.1.9' or '2.1.5' into (start, end)""" + version_str = version_str.strip() + + if '–' in version_str or '-' in version_str: + # Handle both em-dash and hyphen + parts = re.split(r'\s*[–-]\s*', version_str) + if len(parts) == 2: + try: + return Version(parts[0].strip()), Version(parts[1].strip()) + except InvalidVersion: + return None, None + + try: + v = Version(version_str) + return v, v + except InvalidVersion: + return None, None + + def format_row(studio_range, abp_version): + """Format a table row with proper spacing""" + return f"| {studio_range:<22} | {abp_version:<27} |\n" + + # Process existing rows + for row in data_rows: + match = re.match(r'\|\s*(.+?)\s*\|\s*(.+?)\s*\|', row) + if not match: + continue + + existing_studio_range = match.group(1).strip() + existing_abp = match.group(2).strip() + + # Only consider rows with matching ABP version + if existing_abp != abp_ver: + new_rows.append(row) + continue + + start_ver, end_ver = parse_version_range(existing_studio_range) + + if start_ver is None or end_ver is None: + new_rows.append(row) + continue + + # Check if current studio version is in this range + if start_ver <= studio <= end_ver: + print(f"✅ Studio version {studio_ver} already covered in range {existing_studio_range}") + handled = True + new_rows.append(row) + + # Check if we should extend the range + elif end_ver < studio: + # Calculate if studio is the next logical version + # For patch versions: 2.1.9 -> 2.1.10 + # For minor versions: 2.1.9 -> 2.2.0 + + # Simple heuristic: if major.minor match and patch increments, extend range + if (start_ver.major == studio.major and + start_ver.minor == studio.minor and + studio.micro <= end_ver.micro + 5): # Allow small gaps + + new_range = f"{start_ver} - {studio}" + new_rows.append(format_row(new_range, abp_ver)) + print(f"✅ Extended range: {new_range}") + handled = True + else: + new_rows.append(row) + else: + new_rows.append(row) + + # If not handled, add new row at top of data + if not handled: + new_row = format_row(str(studio), abp_ver) + new_rows.insert(0, new_row) + print(f"✅ Added new mapping: {studio_ver} -> {abp_ver}") + + # Write updated file - preserve ALL content + with open(file_path, 'w') as f: + f.writelines(before_table) # SEO, title, intro text + f.writelines(table_header) # Table header + f.writelines(new_rows) # Updated data rows + f.writelines(after_table) # Content after table (preview section, etc.) + + print("MAPPING_UPDATED=true") + PYTHON_EOF + + echo "MAPPING_UPDATED=true" >> $GITHUB_ENV + + echo "=== Updated version-mapping.md preview ===" + head -35 "$FILE" + echo "==========================================" + + # ------------------------------------------------- + # Check for changes + # ------------------------------------------------- + - name: Check for changes + id: changes + run: | + git add docs/en/studio/ + + if git diff --cached --quiet; then + echo "has_changes=false" >> $GITHUB_OUTPUT + echo "⚠️ No changes detected" + else + echo "has_changes=true" >> $GITHUB_OUTPUT + echo "✅ Changes detected:" + git diff --cached --stat + fi + + # ------------------------------------------------- + # Commit & push + # ------------------------------------------------- + - name: Commit and push + if: steps.changes.outputs.has_changes == 'true' + env: + VERSION: ${{ steps.payload.outputs.version }} + NAME: ${{ steps.payload.outputs.name }} + run: | + git commit -m "docs(studio): update documentation for release $VERSION + + - Updated release notes for $VERSION + - Updated version mapping with ABP ${{ env.ABP_VERSION }} + + Release: $NAME" + + git push -f origin "$BRANCH" + + # ------------------------------------------------- + # Create or update PR + # ------------------------------------------------- + - name: Create or update PR + if: steps.changes.outputs.has_changes == 'true' + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + VERSION: ${{ steps.payload.outputs.version }} + NAME: ${{ steps.payload.outputs.name }} + URL: ${{ steps.payload.outputs.url }} + TARGET_BRANCH: ${{ steps.payload.outputs.target_branch }} + run: | + # Check for existing PR + EXISTING_PR=$(gh pr list \ + --head "$BRANCH" \ + --base "$TARGET_BRANCH" \ + --json number \ + --jq '.[0].number' 2>/dev/null || echo "") + + PR_BODY="Automated documentation update for ABP Studio release **$VERSION**. + + ## Release Information + - **Version**: $VERSION + - **Name**: $NAME + - **Release**: [View on GitHub]($URL) + - **ABP Framework Version**: ${{ env.ABP_VERSION }} + + ## Changes + - ✅ Updated [release-notes.md](docs/en/studio/release-notes.md) + - ✅ Updated [version-mapping.md](docs/en/studio/version-mapping.md) + + --- + + *This PR was automatically generated by the [update-studio-docs workflow](.github/workflows/update-studio-docs.yml)*" + + if [ -n "$EXISTING_PR" ]; then + echo "🔄 Updating existing PR #$EXISTING_PR" + + gh pr edit "$EXISTING_PR" \ + --title "docs(studio): release $VERSION - $NAME" \ + --body "$PR_BODY" + + echo "PR_NUMBER=$EXISTING_PR" >> $GITHUB_ENV + else + echo "📝 Creating new PR" + + sleep 2 # Wait for GitHub to sync + + PR_URL=$(gh pr create \ + --title "docs(studio): release $VERSION - $NAME" \ + --body "$PR_BODY" \ + --base "$TARGET_BRANCH" \ + --head "$BRANCH") + + PR_NUMBER=$(echo "$PR_URL" | grep -oE '[0-9]+$') + echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_ENV + echo "✅ Created PR #$PR_NUMBER: $PR_URL" + fi + + # ------------------------------------------------- + # Enable auto-merge (safe with branch protection) + # ------------------------------------------------- + - name: Enable auto-merge + if: steps.changes.outputs.has_changes == 'true' + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + continue-on-error: true + run: | + echo "🔄 Attempting to enable auto-merge for PR #$PR_NUMBER" + + gh pr merge "$PR_NUMBER" \ + --auto \ + --squash \ + --delete-branch || { + echo "⚠️ Auto-merge not available (branch protection or permissions)" + echo " PR #$PR_NUMBER is ready for manual review" + } + + # ------------------------------------------------- + # Summary + # ------------------------------------------------- + - name: Workflow summary + if: always() + env: + VERSION: ${{ steps.payload.outputs.version }} + run: | + echo "## 📚 ABP Studio Docs Update Summary" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY + echo "**Version**: $VERSION" >> $GITHUB_STEP_SUMMARY + echo "**Release**: ${{ steps.payload.outputs.name }}" >> $GITHUB_STEP_SUMMARY + echo "**Target Branch**: ${{ steps.payload.outputs.target_branch }}" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY + + if [ "${{ steps.changes.outputs.has_changes }}" = "true" ]; then + echo "### ✅ Changes Applied" >> $GITHUB_STEP_SUMMARY + echo "- Release notes updated: ${{ env.VERSION_UPDATED }}" >> $GITHUB_STEP_SUMMARY + echo "- Version mapping updated: ${{ env.MAPPING_UPDATED }}" >> $GITHUB_STEP_SUMMARY + echo "- ABP Framework version: ${{ env.ABP_VERSION }}" >> $GITHUB_STEP_SUMMARY + echo "- PR: #${{ env.PR_NUMBER }}" >> $GITHUB_STEP_SUMMARY + else + echo "### ⚠️ No Changes" >> $GITHUB_STEP_SUMMARY + echo "Version $VERSION already exists in documentation." >> $GITHUB_STEP_SUMMARY + fi diff --git a/Directory.Packages.props b/Directory.Packages.props index 89f27ea6a8..e89f989794 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -89,8 +89,8 @@ - - + + diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/de.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/de.json index 6dc8e69ea3..5a05316e96 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/de.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/de.json @@ -261,7 +261,7 @@ "Enum:EntityChangeType:0": "Erstellt", "Enum:EntityChangeType:1": "Aktualisiert", "Enum:EntityChangeType:2": "Gelöscht", - "TenantId": "Mieter-ID", + "TenantId": "Mandanten-ID", "ChangeTime": "Zeit ändern", "EntityTypeFullName": "Vollständiger Name des Entitätstyps", "AuditLogsFor{0}Organization": "Audit-Logs für die Organisation \"{0}\"", diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/de.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/de.json index 210f46ff8b..4733b5f9ef 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/de.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/de.json @@ -162,7 +162,7 @@ "WhatIsTheABPCommercial": "Was ist der ABP-Werbespot?", "WhatAreDifferencesThanAbpFramework": "Was sind die Unterschiede zwischen dem Open Source ABP Framework und dem ABP Commercial?", "ABPCommercialExplanation": "ABP Commercial ist eine Reihe von Premium-Modulen, Tools, Themen und Diensten, die auf dem Open-Source-ABP-Framework aufbauen. ABP Commercial wird von demselben Team entwickelt und unterstützt, das hinter dem ABP-Framework steht.", - "WhatAreDifferencesThanABPFrameworkExplanation": "

ABP-Framework ist ein modulares, thematisches, Microservice-kompatibles Anwendungsentwicklungsframework für ASP.NET Core. Es bietet eine vollständige Architektur und eine starke Infrastruktur, damit Sie sich auf Ihren eigenen Geschäftscode konzentrieren können, anstatt sich für jedes neue Projekt zu wiederholen. Es basiert auf Best Practices für die Softwareentwicklung und beliebten Tools, die Sie bereits kennen.

Das ABP-Framework ist völlig kostenlos, Open Source und wird von der Community betrieben. Es bietet auch ein kostenloses Thema und einige vorgefertigte Module (z. B. Identitätsmanagement und Mieterverwaltung).

", + "WhatAreDifferencesThanABPFrameworkExplanation": "

ABP-Framework ist ein modulares, thematisches, Microservice-kompatibles Anwendungsentwicklungsframework für ASP.NET Core. Es bietet eine vollständige Architektur und eine starke Infrastruktur, damit Sie sich auf Ihren eigenen Geschäftscode konzentrieren können, anstatt sich für jedes neue Projekt zu wiederholen. Es basiert auf Best Practices für die Softwareentwicklung und beliebten Tools, die Sie bereits kennen.

Das ABP-Framework ist völlig kostenlos, Open Source und wird von der Community betrieben. Es bietet auch ein kostenloses Thema und einige vorgefertigte Module (z. B. Identitätsmanagement und Mandanten-Verwaltung).

", "VisitTheFrameworkVSCommercialDocument": "Besuchen Sie den folgenden Link für weitere Informationen {1} ", "ABPCommercialFollowingBenefits": "ABP Commercial fügt dem ABP-Framework die folgenden Vorteile hinzu;", "Professional": "Fachmann", diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/de.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/de.json index d125dbded4..f0f5aa1b89 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/de.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/de.json @@ -332,7 +332,7 @@ "ConnectionResolver": "Verbindungslöser", "TenantBasedDataFilter": "Mandantenbasierter Datenfilter", "ApplicationCode": "Anwendungscode", - "TenantResolution": "Mieterbeschluss", + "TenantResolution": "Mandanten-Ermittlung", "TenantUser": "Mandant {0} Benutzer", "CardTitle": "Kartentitel", "View": "Sicht", diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json index d95d021836..945c39e78e 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json @@ -1435,6 +1435,8 @@ "Facebook": "Facebook", "Youtube": "YouTube", "Google": "Google", + "GoogleOrganic": "Google Organic", + "GoogleAds": "Google Ads", "Github": "GitHub", "Friend": " From a friend", "Other": "Other", diff --git a/delete-bin-obj.ps1 b/delete-bin-obj.ps1 index 6a6741b767..e4a0fe9437 100644 --- a/delete-bin-obj.ps1 +++ b/delete-bin-obj.ps1 @@ -10,4 +10,3 @@ Get-ChildItem -Path . -Include bin,obj -Recurse -Directory | ForEach-Object { } Write-Host "BIN and OBJ folders have been successfully deleted." -ForegroundColor Green - diff --git a/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/dotnet-conf-china-2025.png b/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/dotnet-conf-china-2025.png index 0e502dd8d7..634657310f 100644 Binary files a/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/dotnet-conf-china-2025.png and b/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/dotnet-conf-china-2025.png differ diff --git a/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/my-passkey.png b/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/my-passkey.png index 31a3b6e362..5137a43633 100644 Binary files a/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/my-passkey.png and b/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/my-passkey.png differ diff --git a/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/passkey-login.png b/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/passkey-login.png index b1114e4c50..676f06a491 100644 Binary files a/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/passkey-login.png and b/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/passkey-login.png differ diff --git a/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/passkey-registration.png b/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/passkey-registration.png index a009b746cf..4fd070dbe5 100644 Binary files a/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/passkey-registration.png and b/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/passkey-registration.png differ diff --git a/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/passkey-setting.png b/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/passkey-setting.png index 3c42236f8b..1d017e5f06 100644 Binary files a/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/passkey-setting.png and b/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/passkey-setting.png differ diff --git a/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/password-history-settings.png b/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/password-history-settings.png index 34ec453cbe..9faefc859d 100644 Binary files a/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/password-history-settings.png and b/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/password-history-settings.png differ diff --git a/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/password-history-warning.png b/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/password-history-warning.png index 13a5a64753..78cbe8c20f 100644 Binary files a/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/password-history-warning.png and b/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/password-history-warning.png differ diff --git a/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/reset-password-error-modal.png b/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/reset-password-error-modal.png index 13a5a64753..78cbe8c20f 100644 Binary files a/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/reset-password-error-modal.png and b/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/reset-password-error-modal.png differ diff --git a/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/set-password-error-modal.png b/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/set-password-error-modal.png index 595d3b12eb..680a840420 100644 Binary files a/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/set-password-error-modal.png and b/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/set-password-error-modal.png differ diff --git a/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/studio-switch-to-preview.png b/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/studio-switch-to-preview.png index 7025b92cce..2174f17746 100644 Binary files a/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/studio-switch-to-preview.png and b/docs/en/Blog-Posts/2026-01-08 v10_1_Preview/studio-switch-to-preview.png differ diff --git a/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/articles.md b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/articles.md new file mode 100644 index 0000000000..d9ed5336e5 --- /dev/null +++ b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/articles.md @@ -0,0 +1,377 @@ +# Building a Multi-Agent AI System with A2A, MCP, and ADK in .NET + +> How we combined three open AI protocols — Google's A2A & ADK with Anthropic's MCP — to build a production-ready Multi-Agent Research Assistant using .NET 10. + +--- + +## Introduction + +The AI space is constantly changing and improving. Once again, we've moved past the single LLM calls and into the future of **Multi-Agent Systems**, in which expert AI agents act in unison as a collaborative team. + +But here is the problem: **How do you make agents communicate with each other? How do you equip agents with tools? How do you control them?** + +Three open protocols have emerged for answering these questions: + +- **MCP (Model Context Protocol)** by Anthropic — The "USB-C for AI" +- **A2A (Agent-to-Agent Protocol)** by Google — The "phone line between agents" +- **ADK (Agent Development Kit)** by Google — The "organizational chart for agents" + +In this article, I will briefly describe each protocol, highlight the benefits of the combination, and walk you through our own project: a **Multi-Agent Research Assistant** developed via ABP Framework. + +--- + +## The Problem: Why Single-Agent Isn't Enough + +Imagine you ask an AI: *"Research the latest AI agent frameworks and give me a comprehensive analysis report."* + +A single LLM call would: +- Hallucinate search results (can't actually browse the web) +- Produce a shallow analysis (no structured research pipeline) +- Lose context between steps (no state management) +- Can't save results anywhere (no tool access) + +What you actually need is a **team of specialists**: + +1. A **Researcher** who searches the web and gathers raw data +2. An **Analyst** who processes that data into a structured report +3. **Tools** that let agents interact with the real world (web, database, filesystem) +4. An **Orchestrator** that coordinates everything + +This is exactly what we built. + +!["single-vs-multiagent system"](images/image.png) +--- + +## Protocol #1: MCP — Giving Agents Superpowers + +### What is MCP? + +**MCP (Model Context Protocol)**: Anthropic's standardized protocol allows AI models to be connected to all external tools and data sources. MCP can be thought of as **the USB-C of AI** – one port compatible with everything. + +Earlier, before MCP, if you wanted your LLM to do things such as search the web, query a database, and store files, you would need to write your own integration code for each capability. MCP lets you define your tools one time, and any agent that is MCP-compatible can make use of them. + +!["mcp"](images/image-1.png) + +### How MCP Works + +MCP follows a simple **Client-Server architecture**: + +![mcp client server](images/mcp-client-server-1200x700.png) + +The flow is straightforward: + +1. **Discovery**: The agent asks "What tools do you have?" (`tools/list`) +2. **Invocation**: The agent calls a specific tool (`tools/call`) +3. **Result**: The tool returns data back to the agent + +### MCP in Our Project + +We built three MCP tool servers: + +| MCP Tool | Purpose | Used By | +|----------|---------|---------| +| `web_search` | Searches the web via Tavily API | Researcher Agent | +| `fetch_url_content` | Fetches content from a URL | Researcher Agent | +| `save_research_to_file` | Saves reports to the filesystem | Analysis Agent | +| `save_research_to_database` | Persists results in SQL Server | Analysis Agent | +| `search_past_research` | Queries historical research | Analysis Agent | + +The beauty of MCP is that you do not need to know how these tools are implemented inside the tool. You simply need to call them by their names as given in the description. + +--- + +## Protocol #2: A2A — Making Agents Talk to Each Other + +### What is A2A? + +**A2A (Agent to Agent)**, formerly proposed by Google and now presented under the Linux Foundation, describes a protocol allowing **one AI agent to discover another and trade tasks**. MCP fits as helping agents acquire tools; A2A helps them acquire the ability to speak. + +Think of it this way: +- **MCP** = "What can this agent *do*?" (capabilities) +- **A2A** = "How do agents *talk*?" (communication) + +### The Agent Card: Your Agent's Business Card + +Every A2A-compatible agent publishes an **Agent Card** — a JSON document that describes who it is and what it can do. It's like a business card for AI agents: + +```json +{ + "name": "Researcher Agent", + "description": "Searches the web to collect comprehensive research data", + "url": "https://localhost:44331/a2a/researcher", + "version": "1.0.0", + "capabilities": { + "streaming": false, + "pushNotifications": false + }, + "skills": [ + { + "id": "web-research", + "name": "Web Research", + "description": "Searches the web on a given topic and collects raw data", + "tags": ["research", "web-search", "data-collection"] + } + ] +} +``` + +Other agents can discover this card at `/.well-known/agent.json` and immediately know: +- What this agent does +- Where to reach it +- What skills it has + +![What is A2A?](images/image-2.png) + +### How A2A Task Exchange Works + +Once an agent discovers another agent, it can send tasks: + +![orchestrator](images/orchestrator-researcher-seq-1200x700.png) + +The key concepts: + +- **Task**: A unit of work sent between agents (like an email with instructions) +- **Artifact**: The output produced by an agent (like an attachment in the reply) +- **Task State**: `Submitted → Working → Completed/Failed` + +### A2A in Our Project + +Agent communication in our system uses A2A: + +- The **Orchestrator** finds all agents through the Agent Cards +- It sends a research task to the **Researcher Agent** +- The Researcher’s output (artifacts) is used as input by **Analysis Agent** - The Analysis Agent creates the final structured report + +--- + +## Protocol #3: ADK — Organizing Your Agent Team + +### What is ADK? + +**ADK (Agent Development Kit)**, created by Google, provides patterns for **organizing and orchestrating multiple agents**. It answers the question: "How do you build a team of agents that work together efficiently?" + +ADK gives you: +- **BaseAgent**: A foundation every agent inherits from +- **SequentialAgent**: Runs agents one after another (pipeline) +- **ParallelAgent**: Runs agents simultaneously +- **AgentContext**: Shared state that flows through the pipeline +- **AgentEvent**: Control flow signals (escalate, transfer, state updates) + +> **Note**: ADK's official SDK is Python-only. We ported the core patterns to .NET for our project. + +### The Pipeline Pattern + +The most powerful ADK pattern is the **Sequential Pipeline**. Think of it as an assembly line in a factory: + +![agent state flow](images/agent-state-flow.png) + +Each agent: +1. Receives the shared **AgentContext** (with state from previous agents) +2. Does its work +3. Updates the state +4. Passes it to the next agent + +### AgentContext: The Shared Memory + +`AgentContext` is like a shared whiteboard that all agents can read from and write to: + +![agent context](images/agent-context.png) + +This pattern eliminates the need for complex inter-agent messaging — agents simply read and write to a shared context. + +### ADK Orchestration Patterns + +ADK supports multiple orchestration patterns: + +| Pattern | Description | Use Case | +|---------|-------------|----------| +| **Sequential** | A → B → C | Research → Analysis pipeline | +| **Parallel** | A, B, C simultaneously | Multiple searches at once | +| **Fan-Out/Fan-In** | Split → Process → Merge | Distributed research | +| **Conditional Routing** | If/else agent selection | Route by query type | + +--- + +## How the Three Protocols Work Together + +Here's the key insight: **MCP, A2A, and ADK are not competitors — they're complementary layers of a complete agent system.** + +![agent ecosystem](images/agent-ecosystem.png) + +Each protocol handles a different concern: + +| Layer | Protocol | Question It Answers | +|-------|----------|-------------------| +| **Top** | ADK | "How are agents organized?" | +| **Middle** | A2A | "How do agents communicate?" | +| **Bottom** | MCP | "What tools can agents use?" | + +--- + +## Our Project: Multi-Agent Research Assistant + +### Built With + +- **.NET 10.0** — Latest runtime +- **ABP Framework 10.0.2** — Enterprise .NET application framework +- **Semantic Kernel 1.70.0** — Microsoft's AI orchestration SDK +- **Azure OpenAI (GPT)** — LLM backbone +- **Tavily Search API** — Real-time web search +- **SQL Server** — Research persistence +- **MCP SDK** (`ModelContextProtocol` 0.8.0-preview.1) +- **A2A SDK** (`A2A` 0.3.3-preview) + + +### How It Works (Step by Step) + +**Step 1: User Submits a Query** + +For example, the user specifies a field of research in the dashboard: *“Compare the latest AI agent frameworks: LangChain, Semantic Kernel, and AutoGen”*, and then specifies execution mode as ADK-Sequential or A2A. + +**Step 2: Orchestrator Activates** + +The `ResearchOrchestrator` receives the query and constructs the `AgentContext`. In ADK mode, it constructs a `SequentialAgent` with two sub-agents; in A2A mode, it uses the `A2AServer` to send the tasks. + +**Step 3: Researcher Agent Goes to Work** + +The Researcher Agent: +- Receives the query from the context +- Uses GPT to formulate optimal search queries +- Calls the `web_search` MCP tool (powered by Tavily API) +- Collects and synthesizes raw research data +- Stores results in the shared `AgentContext` + +**Step 4: Analysis Agent Takes Over** + +The Analysis Agent: +- Reads the Researcher's raw data from `AgentContext` +- Uses GPT to perform deep analysis +- Generates a structured Markdown report with sections: + - Executive Summary + - Key Findings + - Detailed Analysis + - Comparative Assessment + - Conclusion and Recommendations +- Calls MCP tools to save the report to both filesystem and database + +**Step 5: Results Returned** + +The orchestrator collects all results and returns them to the user via the REST API. The dashboard displays the research report, analysis report, agent event timeline, and raw data. + + +### Two Execution Modes + +Our system supports two execution modes, demonstrating both ADK and A2A approaches: + +#### Mode 1: ADK Sequential Pipeline + +Agents are organized as a `SequentialAgent`. State flows automatically through the pipeline via `AgentContext`. This is an in-process approach — fast and simple. + +![sequential agent context flow](images/sequential-agent-context-flow-1200x700.png) + +#### Mode 2: A2A Protocol-Based + +Agents communicate via the A2A protocol. The Orchestrator sends `AgentTask` objects to each agent through the `A2AServer`. Each agent has its own `AgentCard` for discovery. + +![orchestrator a2a routing](images/orchestrator-a2a-routing-1200x700.png) + +### The Dashboard + +The UI provides a complete research experience: + +- **Hero Section** with system description and protocol badges +- **Architecture Cards** showing all four components (Researcher, Analyst, MCP Tools, Orchestrator) +- **Research Form** with query input and mode selection +- **Live Pipeline Status** tracking each stage of execution +- **Tabbed Results** view: Research Report, Analysis Report, Raw Data, Agent Events +- **Research History** table with past queries and their results + + +![Dashboard 1](images/image-3.png) + +![Dashboard 2](images/image-4.png) + +--- + +## Why ABP Framework? + +We chose ABP Framework as our .NET application foundation. Here's why it was a natural fit: + +| ABP Feature | How We Used It | +|-------------|---------------| +| **Auto API Controllers** | `ResearchAppService` automatically becomes REST API endpoints | +| **Dependency Injection** | Clean registration of agents, tools, orchestrator, Semantic Kernel | +| **Repository Pattern** | `IRepository` for database operations in MCP tools | +| **Module System** | All agent ecosystem config encapsulated in `AgentEcosystemModule` | +| **Entity Framework Core** | Research record persistence with code-first migrations | +| **Built-in Auth** | OpenIddict integration for securing agent endpoints | +| **Health Checks** | Monitoring agent ecosystem health | + +ABP's single layer template provided us the best .NET groundwork, which had all the enterprise features without any unnecessary complexity for a focused AI project. Of course, the agent architecture (MCP, A2A, ADK) is actually framework-agnostic and can be implemented with any .NET application. + +--- + +## Key Takeaways + +### 1. Protocols Are Complementary, Not Competing + +MCP, A2A, and ADK solve different problems. Using them together creates a complete agent system: +- **MCP**: Standardize tool access +- **A2A**: Standardize inter-agent communication +- **ADK**: Standardize agent orchestration + +### 2. Start Simple, Scale Later + +Our approach runs all of that in a single process, which is in-process A2A. Using A2A allowed us to design the code so that each agent can be extracted into its own microservice later on without affecting the code logic. + +### 3. Shared State > Message Passing (For Simple Cases) + +ADK's `AgentContext` with shared state is simpler and faster than A2A message passing for in-process scenarios. Use A2A when agents need to run as separate services. + +### 4. MCP is the Real Game-Changer + +The ability to define tools once and have any agent use them — with automatic discovery and structured invocations — eliminates enormous amounts of boilerplate code. + +### 5. LLM Abstraction is Critical + +Using Semantic Kernel's `IChatCompletionService` lets you swap between Azure OpenAI, OpenAI, Ollama, or any provider without touching agent code. + +--- + +## What's Next? + +This project demonstrates the foundation of a multi-agent system. Future enhancements could include: + +- **Streaming responses** — Real-time updates as agents work (A2A supports this) +- **More specialized agents** — Code analysis, translation, fact-checking agents +- **Distributed deployment** — Each agent as a separate microservice with HTTP-based A2A +- **Agent marketplace** — Discover and integrate third-party agents via A2A Agent Cards +- **Human-in-the-loop** — Using A2A's `InputRequired` state for human approval steps +- **RAG integration** — MCP tools for vector database search + +--- + +## Resources + +| Resource | Link | +|----------|------| +| **MCP Specification** | [modelcontextprotocol.io](https://modelcontextprotocol.io) | +| **A2A Specification** | [google.github.io/A2A](https://google.github.io/A2A) | +| **ADK Documentation** | [google.github.io/adk-docs](https://google.github.io/adk-docs) | +| **ABP Framework** | [abp.io](https://abp.io) | +| **Semantic Kernel** | [github.com/microsoft/semantic-kernel](https://github.com/microsoft/semantic-kernel) | +| **MCP .NET SDK** | [NuGet: ModelContextProtocol](https://www.nuget.org/packages/ModelContextProtocol) | +| **A2A .NET SDK** | [NuGet: A2A](https://www.nuget.org/packages/A2A) | +| **Our Source Code** | [GitHub Repository](https://github.com/fahrigedik/agent-ecosystem-in-abp) | + +--- + +## Conclusion + +Developing a multi-agent AI system is no longer a futuristic dream; it’s something that can actually be achieved today by using open protocols and available frameworks. In this manner, by using **MCP** for access to tools, **A2A** for communicating between agents, and **ADK** for orchestration, we have actually built a Research Assistant. + +ABP Framework and .NET turned out to be an excellent choice, delivering us the infrastructure we needed to implement DI, repositories, auto APIs, and modules, allowing us to work completely on the AI agent architecture. + +The era of single LLM calls is ending, and the era of agent ecosystems begins now. + +--- \ No newline at end of file diff --git a/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/agent-context.png b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/agent-context.png new file mode 100644 index 0000000000..955bfbd4f5 Binary files /dev/null and b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/agent-context.png differ diff --git a/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/agent-ecosystem.png b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/agent-ecosystem.png new file mode 100644 index 0000000000..9d23ff605d Binary files /dev/null and b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/agent-ecosystem.png differ diff --git a/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/agent-state-flow.png b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/agent-state-flow.png new file mode 100644 index 0000000000..a0f931ae23 Binary files /dev/null and b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/agent-state-flow.png differ diff --git a/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/image-1.png b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/image-1.png new file mode 100644 index 0000000000..6c3dc299a4 Binary files /dev/null and b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/image-1.png differ diff --git a/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/image-2.png b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/image-2.png new file mode 100644 index 0000000000..d59ae03432 Binary files /dev/null and b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/image-2.png differ diff --git a/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/image-3.png b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/image-3.png new file mode 100644 index 0000000000..40a70e4743 Binary files /dev/null and b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/image-3.png differ diff --git a/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/image-4.png b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/image-4.png new file mode 100644 index 0000000000..74f7a054b7 Binary files /dev/null and b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/image-4.png differ diff --git a/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/image.png b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/image.png new file mode 100644 index 0000000000..cd261b6bbe Binary files /dev/null and b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/image.png differ diff --git a/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/mcp-client-server-1200x700.png b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/mcp-client-server-1200x700.png new file mode 100644 index 0000000000..f10ab9783c Binary files /dev/null and b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/mcp-client-server-1200x700.png differ diff --git a/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/orchestrator-a2a-routing-1200x700.png b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/orchestrator-a2a-routing-1200x700.png new file mode 100644 index 0000000000..b11f8a7683 Binary files /dev/null and b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/orchestrator-a2a-routing-1200x700.png differ diff --git a/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/orchestrator-researcher-seq-1200x700.png b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/orchestrator-researcher-seq-1200x700.png new file mode 100644 index 0000000000..dc372df380 Binary files /dev/null and b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/orchestrator-researcher-seq-1200x700.png differ diff --git a/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/sequential-agent-context-flow-1200x700.png b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/sequential-agent-context-flow-1200x700.png new file mode 100644 index 0000000000..607048670e Binary files /dev/null and b/docs/en/Community-Articles/09-02-2026-building-multiagent-system-in-dotnet/images/sequential-agent-context-flow-1200x700.png differ diff --git a/docs/en/Community-Articles/2025-12-18-Implementing-Multiple-Global-Query-Filters-With-Entity-Framework-Core/images/cover.png b/docs/en/Community-Articles/2025-12-18-Implementing-Multiple-Global-Query-Filters-With-Entity-Framework-Core/images/cover.png new file mode 100644 index 0000000000..4ceba1f399 Binary files /dev/null and b/docs/en/Community-Articles/2025-12-18-Implementing-Multiple-Global-Query-Filters-With-Entity-Framework-Core/images/cover.png differ diff --git a/docs/en/Community-Articles/2025-12-18-Implementing-Multiple-Global-Query-Filters-With-Entity-Framework-Core/post.md b/docs/en/Community-Articles/2025-12-18-Implementing-Multiple-Global-Query-Filters-With-Entity-Framework-Core/post.md new file mode 100644 index 0000000000..120600fc87 --- /dev/null +++ b/docs/en/Community-Articles/2025-12-18-Implementing-Multiple-Global-Query-Filters-With-Entity-Framework-Core/post.md @@ -0,0 +1,728 @@ +# Implementing Multiple Global Query Filters with Entity Framework Core + +Global query filters are one of Entity Framework Core's most powerful features for automatically filtering data based on certain conditions. They allow you to define filter criteria at the entity level that are automatically applied to all LINQ queries, making it impossible for developers to accidentally forget to include important filtering logic. In this article, we'll explore how to implement multiple global query filters in ABP Framework, covering built-in filters, custom filters, and performance optimization techniques. + +By the end of this guide, you'll understand how ABP Framework's data filtering system works, how to create custom global query filters for your specific business requirements, how to combine multiple filters effectively, and how to optimize filter performance using user-defined functions. + +## Understanding Global Query Filters in EF Core + +Global query filters were introduced in EF Core 2.0 and allow you to automatically append LINQ predicates to queries generated for an entity type. This is particularly useful for scenarios like multi-tenancy, soft delete, data isolation, and row-level security. + +In traditional applications, developers must remember to add filter conditions manually to every query: + +```csharp +// Manual filtering - error-prone and tedious +var activeBooks = await _bookRepository + .GetListAsync(b => b.IsDeleted == false && b.TenantId == currentTenantId); +``` + +With global query filters, this logic is applied automatically: + +```csharp +// Filter is applied automatically - no manual filtering needed +var activeBooks = await _bookRepository.GetListAsync(); +``` + +ABP Framework provides a sophisticated data filtering system built on top of EF Core's global query filters, with built-in support for soft delete, multi-tenancy, and the ability to easily create custom filters. + +### Important: Plain EF Core vs ABP Composition + +In plain EF Core, calling `HasQueryFilter` multiple times for the same entity does **not** create multiple active filters. The last call replaces the previous one (unless you use newer named-filter APIs in recent EF Core versions). + +ABP provides `HasAbpQueryFilter` to compose query filters safely. This method combines your custom filter with ABP's built-in filters (such as `ISoftDelete` and `IMultiTenant`) and with other `HasAbpQueryFilter` calls. + +## ABP Framework's Data Filtering System + +ABP's data filtering system is defined in the `Volo.Abp.Data` namespace and provides a consistent way to manage filters across your application. The core interface is `IDataFilter`, which allows you to enable or disable filters programmatically. + +### Built-in Filters + +ABP Framework comes with several built-in filters: + +1. **ISoftDelete**: Automatically filters out soft-deleted entities +2. **IMultiTenant**: Automatically filters entities by current tenant (for SaaS applications) +3. **IIsActive**: Filters entities based on active status + +Let's look at how these are implemented in the ABP framework: + +The `ISoftDelete` interface is straightforward: + +```csharp +namespace Volo.Abp; + +public interface ISoftDelete +{ + bool IsDeleted { get; } +} +``` + +Any entity implementing this interface will automatically have deleted records filtered out of queries. + +### Enabling and Disabling Filters + +ABP provides the `IDataFilter` service to control filter behavior at runtime: + +```csharp +public class BookAppService : ApplicationService +{ + private readonly IDataFilter _softDeleteFilter; + private readonly IRepository _bookRepository; + + public BookAppService( + IDataFilter softDeleteFilter, + IRepository bookRepository) + { + _softDeleteFilter = softDeleteFilter; + _bookRepository = bookRepository; + } + + public async Task> GetAllBooksIncludingDeletedAsync() + { + // Temporarily disable the soft delete filter + using (_softDeleteFilter.Disable()) + { + return await _bookRepository.GetListAsync(); + } + } + + public async Task> GetActiveBooksAsync() + { + // Filter is enabled by default - soft-deleted items are excluded + return await _bookRepository.GetListAsync(); + } +} +``` + +You can also check if a filter is enabled and enable/disable it programmatically: + +```csharp +public async Task ProcessBooksAsync() +{ + // Check if filter is enabled + if (_softDeleteFilter.IsEnabled) + { + // Enable or disable explicitly + _softDeleteFilter.Enable(); + // or + _softDeleteFilter.Disable(); + } +} +``` + +## Creating Custom Global Query Filters + +Now let's create custom global query filters for a real-world scenario. Imagine we have a library management system where we need to filter books based on: + +1. **Publication Status**: Only show published books in public areas +2. **User's Department**: Users can only see books from their department +3. **Approval Status**: Only show approved content + +### Step 1: Define Filter Interfaces + +First, create the filter interfaces. You can define them in the same file as your entity or in separate files: + +```csharp +// Can be placed in the same file as Book entity or in separate files +namespace Library; + +public interface IPublishable +{ + bool IsPublished { get; } + DateTime PublishDate { get; set; } +} + +public interface IDepartmentRestricted +{ + Guid DepartmentId { get; } +} + +public interface IApproveable +{ + bool IsApproved { get; } +} + +public interface IPublishedFilter +{ +} + +public interface IApprovedFilter +{ +} +``` + +`IPublishable` / `IApproveable` are implemented by entities and define entity properties. +`IPublishedFilter` / `IApprovedFilter` are filter-state interfaces used with `IDataFilter` so you can enable/disable those filters at runtime. + +### Step 2: Add Filter Expressions to DbContext + +Now let's add the filter expressions to your existing DbContext. First, here's how to use `HasAbpQueryFilter` to create **always-on** filters (they cannot be toggled at runtime): + +```csharp +// MyProjectDbContext.cs +using Microsoft.EntityFrameworkCore; +using Volo.Abp.EntityFrameworkCore; +using Volo.Abp.GlobalFeatures; +using Volo.Abp.MultiTenancy; +using Volo.Abp.Authorization; +using Volo.Abp.Data; +using Volo.Abp.EntityFrameworkCore.Modeling; + +namespace Library; + +public class LibraryDbContext : AbpDbContext +{ + public DbSet Books { get; set; } + public DbSet Departments { get; set; } + public DbSet Authors { get; set; } + + public LibraryDbContext(DbContextOptions options) + : base(options) + { + } + + protected override void OnModelCreating(ModelBuilder builder) + { + base.OnModelCreating(builder); + + builder.Entity(b => + { + b.ToTable("Books"); + b.ConfigureByConvention(); + + // HasAbpQueryFilter creates ALWAYS-ACTIVE filters + // These cannot be toggled at runtime via IDataFilter + b.HasAbpQueryFilter(book => + book.IsPublished && + book.PublishDate <= DateTime.UtcNow); + + b.HasAbpQueryFilter(book => book.IsApproved); + }); + + builder.Entity(b => + { + b.ToTable("Departments"); + b.ConfigureByConvention(); + }); + } +} +``` + +> **Note:** Using `HasAbpQueryFilter` alone creates filters that are always active and cannot be toggled at runtime. This approach is simpler but less flexible. For toggleable filters, see Step 3 below. + +### Step 3: Make Filters Toggleable (Optional) + +If you need filters that can be enabled/disabled at runtime via `IDataFilter`, override `ShouldFilterEntity` and `CreateFilterExpression` instead of (or in addition to) `HasAbpQueryFilter`: + +```csharp +// MyProjectDbContext.cs +using System; +using System.Linq.Expressions; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Metadata.Builders; +using Volo.Abp.EntityFrameworkCore; + +namespace Library; + +public class LibraryDbContext : AbpDbContext +{ + protected bool IsPublishedFilterEnabled => DataFilter?.IsEnabled() ?? false; + protected bool IsApprovedFilterEnabled => DataFilter?.IsEnabled() ?? false; + + protected override bool ShouldFilterEntity(IMutableEntityType entityType) + { + if (typeof(IPublishable).IsAssignableFrom(typeof(TEntity))) + { + return true; + } + + if (typeof(IApproveable).IsAssignableFrom(typeof(TEntity))) + { + return true; + } + + return base.ShouldFilterEntity(entityType); + } + + protected override Expression>? CreateFilterExpression( + ModelBuilder modelBuilder, + EntityTypeBuilder entityTypeBuilder) + where TEntity : class + { + var expression = base.CreateFilterExpression(modelBuilder, entityTypeBuilder); + + if (typeof(IPublishable).IsAssignableFrom(typeof(TEntity))) + { + Expression> publishFilter = e => + !IsPublishedFilterEnabled || + ( + EF.Property(e, nameof(IPublishable.IsPublished)) && + EF.Property(e, nameof(IPublishable.PublishDate)) <= DateTime.UtcNow + ); + + expression = expression == null + ? publishFilter + : QueryFilterExpressionHelper.CombineExpressions(expression, publishFilter); + } + + if (typeof(IApproveable).IsAssignableFrom(typeof(TEntity))) + { + Expression> approvalFilter = e => + !IsApprovedFilterEnabled || EF.Property(e, nameof(IApproveable.IsApproved)); + + expression = expression == null + ? approvalFilter + : QueryFilterExpressionHelper.CombineExpressions(expression, approvalFilter); + } + + return expression; + } +} +``` + +This mapping step is what connects `IDataFilter` and `IDataFilter` to entity-level predicates. Without this step, `HasAbpQueryFilter` expressions remain always active. + +> **Important:** Note that we use `DateTime` (not `DateTime?`) in the filter expression to match the entity property type. Adjust accordingly if your entity uses nullable `DateTime?`. + +### Step 4: Disable Custom Filters with IDataFilter + +Once custom filters are mapped to the ABP data-filter pipeline, you can disable them just like built-in filters: + +```csharp +public class BookAppService : ApplicationService +{ + private readonly IRepository _bookRepository; + private readonly IDataFilter _publishedFilter; + private readonly IDataFilter _approvedFilter; + + public BookAppService( + IRepository bookRepository, + IDataFilter publishedFilter, + IDataFilter approvedFilter) + { + _bookRepository = bookRepository; + _publishedFilter = publishedFilter; + _approvedFilter = approvedFilter; + } + + public async Task> GetIncludingUnpublishedAndUnapprovedAsync() + { + using (_publishedFilter.Disable()) + using (_approvedFilter.Disable()) + { + return await _bookRepository.GetListAsync(); + } + } +} +``` + +## Advanced: Multiple Filters with User-Defined Functions + +Starting from ABP v8.3, you can use user-defined function (UDF) mapping for better performance. This approach generates more efficient SQL and allows EF Core to create better execution plans. + +### Step 1: Enable UDF Mapping + +First, configure your module to use UDF mapping: + +```csharp +// MyProjectModule.cs +using Volo.Abp.EntityFrameworkCore; +using Volo.Abp.EntityFrameworkCore.GlobalFilters; +using Microsoft.Extensions.DependencyInjection; + +namespace Library; + +[DependsOn( + typeof(AbpEntityFrameworkCoreModule), + typeof(AbpDddDomainModule) +)] +public class LibraryModule : AbpModule +{ + public override void ConfigureServices(ServiceConfigurationContext context) + { + Configure(options => + { + options.UseDbFunction = true; // Enable UDF mapping + }); + } +} +``` + +### Step 2: Define DbFunctions + +Create static methods that EF Core will map to database functions: + +```csharp +// LibraryDbFunctions.cs +using Microsoft.EntityFrameworkCore; + +namespace Library; + +public static class LibraryDbFunctions +{ + public static bool IsPublishedFilter(bool isPublished, DateTime? publishDate) + { + return isPublished && (publishDate == null || publishDate <= DateTime.UtcNow); + } + + public static bool IsApprovedFilter(bool isApproved) + { + return isApproved; + } + + public static bool DepartmentFilter(Guid entityDepartmentId, Guid userDepartmentId) + { + return entityDepartmentId == userDepartmentId; + } +} +``` + +### Step 4: Apply UDF Filters + +Update your DbContext to use the UDF-based filters: + +```csharp +// MyProjectDbContext.cs +protected override void OnModelCreating(ModelBuilder builder) +{ + base.OnModelCreating(builder); + + // Map CLR methods to SQL scalar functions. + // Create matching SQL functions in a migration. + var isPublishedMethod = typeof(LibraryDbFunctions).GetMethod( + nameof(LibraryDbFunctions.IsPublishedFilter), + new[] { typeof(bool), typeof(DateTime?) })!; + builder.HasDbFunction(isPublishedMethod); + + var isApprovedMethod = typeof(LibraryDbFunctions).GetMethod( + nameof(LibraryDbFunctions.IsApprovedFilter), + new[] { typeof(bool) })!; + builder.HasDbFunction(isApprovedMethod); + + builder.Entity(b => + { + b.ToTable("Books"); + b.ConfigureByConvention(); + + // ABP way: define separate filters. HasAbpQueryFilter composes them. + b.HasAbpQueryFilter(book => + LibraryDbFunctions.IsPublishedFilter(book.IsPublished, book.PublishDate)); + + b.HasAbpQueryFilter(book => + LibraryDbFunctions.IsApprovedFilter(book.IsApproved)); + }); +} +``` + +This approach generates cleaner SQL and improves query performance, especially in complex scenarios with multiple filters. + +## Working with Complex Filter Combinations + +When combining multiple filters, it's important to understand how they interact. Let's explore some common scenarios. + +### Combining Tenant and Department Filters + +In a multi-tenant application, you might need to combine tenant isolation with department-level access control: + +```csharp +public class BookAppService : ApplicationService +{ + private readonly IRepository _bookRepository; + private readonly IDataFilter _tenantFilter; + private readonly ICurrentUser _currentUser; + + public BookAppService( + IRepository bookRepository, + IDataFilter tenantFilter, + ICurrentUser currentUser) + { + _bookRepository = bookRepository; + _tenantFilter = tenantFilter; + _currentUser = currentUser; + } + + public async Task> GetMyDepartmentBooksAsync() + { + var currentUser = _currentUser; + var userDepartmentId = GetUserDepartmentId(currentUser); + + // Get all books without department filter, then filter in memory + // (for scenarios where you need custom filter logic) + using (_tenantFilter.Disable()) // Optional: disable tenant filter if needed + { + var allBooks = await _bookRepository.GetListAsync(); + + // Apply department filter in memory (custom logic) + var departmentBooks = allBooks + .Where(b => b.DepartmentId == userDepartmentId) + .ToList(); + + return ObjectMapper.Map, List>(departmentBooks); + } + } + + private Guid GetUserDepartmentId(ICurrentUser currentUser) + { + // Get user's department from claims or database + var departmentClaim = currentUser.FindClaim("DepartmentId"); + return Guid.Parse(departmentClaim.Value); + } +} +``` + +### Filter Priority and Override + +Sometimes you need to override filters in specific scenarios. ABP provides a flexible way to handle this: + +```csharp +public async Task GetBookForEditingAsync(Guid id) +{ + // Disable soft delete filter to get deleted records for restoration + using (DataFilter.Disable()) + { + return await _bookRepository.GetAsync(id); + } +} + +public async Task GetBookIncludingUnpublishedAsync(Guid id) +{ + // Use GetQueryableAsync to customize the query + var query = await _bookRepository.GetQueryableAsync(); + + // Manually apply or bypass filters + var book = await query + .FirstOrDefaultAsync(b => b.Id == id); + + return book; +} +``` + +## Best Practices for Multiple Global Query Filters + +When implementing multiple global query filters, consider these best practices: + +### 1. Keep Filters Simple + +Complex filter expressions can significantly impact query performance. Keep each condition focused on a single concern. In ABP, you can define them separately with `HasAbpQueryFilter`, which composes with ABP's built-in filters: + +```csharp +// Good (ABP): separate, focused filters composed by HasAbpQueryFilter +b.HasAbpQueryFilter(b => b.IsPublished); +b.HasAbpQueryFilter(b => b.IsApproved); +b.HasAbpQueryFilter(b => b.DepartmentId == userDeptId); + +// Avoid: calling HasQueryFilter multiple times for the same entity +// in plain EF Core (the last call replaces the previous one) +b.HasQueryFilter(b => b.IsPublished); +b.HasQueryFilter(b => b.IsApproved); +``` + +### 2. Use Indexing + +Ensure your database has appropriate indexes for filtered columns: + +```csharp +builder.Entity(b => +{ + b.HasIndex(b => b.IsPublished); + b.HasIndex(b => b.IsApproved); + b.HasIndex(b => b.DepartmentId); + b.HasIndex(b => new { b.IsPublished, b.PublishDate }); +}); +``` + +### 3. Consider Performance Impact + +Use UDF mapping for better performance with complex filters. Profile your queries and analyze execution plans. + +### 4. Document Filter Behavior + +Clearly document which filters are applied to each entity to help developers understand the behavior: + +```csharp +/// +/// Book entity with the following global query filters: +/// - ISoftDelete: Automatically excludes soft-deleted books +/// - IMultiTenant: Automatically filters by current tenant +/// - IPublishable: Excludes unpublished books (based on IsPublished and PublishDate) +/// - IApproveable: Excludes unapproved books (based on IsApproved) +/// +/// +/// Filter interfaces (IPublishable, IApproveable, IPublishedFilter, IApprovedFilter) +/// are defined in Step 1: Define Filter Interfaces +/// +public class Book : AuditedAggregateRoot, ISoftDelete, IMultiTenant, IPublishable, IApproveable +{ + public string Name { get; set; } + + public BookType Type { get; set; } + + public DateTime PublishDate { get; set; } + + public float Price { get; set; } + + public bool IsPublished { get; set; } + + public bool IsApproved { get; set; } + + public Guid? TenantId { get; set; } + + public bool IsDeleted { get; set; } + + public Guid DepartmentId { get; set; } +} +``` + +## Testing Global Query Filters + +Testing with global query filters can be challenging. Here's how to do it effectively: + +### Unit Testing Filters + +```csharp +[Fact] +public void Book_QueryFilter_Should_Filter_Unpublished() +{ + var options = new DbContextOptionsBuilder() + .UseInMemoryDatabase(databaseName: "TestDb") + .Options; + + using (var context = new BookStoreDbContext(options)) + { + context.Books.Add(new Book { Name = "Published Book", IsPublished = true }); + context.Books.Add(new Book { Name = "Unpublished Book", IsPublished = false }); + context.SaveChanges(); + } + + using (var context = new BookStoreDbContext(options)) + { + // Query with filter enabled (default) + var publishedBooks = context.Books.ToList(); + Assert.Single(publishedBooks); + Assert.Equal("Published Book", publishedBooks[0].Name); + } +} +``` + +### Integration Testing with Filter Control + +```csharp +[Fact] +public async Task Should_Get_Deleted_Book_When_Filter_Disabled() +{ + var dataFilter = GetRequiredService(); + + // Arrange + var book = await _bookRepository.InsertAsync( + new Book { Name = "Test Book" }, + autoSave: true + ); + + await _bookRepository.DeleteAsync(book); + + // Act - with filter disabled + using (dataFilter.Disable()) + { + var deletedBook = await _bookRepository + .FirstOrDefaultAsync(b => b.Id == book.Id); + + deletedBook.ShouldNotBeNull(); + deletedBook.IsDeleted.ShouldBeTrue(); + } +} +``` + +### Testing Custom Global Query Filters + +Here's a complete example of testing custom toggleable filters: + +```csharp +[Fact] +public async Task Should_Filter_Unpublished_Books_By_Default() +{ + // Default: filters are enabled + var result = await WithUnitOfWorkAsync(async () => + { + var bookRepository = GetRequiredService>(); + return await bookRepository.GetListAsync(); + }); + + // Only published and approved books should be returned + result.All(b => b.IsPublished).ShouldBeTrue(); + result.All(b => b.IsApproved).ShouldBeTrue(); +} + +[Fact] +public async Task Should_Return_All_Books_When_Filter_Disabled() +{ + var result = await WithUnitOfWorkAsync(async () => + { + // Disable the published filter to see unpublished books + using (_publishedFilter.Disable()) + { + var bookRepository = GetRequiredService>(); + return await bookRepository.GetListAsync(); + } + }); + + // Should include unpublished books + result.Any(b => b.Name == "Unpublished Book").ShouldBeTrue(); +} + +[Fact] +public async Task Should_Combine_Filters_Correctly() +{ + // Test combining multiple filter disables + using (_publishedFilter.Disable()) + using (_approvedFilter.Disable()) + { + var bookRepository = GetRequiredService>(); + var allBooks = await bookRepository.GetListAsync(); + + // All books should be visible + allBooks.Count.ShouldBe(5); + } +} +``` + +> **Tip:** When using ABP's test base, inject `IDataFilter` and `IDataFilter` to control filters in your tests. + +## Key Takeaways + +✅ **Global query filters automatically apply filter criteria to all queries**, reducing developer error and ensuring consistent data filtering across your application. + +✅ **ABP Framework provides a sophisticated data filtering system** with built-in support for soft delete (`ISoftDelete`) and multi-tenancy (`IMultiTenant`), plus the ability to create custom filters. + +✅ **Use `IDataFilter` to control filters at runtime**, enabling or disabling filters as needed for specific operations. + +✅ **To make custom filters toggleable, override `ShouldFilterEntity` and `CreateFilterExpression`** in your DbContext. Using only `HasAbpQueryFilter` creates filters that are always active. + +✅ **Combine multiple filters carefully** and consider performance implications, especially with complex filter expressions. + +✅ **Leverage user-defined function (UDF) mapping** for better SQL generation and query performance, available since ABP v8.3. + +✅ **Always test filter behavior** to ensure filters work as expected in different scenarios, including edge cases. + +## Conclusion + +Global query filters are essential for building secure, well-isolated applications. ABP Framework's data filtering system provides a robust foundation that builds on EF Core's capabilities while adding convenient features like runtime filter control and UDF mapping optimization. + +By implementing multiple global query filters strategically, you can ensure data isolation, simplify your query logic, and reduce the risk of accidentally exposing unauthorized data. Remember to keep filters simple, add appropriate database indexes, and test thoroughly to maintain optimal performance. + +Start implementing global query filters in your ABP applications today to leverage automatic data filtering across all your repositories and queries. + +### See Also + +- [ABP Data Filtering Documentation](https://abp.io/docs/latest/framework/fundamentals/data-filtering) +- [EF Core Global Query Filters](https://learn.microsoft.com/en-us/ef/core/querying/filters) +- [ABP Multi-Tenancy Documentation](https://abp.io/docs/latest/framework/fundamentals/multi-tenancy) +- [Using User-defined function mapping for global filters](https://abp.io/docs/latest/framework/infrastructure/data-filtering#using-user-defined-function-mapping-for-global-filters) + +--- + +## References + +- [ABP Framework Documentation](https://docs.abp.io) +- [Entity Framework Core Documentation](https://docs.microsoft.com/en-us/ef/core/) +- [EF Core Global Query Filters](https://learn.microsoft.com/en-us/ef/core/querying/filters) +- [User-defined Function Mapping](https://learn.microsoft.com/en-us/ef/core/querying/user-defined-function-mapping) diff --git a/docs/en/Community-Articles/2025-12-18-Implementing-Multiple-Global-Query-Filters-With-Entity-Framework-Core/summary.md b/docs/en/Community-Articles/2025-12-18-Implementing-Multiple-Global-Query-Filters-With-Entity-Framework-Core/summary.md new file mode 100644 index 0000000000..85c96c2a16 --- /dev/null +++ b/docs/en/Community-Articles/2025-12-18-Implementing-Multiple-Global-Query-Filters-With-Entity-Framework-Core/summary.md @@ -0,0 +1 @@ +Global query filters in Entity Framework Core allow automatic data filtering at the entity level. This article covers ABP Framework's data filtering system, including built-in filters (ISoftDelete, IMultiTenant), custom filter implementation, and performance optimization using user-defined functions. \ No newline at end of file diff --git a/docs/en/Community-Articles/2026-02-02-ndc-london-article/post.md b/docs/en/Community-Articles/2026-02-02-ndc-london-article/post.md new file mode 100644 index 0000000000..eeab7b79e1 --- /dev/null +++ b/docs/en/Community-Articles/2026-02-02-ndc-london-article/post.md @@ -0,0 +1,50 @@ + +The software development world converged on the **Queen Elizabeth II Centre** in Westminster from **January 26-30** for **NDC London 2026**. As one of the most anticipated tech conferences in Europe, this year’s event delivered a masterclass in the future of the stack. + +We have spent five days immersed in workshops and sessions. Here is our comprehensive recap of the highlights and the technical shifts that will define 2026\. + +![enter image description here](https://abp.io/api/file-management/file-descriptor/share?shareToken=CfDJ8NqaJZr2oLpIuRyHVjJk1BBjsk292Ejh%2b5X2yeS2pD9uibmq8qxh50b9eOg5U5Ib2jAFaeCHItbTyOpajIeaUzNKg/p0WHohjf1iac2%2bVL6kT/Y3ORSKpRQrdE22QJTwAxBMUryUgTQJ989hYtsvF%2bkReDR03k0gIl4ApUaji6Tg) + +## **1\. High-Performance .NET and C\# Evolution** + +A major focus this year was the continued evolution of the .NET ecosystem. Experts delivered standout sessions on high-performance coding patterns, it’s clear that efficiency and "Native AOT" (Ahead-of-Time compilation) are no longer niche topics, they are becoming industry standards. + +## **1\. Moving Beyond the AI Hype** + +If 2025 was about experimenting with LLMs, NDC London 2026 was about AI integration. Sessions from experts showcased how developers are moving past simple chatbots and integrating AI directly into the CI/CD pipeline and automated testing suites. + +![enter image description here](https://abp.io/api/file-management/file-descriptor/share?shareToken=CfDJ8NqaJZr2oLpIuRyHVjJk1BDxx%2FqqZ08tgIxCPsAnDDD2w5yJPjVXwUJrbGHpSln3npfpJEBQ78chKoSlZS1cz1nbigNQtRq60dlbyMLwnAgE52tBwUJz481PcBgNtyFMW7rm7oKhFV9c7tK8bEcK%2FscRudaV8w7%2FPO8U5KJv%2BQal) + +![enter image description here](https://abp.io/api/file-management/file-descriptor/share?shareToken=CfDJ8NqaJZr2oLpIuRyHVjJk1BBdNXgjnu7HIGgX//VJrh3XzjPns4ODHMUhZ%2bDQCcZa2Nc0%2b%2bshyt2UXqaIKEJMPHh6JIDGBtUrdQZ1EzmGn3pingGKiw7YTbh0Z%2bLRZSmcY6pEXkd1S/7VVncmICIHrQgjg%2b7eb2uO28qadIWGbD99) + +## **3\. The "Hallway Track" and Community Networking** + +One of the biggest draws of **NDC London** is the community. Between the 100+ sessions, the exhibitor hall was buzzing with live demos and networking. + +Watch the video: + +[![Watch the Hallway Track video](https://img.youtube.com/vi/yb-FILkqL7U/hqdefault.jpg)](https://www.youtube.com/watch?v=yb-FILkqL7U) + +![enter image description here](https://abp.io/api/file-management/file-descriptor/share?shareToken=CfDJ8NqaJZr2oLpIuRyHVjJk1BCLbkSK3YZDZZhBGi/IBZOCXgcWHwTyS/s5v6U%2bSeQnY5yCTzMJFTu/mA4xX%2bL5tjbMPfEI8gvCwmVEfSymGFIiJLtAbP8T2zFZev%2bm74sTsQ%2b4sdsLKbdijiae3G%2b45ijWep7yFJx9BWMgV263zzvI) +![enter image description here](https://abp.io/api/file-management/file-descriptor/share?shareToken=CfDJ8NqaJZr2oLpIuRyHVjJk1BCrCACVWDlDjOgl9ASMeZNMVBGye%2bfya4aO6UW5Kyg9MCVLswzckRWS%2bT71AcQuWMGfiousZlSCrKNAGrosPXzuWAsxnNai3xBcj061TWjGAGX4u1AtrD0eknRxuKe2ba%2bVO7r0sZqle%2bUyZa305hhO) + +## **4\. The Big Giveaway: Our Xbox Series S Raffle** + +One of our favorite moments of the week was our Raffle Session. We love giving back to the community that inspires us, and this year, the energy at our booth was higher than ever. + +We were thrilled to give away a brand-new Xbox Series S to one lucky winner\! It was fantastic to meet so many of you who stopped by to enter, chat about your current projects, and share your thoughts on the future of the industry. + +**Congratulations again to our 2026 winner\!** We hope you enjoy some well-deserved gaming time after a long week of learning. + +![enter image description here](https://abp.io/api/file-management/file-descriptor/share?shareToken=CfDJ8NqaJZr2oLpIuRyHVjJk1BBozHxXhCL7qMtx5LAxvafvPOKaZJepGlR7tgHVvw6wGpuR4Ervipym%2busZ7eMl3uook15K1874RYEwUenBfoZSJBm33MdaHFduha9iJ7tnfTmW12QbdYM77yqfVJ7EonuJsRrNySdYrQuRI0H2RkZr) + +Watch the video: + +[![Watch the Xbox Series S giveaway](https://img.youtube.com/vi/W5HRwys8dpE/hqdefault.jpg)](https://www.youtube.com/watch?v=W5HRwys8dpE) + + +## **Final Thoughts: See You at NDC London 2027\!** + +NDC London 2026 proved once again why it is a cornerstone event for the global developer community. We are returning to our projects with a refreshed roadmap and a deeper understanding of the tools shaping our industry. + +![enter image description here](https://abp.io/api/file-management/file-descriptor/share?shareToken=CfDJ8NqaJZr2oLpIuRyHVjJk1BDJq%2bG7yg1jtoY3gGH8mFMZen%2bncuL%2bKrQHY4/FPOF2KXcLyEjJymhk0JAVwJ76lPeqBchrfsAK3TOUTKY15tC7jm3uwgcH9IWRxCM2ouqxVGqGPd8YIRdG7H7QgyuknBkS4wsdYI9gl1EGqgPtTXJd) diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/0.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/0.png new file mode 100644 index 0000000000..a0cf7c166d Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/0.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/1.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/1.png new file mode 100644 index 0000000000..da57dc3bb9 Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/1.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/2.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/2.png new file mode 100644 index 0000000000..95634840d7 Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/2.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/3.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/3.png new file mode 100644 index 0000000000..398d89e6de Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/3.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/4.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/4.png new file mode 100644 index 0000000000..d2ba557ec7 Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/4.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/4_1.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/4_1.png new file mode 100644 index 0000000000..09e3faacb7 Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/4_1.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/4_2.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/4_2.png new file mode 100644 index 0000000000..fd0965bb99 Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/4_2.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/5.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/5.png new file mode 100644 index 0000000000..70863a30df Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/5.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/6.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/6.png new file mode 100644 index 0000000000..0c2926ca25 Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/6.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/7.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/7.png new file mode 100644 index 0000000000..929b642340 Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/7.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/Post.md b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/Post.md new file mode 100644 index 0000000000..960ad2ec66 --- /dev/null +++ b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/Post.md @@ -0,0 +1,325 @@ +![Cover](0.png) + +This year we attended NDC London as a sponsor for [ABP](https://abp.io). The conference was held at the same place [Queen Elizabeth II](https://qeiicentre.london/) as previous years. I guess this is the best conf for .NET developers around the world (thanks to the NDC team). And we attend last 5 years. It was 3 full days started from 28 to 30 January 2026. As an exhibitor we talked a lot with the attendees who stopped by our booth or while we were eating or in the conf rooms. + +This is the best opportunity to know what everyone is doing in software society. While I was explaining ABP to the people who first time heard, I also ask about what they do in their work. Developers mostly work on web platforms. And as you know, there's an AI transformation in our sector. That's why I wonder if other people also stick to the latest AI trend! Well... not as I expected. In Volosoft, we are tightly following AI trends, using in our daily development, injecting this new technology to our product and trying to benefit this as much as possible. + +![Our booth](1.png) + +This new AI trend is same as the invention of printing (by Johannes Gutenberg in 1450) or it's similar to invention of calculators (by William S. Burroughs in 1886). The countries who benefit these inventions got a huge increase in their welfare level. So, we welcome this new AI invention in software development, design, devops and testing. I also see this as a big wave in the ocean, if you are prepared and develop your skills, you can play with it 🌊 and it's called surfing or you'll die against the AI wave in this ocean. But not all the companies react this transformation quickly. Many developers use it like ChatGpt conversation (copy-paste from it) or using GitHub Co-Pilot in a limited manner. But as I heard from Steven Sanderson's session and other Microsoft employees, they are already using it to reproduce the bugs reported in the issues or creating even feature PRs via Co-Pilot. That's a good! + +Here're some pictures from the conf and that's me on the left side with brown shoes :) + +![Alper & Halil](2.png) + +Another thing I see, there's a decrease in the number of attendees'. I don't know the real reason but probably the IT companies cut the budget for conferences. As you also hear, many companies layoff because of the AI replaces some of the positions. + +The food was great during the conference. It was more like eating sessions for me. Lots of good meals from different countries' kitchen. In the second day, there was a party. People grabbed their beers, wines, beverages and did some networking. + +I was expecting more AI oriented sessions but it was less then my expectations. Even though I was an exhibitor, I tried to attend some of the session. I'll tell you my notes. + +--- + +Here's a quick video from the exhibitors' area on the 3rd floor and our ABP booth's Xbox raffle: + +**Video 1: NDC Conference 2026 Environment** 👉 [https://youtu.be/U1kiYG12KgA](https://youtu.be/U1kiYG12KgA) + +[![Video 1](youtube-cover-1.png)](https://youtu.be/U1kiYG12KgA) + + +**Video 2: Our raffle for XBOX** 👉 [https://youtu.be/7o0WX70qYw0](https://youtu.be/7o0WX70qYw0) +[![Video 2](youtube-cover-2.png)](https://youtu.be/7o0WX70qYw0) + +--- + + +## Sessions / Talks + +### The Dangers of Probably-Working Software | Damian Brady + +![Damian Session](3.png) + +The first session and keynote was from Damian Brady. He's part of Developer Advocacy team at GitHub. And the topic was "The dangers of probably-working software". He started with some negative impact of how generative AI is killing software, and he ended like this a not so bad, we can benefit from the AI transformation. First time I hear "sleepwalking" term for the development. He was telling when we generate code via AI, and if we don't review well-enough, we're sleepwalkers. And that's correct! and good analogy for this case. This talk centers on a powerful lesson: *“**Don’t ship code you don’t truly understand.**”* + Damian tells a personal story from his early .NET days when he implemented a **Huffman compression algorithm** based largely on Wikipedia. The code **“worked” in small tests** but **failed in production**. The experience forced him to deeply understand the algorithm rather than relying on copied solutions. Through this story, he explores themes of trust, complexity, testing, and mental models in software engineering. + +#### Notes From This Session + +- “It seems to work” is not the same as “I understand it.” +- Code copied from Wikipedia or StackOverflow or AI platforms is inherently risky in production. +- Passing tests on small datasets does not guarantee real-world reliability (happy path ~= unhappy results) +- Performance issues often surface only in edge cases. +- Delivery pressure can discourage deep understanding — to the detriment of quality. +- Always ask: “**When does this fail?**” — not just “**Why does this work?**” + +--- + + + +### Playing The Long Game | Sheena O'Connell + +![Sheena Session](4.png) + +Sheena is a former software engineer who now trains and supports tech educators. She talks about AI tools... +AI tools are everywhere but poorly understood; there’s hype, risks, and mixed results. The key question is how individuals and organisations should play the long game (long-term strategy) so skilled human engineers—especially juniors—can still grow and thrive. +She showed some statistics about how job postings on Indeed platform dramatically decreasing for software developers. About AI generated-code, she tells, it's less secure, there might be logical problems or interesting bugs, human might not read code very well and understanding/debugging code might sometimes take much longer time. + +Being an engineer is about much more than a job title — it requires systems thinking, clear communication, dealing with uncertainty, continuous learning, discipline, and good knowledge management. The job market is shifting: demand for AI-skilled workers is rising quickly and paying premiums, and required skills are changing faster in AI-exposed roles. There’s strength in using a diversity of models instead of locking into one provider, and guardrails improve reliability. + +AI is creating new roles (like AI security, observability, and operations) and new kinds of work, while routine attrition also opens opportunities. At the same time, heavy AI use can have negative cognitive effects: people may think less, feel lonelier, and prefer talking to AI over humans. + +Organizations are becoming more dynamic and project-based, with shorter planning cycles, higher trust, and more experimentation — but also risk of “shiny new toy” syndrome. Research shows AI can boost productivity by 15–20% in many cases, especially in simpler, greenfield projects and popular languages, but it can actually reduce productivity on very complex work. Overall, the recommendation is to focus on using AI well (not just the newest model), add monitoring and guardrails, keep flexibility, and build tools that allow safe experimentation. + +![Sheena Session 2](4_1.png) + +We’re in a messy, fast-moving AI era where LLM tools are everywhere but poorly understood. There’s a lot of hype and marketing noise, making it hard even for technical people to separate reality from fantasy. Different archetypes have emerged — from AI-optimists to skeptics — and both extremes have risks. AI is great for quick prototyping but unreliable for complex work, so teams need guardrails, better practices, and a focus on learning rather than “writing more code faster.” The key question is how individuals and organizations can play the long game so strong human engineers — especially juniors — can still grow and thrive in an AI-driven world. + +![Sheena Session 3](4_2.png) + +--- + +### Crafting Intelligent Agents with Context Engineering | Carly Richmond + +![Carly Session](5.png) + +Carly is a Developer Advocate Lead at Elastic in London with deep experience in web development and agile delivery from her years in investment banking. A practical UI engineer. She brings a clear, hands-on perspective to building real-world AI systems. In her talk on **“Crafting Intelligent Agents with Context Engineering,”** she argues that prompt engineering isn’t enough — and shows how carefully shaping context across data, tools, and systems is key to creating reliable, useful AI agents. She mentioned about the context of an AI process. The context consists of Instructions, Short Memory, Long Memory, RAG, User Prompts, Tools, Structured Output. + +--- + + + +### Modular Monoliths | Kevlin Henney + +![Kevlin Session](6.png) + +Kevlin frames the “microservices vs monolith” debate as a false dichotomy. His core argument is simple but powerful: problems rarely come from *being a monolith* — they come from being a **poorly structured one**. Modularity is not a deployment choice; it is an architectural discipline. + +#### **Notes from the Talk** + +- A monolith is not inherently bad; a tangled (intertwined, complex) monolith is. +- Architecture is mostly about **boundaries**, not boxes. +- If you cannot draw clean internal boundaries, you are not ready for microservices. +- Dependencies reveal your real architecture better than diagrams. +- Teams shape systems more than tools do. +- Splitting systems prematurely increases complexity without increasing clarity. +- Good modular design makes systems **easier to change, not just easier to scale**. + +#### **So As a Developer;** + +- Start with a well-structured modular monolith before considering microservices. +- Treat modules as real first-class citizens: clear ownership, clear contracts. +- Make dependency direction explicit — no circular graphs. +- Use internal architectural tests to prevent boundary violations. +- Organize code by *capability*, not by technical layer. +- If your team structure is messy, your architecture will be messy — fix people, not tech. + +--- + +### AI Coding Agents & Skills | Steve Sanderson + +**Being productive with AI Agents** + +![Steve Session](steve-sanderson-talk.png) + +In this session, Steve started how Microsoft is excessively using AI tools for PRs, reproducing bug reports etc... He's now working on **GitHub Co-Pilot Coding Agent Runtime Team**. He says, we use brains and hands less then anytime. + +![image-20260206004021726](steve-sanderson-talk_1.png) + +**In 1 Week 293 PRs Opened by the help of AI** + +![image-20260206004403643](steve-sanderson-talk_2.png) + +**He created a new feature to Copilot with the help of Copilot in minutes** + +![Steve](steve-sanderson-talk_3.png) + +> Code is cheap! Prototypes are almost free! + +And he summarized the AI assisted development into 10 outlines. These are Subagents, Plan Mode, Skills, Delegate, Memories, Hooks, MCP, Infinite Sessions, Plugins and Git Workflow. Let's see his statements for each of these headings: + +#### **1. Subagents** + +![image-20260206005620904](steve-sanderson-talk_4.png) + +- Break big problems into smaller, specialized agents. +- Each subagent should have a clear responsibility and limited scope. +- Parallel work is better than one “smart but slow” agent. +- Reduces hallucination by narrowing context per agent. +- Easier to debug: you can inspect each agent’s output separately. + + +------ + +#### **2. Plan Mode** + +![steve-sanderson-talk_6](steve-sanderson-talk_6.png) + +- Always start with a plan before generating code. +- The plan should be explicit, human-readable, and reviewable. +- You'll align your expectations with the AI's next steps. +- Prevents wasted effort on wrong directions. +- Encourages structured thinking instead of trial-and-error coding. + +------ + +#### **3. Skills** + +![steve-sanderson-talk_7](steve-sanderson-talk_7.png) + +- These are just Markdown files but (can be also tools, scripts as well) +- Skills are reusable capabilities for AI agents. +- You cannot just give all the info (as Markdown) to the AI context (limited!), skills are being used when necessary (by their Description field) +- Treat skills like APIs: versioned, documented, and shareable. +- Prefer many small skills over one big skill set. +- Store skills in Git, not in chat history. +- Skills should integrate with real tools (CI, GitHub, browsers, etc.). + +#### 3.1 Skill > Test Your Project Skill + +![steve-sanderson-talk_8](steve-sanderson-talk_8.png) + +------ + +#### **4. Delegate** + +> didn't mention much about this topic + +- “Delegate” refers to **offloading local work to the cloud**. +- Using remote computers for AI stuff not your local resources (agent continues the task remotely) + +##### **Ralph Force Do While Over and Over Until It Finishes** + +https://awesomeclaude.ai/ralph-wiggum + +> Who knows how much tokens it uses :) + +![image-20260206010621010](steve-sanderson-talk_5.png) + +------ + +#### **5. Memories** + +> didn't mention much about this topic + +- It's like don't write tests like this but write like that, and AI will remember it among your team members. + +- Copilot Memory allows Copilot to learn about your codebase, helping Copilot coding agent, Copilot code review, and Copilot CLI to work more effectively in a repository. + +- Treat memory like documentation that evolves over time. + +- Copilot Memory is **turned off by default** + +- https://docs.github.com/en/copilot/how-tos/use-copilot-agents/copilot-memory + + + +------ + +#### **6. Hooks** + +> didn't mention much about this topic + +![image-20260206015638169](steve-sanderson-talk_10.png) + +- Execute custom shell commands at key points during agent execution. +- Examples: pre-commit checks, PR reviews, test triggers. +- Hooks make AI proactive instead of reactive. +- They reduce manual context switching for developers. +- https://docs.github.com/en/copilot/how-tos/use-copilot-agents/coding-agent/use-hooks + +------ + +#### **7. MCP** + +- Talk to external tools. + +- Enables safe, controlled access to systems (files, APIs, databases). + +- Prevents random tool usage; everything is explicit. + + + +------ + +#### **8. Infinite Sessions** + +![Infinite Sessions](steve-sanderson-talk_11.png) + +- AI should remember the “project context,” not just the last message. +- Reduces repetition and re-explaining. +- Enables deeper reasoning over time. +- Memory + skills + hooks together make “infinite sessions” possible. +- https://docs.github.com/en/copilot/how-tos/copilot-cli/cli-best-practices#3-leverage-infinite-sessions + +------ + +#### **9. Plugins** + +![Plugins](steve-sanderson-talk_12.png) + +- Extend AI capabilities beyond core model features. +- https://github.com/marketplace?type=apps&copilot_app=true + +------ + +#### **10. Git Workflow** + +- AI should operate inside your existing Git process. +- Generate small, focused commits — not giant changes. +- Use AI for PR descriptions and code reviews. +- Keep humans in the loop for design decisions. +- Branching strategy still matters; AI doesn’t replace it. +- Treat AI like a junior teammate: helpful, but needs supervision. +- CI + tests remain your primary safety net, not the model. +- Keep feedback loops fast: generate → test → review → refine. + +**Copilot as SDK** + +You can wrap GitHub CoPilot into your app as below: + +![steve-sanderson-talk_9](steve-sanderson-talk_9.png) + +#### **As a Developer What You Need to Get from Steve's Talk;** + +- Coding agents work best when you treat them like programmable teammates, not autocomplete tools. +- “Skills” are the right abstraction for scaling AI assistants across a team. +- Treat skills like shared APIs: version them, review them, and store them in source control. +- Skills can be installed from Git repos (marketplaces), not just created locally. +- Slash commands make skills fast, explicit, and reproducible in daily workflow. +- Use skills to bridge AI ↔ real systems (e.g., GitHub Actions, Playwright, build status). +- Automation skills are most valuable when they handle end-to-end flows (browser + app + data). +- Let the agent *discover* the right skill rather than hard-coding every step. +- Skills reduce hallucination risk by constraining what the agent is allowed to do. + +--- + +### My Personal Notes about AI + +- This is your code tech stack for a basic .NET project: + + - Assembly > MSIL > C# > ASP.NET Core > ...ABP... >NuGet + NPM > Your Handmade Business Code + + When we ask a development to an AI assisted IDE, AI never starts from Assembly or even it's not writing an existing NPM package. It basically uses what's there on the market. So we know frameworks like ASP.NET Core, ABP will always be there after AI evolution. + +- Software engineer is not just writing correct syntax code to explain a program to computer. As an engineer you need to understand the requirements, design the problem, make proper decisions and fix the uncertainty. Asking AI the right questions is very critical these days. + +- Tesla cars already started to go autonomous. As a driver, you don't need to care about how the car is driven. You need to choose the right way to go in the shortest time without hussle. + +- I talk with other software companies owners, they also say their docs website visits are down. I talked to another guy who's making video tutorials to Pluralsight, he's telling learning from video is decreasing nowadays... + +- Nowadays, **developers big new issue is Reviewing the AI generated-code.** In the future, developers who use AI, who inspect AI generated code well and who tells the AI exactly what's needed will be the most important topics. Others (who's typing only code) will be naturally eliminated. Invest your time for these topics. + +- We see that our brain is getting lazier, our coding muscles gets weaker day by day. Just like after calculator invention, we stopped calculate big numbers. We'll eventually forget coding. But maybe that's what it needs to be! + +- Also I don't think AI will replace developers. Think about washing machines. Since they came out, they still need humans to put the clothes in the machine, pick the best program, take out from the machine and iron. From now on, AI is our assistance in every aspect of our life from shopping, medical issues, learning to coding. Let's benefit from it. + + + +#### Software and service stocks shed $830 billion in market value in six trading days + +Software stocks fall on AI disruption fears on Feb 4, 2026 in NASDAQ. Software and service stocks shed $830 billion in market value in six trading days. Scramble to shield portfolios as AI muddies valuations, business prospects. + + + +![Reuters](7.png) + +**We need to be well prepared for this war.** diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/cover.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/cover.png new file mode 100644 index 0000000000..1cae98768d Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/cover.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/image-20260206003328436.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/image-20260206003328436.png new file mode 100644 index 0000000000..d5011d5e05 Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/image-20260206003328436.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/image-20260206004046914.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/image-20260206004046914.png new file mode 100644 index 0000000000..ed58dee23d Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/image-20260206004046914.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/image-20260206012506799.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/image-20260206012506799.png new file mode 100644 index 0000000000..32afa62e31 Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/image-20260206012506799.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk.png new file mode 100644 index 0000000000..0fe03dd06b Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_1.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_1.png new file mode 100644 index 0000000000..126cbd0087 Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_1.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_10.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_10.png new file mode 100644 index 0000000000..6c07156bdd Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_10.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_11.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_11.png new file mode 100644 index 0000000000..13d882ef8a Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_11.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_12.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_12.png new file mode 100644 index 0000000000..bce854623f Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_12.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_2.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_2.png new file mode 100644 index 0000000000..dcacfe3ece Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_2.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_3.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_3.png new file mode 100644 index 0000000000..dac8c92fbd Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_3.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_4.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_4.png new file mode 100644 index 0000000000..e9b9922ba8 Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_4.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_5.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_5.png new file mode 100644 index 0000000000..19ecee63e6 Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_5.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_6.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_6.png new file mode 100644 index 0000000000..d27edb10da Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_6.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_7.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_7.png new file mode 100644 index 0000000000..fac014da97 Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_7.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_8.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_8.png new file mode 100644 index 0000000000..371d7890ca Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_8.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_9.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_9.png new file mode 100644 index 0000000000..3862509f64 Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/steve-sanderson-talk_9.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/youtube-cover-1.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/youtube-cover-1.png new file mode 100644 index 0000000000..9a8fb1ab31 Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/youtube-cover-1.png differ diff --git a/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/youtube-cover-2.png b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/youtube-cover-2.png new file mode 100644 index 0000000000..6846be7edf Binary files /dev/null and b/docs/en/Community-Articles/2026-02-03-Impressions-of-NDC-London-2026/youtube-cover-2.png differ diff --git a/docs/en/Community-Articles/2026-02-04-Omni-Moderation-in-AI-Management-Module/demo.gif b/docs/en/Community-Articles/2026-02-04-Omni-Moderation-in-AI-Management-Module/demo.gif new file mode 100644 index 0000000000..467a2ed0df Binary files /dev/null and b/docs/en/Community-Articles/2026-02-04-Omni-Moderation-in-AI-Management-Module/demo.gif differ diff --git a/docs/en/Community-Articles/2026-02-04-Omni-Moderation-in-AI-Management-Module/images/abp-studio-ai-management.png b/docs/en/Community-Articles/2026-02-04-Omni-Moderation-in-AI-Management-Module/images/abp-studio-ai-management.png new file mode 100644 index 0000000000..d38cc7114e Binary files /dev/null and b/docs/en/Community-Articles/2026-02-04-Omni-Moderation-in-AI-Management-Module/images/abp-studio-ai-management.png differ diff --git a/docs/en/Community-Articles/2026-02-04-Omni-Moderation-in-AI-Management-Module/images/ai-management-widget.png b/docs/en/Community-Articles/2026-02-04-Omni-Moderation-in-AI-Management-Module/images/ai-management-widget.png new file mode 100644 index 0000000000..2f396f3e5a Binary files /dev/null and b/docs/en/Community-Articles/2026-02-04-Omni-Moderation-in-AI-Management-Module/images/ai-management-widget.png differ diff --git a/docs/en/Community-Articles/2026-02-04-Omni-Moderation-in-AI-Management-Module/images/ai-management-workspaces.png b/docs/en/Community-Articles/2026-02-04-Omni-Moderation-in-AI-Management-Module/images/ai-management-workspaces.png new file mode 100644 index 0000000000..82726fe0ae Binary files /dev/null and b/docs/en/Community-Articles/2026-02-04-Omni-Moderation-in-AI-Management-Module/images/ai-management-workspaces.png differ diff --git a/docs/en/Community-Articles/2026-02-04-Omni-Moderation-in-AI-Management-Module/images/example-comment.png b/docs/en/Community-Articles/2026-02-04-Omni-Moderation-in-AI-Management-Module/images/example-comment.png new file mode 100644 index 0000000000..909647bf23 Binary files /dev/null and b/docs/en/Community-Articles/2026-02-04-Omni-Moderation-in-AI-Management-Module/images/example-comment.png differ diff --git a/docs/en/Community-Articles/2026-02-04-Omni-Moderation-in-AI-Management-Module/post.md b/docs/en/Community-Articles/2026-02-04-Omni-Moderation-in-AI-Management-Module/post.md new file mode 100644 index 0000000000..9f8ebd3374 --- /dev/null +++ b/docs/en/Community-Articles/2026-02-04-Omni-Moderation-in-AI-Management-Module/post.md @@ -0,0 +1,488 @@ +# Using OpenAI's Moderation API in an ABP Application with the AI Management Module + +If your application accepts user-generated content (comments, reviews, forum posts) you likely need some form of content moderation. Building one from scratch typically means training ML models, maintaining datasets, and writing a lot of code. OpenAI's `omni-moderation-latest` model offers a practical shortcut: it's free, requires no training data, and covers 13+ harm categories across text and images in 40+ languages. + +In this article, I'll show you how to integrate this model into an ABP application using the [**AI Management Module**](https://abp.io/docs/latest/modules/ai-management). We'll wire it into the [CMS Kit Module's Comment Feature](https://abp.io/docs/latest/modules/cms-kit/comments) so every comment is automatically screened before it's published. The **AI Management Module** handles the OpenAI configuration (API keys, model selection, etc.) through a runtime UI, so you won't need to hardcode any of that into your `appsettings.json` or redeploy when something changes. + +By the end, you'll have a working content moderation pipeline you can adapt for any entity in your ABP project. + +## Understanding OpenAI's Omni-Moderation Model + +Before diving into the implementation, let's understand what makes OpenAI's `omni-moderation-latest` model a game-changer for content moderation. + +### What is it? + +OpenAI's `omni-moderation-latest` is a next-generation multimodal content moderation model built on the foundation of GPT-4o. Released in September 2024, this model represents a significant leap forward in automated content moderation capabilities. + +The most remarkable aspect? **It's completely free to use** through OpenAI's Moderation API, there are no token costs, no usage limits for reasonable use cases, and no hidden fees. + +### Key Capabilities + +The **omni-moderation** model offers several compelling features that make it ideal for production applications: + +- **Multimodal Understanding**: Unlike text-only moderation systems, this model *can process both text and image inputs*, making it suitable for applications where users can upload images alongside their comments or posts. +- **High Accuracy**: Built on GPT-4o's advanced understanding capabilities, the model achieves significantly higher accuracy in detecting nuanced harmful content compared to rule-based systems or simpler ML models. +- **Multilingual Support**: The model demonstrates enhanced performance across more than 40 languages, making it suitable for global applications without requiring separate moderation systems for each language. +- **Comprehensive Category Coverage**: Rather than just detecting "spam" or "not spam," the model classifies content across 13+ distinct categories of potentially harmful content. + +### Content Categories + +The model evaluates content against the following categories, each designed to catch specific types of harmful content: + +| Category | What It Detects | +|----------|-----------------| +| `harassment` | Content that expresses, incites, or promotes harassing language towards any individual or group | +| `harassment/threatening` | Harassment content that additionally includes threats of violence or serious harm | +| `hate` | Content that promotes hate based on race, gender, ethnicity, religion, nationality, sexual orientation, disability, or caste | +| `hate/threatening` | Hateful content that includes threats of violence or serious harm towards the targeted group | +| `self-harm` | Content that promotes, encourages, or depicts acts of self-harm such as suicide, cutting, or eating disorders | +| `self-harm/intent` | Content where the speaker expresses intent to engage in self-harm | +| `self-harm/instructions` | Content that provides instructions or advice on how to commit acts of self-harm | +| `sexual` | Content meant to arouse sexual excitement, including descriptions of sexual activity or promotion of sexual services | +| `sexual/minors` | Sexual content that involves individuals under 18 years of age | +| `violence` | Content that depicts death, violence, or physical injury in graphic detail | +| `violence/graphic` | Content depicting violence or physical injury in extremely graphic, disturbing detail | +| `illicit` | Content that provides advice or instructions for committing illegal activities | +| `illicit/violent` | Illicit content that specifically involves violence or weapons | + +### API Response Structure + +When you send content to the Moderation API (through model or directly to the API), you receive a structured response containing: + +- **`flagged`**: A boolean indicating whether the content violates any of OpenAI's usage policies. This is your primary indicator for whether to block content. +- **`categories`**: A dictionary containing boolean flags for each category, telling you exactly which policies were violated. +- **`category_scores`**: Confidence scores ranging from 0 to 1 for each category, allowing you to implement custom thresholds if needed. +- **`category_applied_input_types`**: A dictionary containing information on which input types were flagged for each category. For example, if both the image and text inputs to the model are flagged for "violence/graphic", the `violence/graphic` property will be set to `["image", "text"]`. This is only available on omni models. + +> For more detailed information about the model's capabilities and best practices, refer to the [OpenAI Moderation Guide](https://platform.openai.com/docs/guides/moderation). + +## The AI Management Module: Your Dynamic AI Configuration Hub + +The [AI Management Module](https://abp.io/docs/latest/modules/ai-management) is a powerful addition to the ABP Platform that transforms how you integrate and manage AI capabilities in your applications. Built on top of the [ABP Framework's AI infrastructure](https://abp.io/docs/latest/framework/infrastructure/artificial-intelligence), it provides a complete solution for managing AI workspaces dynamically—without requiring code changes or application redeployment. + +### Why Use the AI Management Module? + +Traditional AI integrations often suffer from several pain points: + +1. **Hardcoded Configuration**: API keys, model names, and endpoints are typically stored in configuration files, requiring redeployment for any changes. +2. **No Runtime Flexibility**: Switching between AI providers or models requires code changes. +3. **Security Concerns**: Managing API keys across environments is cumbersome and error-prone. +4. **Limited Visibility**: There's no easy way to see which AI configurations are active or test them without writing code. + +The AI Management Module addresses all these concerns by providing: + +- **Dynamic Workspace Management**: Create, configure, and update AI workspaces directly from a user-friendly administrative interface—no code changes required. +- **Provider Flexibility**: Seamlessly switch between different AI providers (OpenAI, Gemini, Antrophic, Azure OpenAI, Ollama, and custom providers) without modifying your application code. +- **Built-in Testing**: Test your AI configurations immediately using the included chat interface playground before deploying to production. +- **Permission-Based Access Control**: Define granular permissions to control who can manage AI workspaces and who can use specific AI features. +- **Multi-Framework Support**: Full support for MVC/Razor Pages, Blazor (Server & WebAssembly), and Angular UI frameworks. + +### Built-in Provider Support + +The **AI Management Module** comes with built-in support for popular AI providers through dedicated NuGet packages: + +- **`Volo.AIManagement.OpenAI`**: Provides seamless integration with OpenAI's APIs, including GPT models and the *Moderation API*. +- Custom providers can be added by implementing the `IChatClientFactory` interface. (If you configured the Ollama while creating your project, then you can see the example implementation for Ollama) + +## Building the Demo Application + +Now let's put theory into practice by building a complete content moderation system. We'll create an ABP application with the **AI Management Module**, configure OpenAI as our provider, set up the CMS Kit Comment Feature, and implement automatic content moderation for all user comments. + +### Step 1: Creating an Application with AI Management Module + +> In this tutorial, I'll create a **layered MVC application** named **ContentModeration**. If you already have an existing solution, you can follow along by replacing the namespaces accordingly. Otherwise, feel free to follow the solution creation steps below. + +The most straightforward way to create an application with the AI Management Module is through **ABP Studio**. When you create a new project, you'll encounter an **AI Integration** step in the project creation wizard. This wizard allows you to: + +- Enable the AI Management Module with a single checkbox +- Configure your preferred AI provider (OpenAI and Ollama) +- Set up initial workspace configurations +- Automatically install all required NuGet packages + +> **Note:** The AI Integration tab in ABP Studio currently only supports the **MVC/Razor Pages** UI. Support for **Angular** and **Blazor** UIs will be added in upcoming versions. + +![ABP Studio AI Management](images/abp-studio-ai-management.png) + +During the wizard, select **OpenAI** as your AI provider, set the model name as `omni-moderation-latest` and provide your API key. The wizard will automatically: + +1. Install the `Volo.AIManagement.*` packages across your solution +2. Install the `Volo.AIManagement.OpenAI` package for OpenAI provider support (you can use any OpenAI compatible model here, including Gemini, Claude and GPT models) +3. Configure the necessary module dependencies +4. Set up initial database migrations + +**Alternative Installation Method:** + +If you have an existing project or prefer manual installation, you can add the module using the ABP CLI: + +```bash +abp add-module Volo.AIManagement +``` + +Or through ABP Studio by right-clicking on your solution, selecting **Import Module**, and choosing `Volo.AIManagement` from the NuGet tab. + +### Step 2: Understanding the OpenAI Workspace Configuration + +After creating your project and running the application for the first time, navigate to **AI Management > Workspaces** in the admin menu. Here you'll find the workspace management interface where you can view, create, and modify AI workspaces. + +![AI Management Workspaces](images/ai-management-workspaces.png) + +If you configured OpenAI during the project creation wizard, you'll already have a workspace set up. Otherwise, you can create a new workspace with the following configuration: + +| Property | Value | Description | +|----------|-------|-------------| +| **Name** | `OpenAIAssistant` | A unique identifier for this workspace (no spaces allowed) | +| **Provider** | `OpenAI` | The AI provider to use | +| **Model** | `omni-moderation-latest` | The specific model for content moderation | +| **API Key** | `` | Authentication credential for the OpenAI API | +| **Description** | `Workspace for content moderation` | A helpful description for administrators | + +The beauty of this approach is that you can modify any of these settings at runtime through the UI. Need to rotate your API key? Just update it in the workspace configuration. Want to test a different model? Change it without touching your code. + +### Step 3: Setting Up the CMS Kit Comment Feature + +Now let's add the CMS Kit Module to enable the Comment Feature. The CMS Kit provides a robust, production-ready commenting system that we'll enhance with our content moderation. + +**Install the CMS Kit Module:** + +Run the following command in your solution directory: + +```bash +abp add-module Volo.CmsKit --skip-db-migrations +``` + +> Also, you can add the related module through ABP Studio UI. + +**Enable the Comment Feature:** + +By default, CMS Kit features are disabled to keep your application lean. Open the `GlobalFeatureConfigurator` class in your `*.Domain.Shared` project and enable the Comment Feature: + +```csharp +using Volo.Abp.GlobalFeatures; +using Volo.Abp.Threading; + +namespace ContentModeration; + +public static class ContentModerationGlobalFeatureConfigurator +{ + private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner(); + + public static void Configure() + { + OneTimeRunner.Run(() => + { + GlobalFeatureManager.Instance.Modules.CmsKit(cmsKit => + { + //only enable the Comment Feature + cmsKit.Comments.Enable(); + }); + }); + } +} +``` + +**Configure the Comment Entity Types:** + +Open your `*DomainModule` class and configure which entity types can have comments. For our demo, we'll enable comments on "Article" entities: + +```csharp +using Volo.CmsKit.Comments; + +// In your ConfigureServices method: +Configure(options => +{ + options.EntityTypes.Add(new CommentEntityTypeDefinition("Article")); +}); +``` + +**Add the Comment Component to a Page:** + +Finally, let's add the commenting interface to a page. Open the `Index.cshtml` file in your `*.Web` project and add the Comment component (replace with the following content): + +```html +@page +@using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Commenting +@model ContentModeration.Web.Pages.IndexModel + +
+
+
+

Welcome to Our Community

+
+
+

+ Share your thoughts in the comments below. Our AI-powered moderation system + automatically reviews all comments to ensure a safe and respectful environment + for everyone. +

+ +
+ +

Comments

+ @await Component.InvokeAsync(typeof(CommentingViewComponent), new + { + entityType = "Article", + entityId = "welcome-article", + isReadOnly = false + }) +
+
+
+``` + +At this point, you have a fully functional commenting system. Users can post comments, reply to existing comments, and interact with the community. + +![](./images/example-comment.png) + +However, there's no content moderation yet and any content, including harmful content, would be accepted. Let's fix that! + +## Implementing the Content Moderation Service + +**Now comes the exciting part:** implementing the content moderation service that leverages OpenAI's `omni-moderation` model to automatically screen all comments before they're published. + +### Understanding the Architecture + +Our implementation follows a clean, modular architecture: + +1. **`IContentModerator` Interface**: Defines the contract for content moderation, making our implementation testable and replaceable. +2. **`ContentModerator` Service**: The concrete implementation that calls OpenAI's Moderation API using the configuration from the AI Management Module. +3. **`MyCommentAppService`**: An override of the CMS Kit's comment service that integrates our moderation logic. + +This separation of concerns ensures that: + +- The moderation logic is isolated and can be unit tested independently +- You can easily swap the moderation implementation (e.g., switch to a different provider) +- The integration with CMS Kit is clean and maintainable + +### Creating the Content Moderator Interface + +First, let's define the interface in your `*.Application.Contracts` project. This interface is intentionally simple and it takes text input and throws an exception if the content is harmful: + +```csharp +using System.Threading.Tasks; + +namespace ContentModeration.Moderation; + +public interface IContentModerator +{ + Task CheckAsync(string text); +} +``` + +### Implementing the Content Moderator Service + +Now let's implement the service in your `*.Application` project. This implementation uses the `IWorkspaceConfigurationStore` from the AI Management Module to dynamically retrieve the OpenAI configuration: + +```csharp +using System.Collections.Generic; +using System.Threading.Tasks; +using OpenAI.Moderations; +using Volo.Abp; +using Volo.Abp.DependencyInjection; +using Volo.AIManagement.Workspaces.Configuration; + +namespace ContentModeration.Moderation; + +public class ContentModerator : IContentModerator, ITransientDependency +{ + private readonly IWorkspaceConfigurationStore _workspaceConfigurationStore; + + public ContentModerator(IWorkspaceConfigurationStore workspaceConfigurationStore) + { + _workspaceConfigurationStore = workspaceConfigurationStore; + } + + public async Task CheckAsync(string text) + { + // Skip moderation for empty content + if (string.IsNullOrWhiteSpace(text)) + { + return; + } + + // Retrieve the workspace configuration from AI Management Module + // This allows runtime configuration changes without redeployment + var config = await _workspaceConfigurationStore.GetOrNullAsync(); + + if(config == null) + { + throw new UserFriendlyException("Could not find the 'OpenAIAssistant' workspace!"); + } + + var client = new ModerationClient( + model: config.Model, + apiKey: config.ApiKey + ); + + // Send the text to OpenAI's Moderation API + var result = await client.ClassifyTextAsync(text); + var moderationResult = result.Value; + + // If the content is flagged, throw a user-friendly exception + if (moderationResult.Flagged) + { + var flaggedCategories = GetFlaggedCategories(moderationResult); + + throw new UserFriendlyException( + $"Your comment contains content that violates our community guidelines. " + + $"Detected issues: {string.Join(", ", flaggedCategories)}. " + + $"Please revise your comment and try again." + ); + } + } + + private static List GetFlaggedCategories(ModerationResult result) + { + var flaggedCategories = new List(); + + if (result.Harassment.Flagged) + { + flaggedCategories.Add("harassment"); + } + if (result.HarassmentThreatening.Flagged) + { + flaggedCategories.Add("threatening harassment"); + } + + //other categories... + + return flaggedCategories; + } +} +``` + +> **Note**: The `ModerationResult` class from the OpenAI .NET SDK provides properties for each moderation category (e.g., `Harassment`, `Violence`, `Sexual`), each with a `Flagged` boolean and a `Score` float (0-1). The exact property names may vary slightly between SDK versions, so check the [OpenAI .NET SDK documentation](https://github.com/openai/openai-dotnet) for the latest API. + +### Integrating with CMS Kit Comments + +The final piece of the puzzle is integrating our moderation service with the CMS Kit's comment system. We'll override the `CommentPublicAppService` to intercept all comment creation and update requests: + +```csharp +using System; +using System.Threading.Tasks; +using ContentModeration.Moderation; +using Microsoft.Extensions.Options; +using Volo.Abp.DependencyInjection; +using Volo.Abp.EventBus.Distributed; +using Volo.CmsKit.Comments; +using Volo.CmsKit.Public.Comments; +using Volo.CmsKit.Users; +using Volo.Abp.SettingManagement; + +namespace ContentModeration.Comments; + +[Dependency(ReplaceServices = true)] +[ExposeServices(typeof(ICommentPublicAppService), typeof(CommentPublicAppService), typeof(MyCommentAppService))] +public class MyCommentAppService : CommentPublicAppService +{ + protected IContentModerator ContentModerator { get; } + + public MyCommentAppService( + ICommentRepository commentRepository, + ICmsUserLookupService cmsUserLookupService, + IDistributedEventBus distributedEventBus, + CommentManager commentManager, + IOptionsSnapshot cmsCommentOptions, + ISettingManager settingManager, + IContentModerator contentModerator) + : base(commentRepository, cmsUserLookupService, distributedEventBus, commentManager, cmsCommentOptions, settingManager) + { + ContentModerator = contentModerator; + } + + public override async Task CreateAsync(string entityType, string entityId, CreateCommentInput input) + { + // Check for harmful content BEFORE creating the comment + // If harmful content is detected, an exception is thrown and the comment is not saved + await ContentModerator.CheckAsync(input.Text); + + return await base.CreateAsync(entityType, entityId, input); + } + + public override async Task UpdateAsync(Guid id, UpdateCommentInput input) + { + // Check for harmful content BEFORE updating the comment + // This prevents users from editing approved comments to add harmful content + await ContentModerator.CheckAsync(input.Text); + + return await base.UpdateAsync(id, input); + } +} +``` + +**How This Works:** + +1. When a user submits a new comment, the `CreateAsync` method is called. +2. Before the comment is saved to the database, we call `ContentModerator.CheckAsync()` with the comment text. +3. The moderation service sends the text to OpenAI's Moderation API. +4. If the content is flagged as harmful, a `UserFriendlyException` is thrown with a descriptive message. +5. The exception is caught by ABP's exception handling middleware and displayed to the user as a friendly error message. +6. If the content passes moderation, the comment is saved normally. + +The same flow applies to comment updates, ensuring users can't circumvent moderation by editing previously approved comments. + +Here's the full flow in action — submitting a comment with harmful content and seeing the moderation kick in: + +![Content moderation demo](demo.gif) + +## The Power of Dynamic Configuration - What AI Management Module Provides to You? + +One of the most significant advantages of using the AI Management Module is the ability to manage your AI configurations dynamically. Let's explore what this means in practice. + +### Runtime Configuration Changes + +With the AI Management Module, you can: + +- **Rotate API Keys**: Update your OpenAI API key through the admin UI without any downtime or redeployment. This is crucial for security compliance and key rotation policies. +- **Switch Models**: Want to test a newer moderation model? Simply update the model name in the workspace configuration. Your application will immediately start using the new model. +- **Adjust Settings**: Fine-tune settings like temperature or system prompts (for chat-based workspaces) without touching your codebase. +- **Enable/Disable Workspaces**: Temporarily disable a workspace for maintenance or testing without affecting other parts of your application. + +### Multi-Environment Management + +The dynamic configuration approach shines in multi-environment scenarios: + +- **Development**: Use a test API key with lower rate limits +- **Staging**: Use a separate API key for integration testing +- **Production**: Use your production API key with appropriate security measures + +All these configurations can be managed through the UI or via data seeding, without environment-specific code changes. + +### Actively Maintained & What's Coming Next + +The AI Management Module is **actively maintained** and continuously evolving. The team is working on exciting new capabilities that will further expand what you can do with AI in your ABP applications: + +- **MCP (Model Context Protocol) Support** — Coming in **v10.2**, MCP support will allow your AI workspaces to interact with external tools and data sources, enabling more sophisticated AI-powered workflows. +- **RAG (Retrieval-Augmented Generation) System** — Also planned for **v10.2**, the built-in RAG system will let you ground AI responses in your own data, making AI features more accurate and context-aware. +- **And More** — Additional features and improvements are on the roadmap to make AI integration even more seamless. + +Since the module is built on ABP's modular architecture, adopting these new capabilities will be straightforward — you can simply update the module and start using the new features without rewriting your existing AI integrations. + +### Permission-Based Access Control + +The AI Management Module integrates with ABP's permission system, allowing you to: + +- Restrict who can view AI workspace configurations +- Control who can create or modify workspaces +- Limit access to specific workspaces based on user roles + +This ensures that sensitive configurations like API keys are only accessible to authorized administrators. + +## Conclusion + +In this comprehensive guide, we've built a production-ready content moderation system that combines the power of OpenAI's `omni-moderation-latest` model with the flexibility of ABP's AI Management Module. Let's recap what makes this approach powerful: + +### Key Takeaways + +1. **Zero Training Required**: Unlike traditional ML approaches that require collecting datasets, training models, and ongoing maintenance, OpenAI's Moderation API works out of the box with state-of-the-art accuracy. +2. **Completely Free**: OpenAI's Moderation API has no token costs, making it economically viable for applications of any scale. +3. **Comprehensive Detection**: With 13+ categories of harmful content detection, you get protection against harassment, hate speech, violence, sexual content, self-harm, and more—all from a single API call. +4. **Dynamic Configuration**: The AI Management Module allows you to manage API keys, switch providers, and adjust settings at runtime without code changes or redeployment. +5. **Clean Integration**: By following ABP's service override pattern, we integrated moderation seamlessly into the existing CMS Kit comment system without modifying the original module. +6. **Production Ready**: The implementation includes proper error handling, graceful degradation, and user-friendly error messages suitable for production use. + +### Resources + +- [AI Management Module Documentation](https://abp.io/docs/latest/modules/ai-management) +- [OpenAI Moderation Guide](https://platform.openai.com/docs/guides/moderation) +- [CMS Kit Comments Feature](https://abp.io/docs/latest/modules/cms-kit/comments) +- [ABP Framework AI Infrastructure](https://abp.io/docs/latest/framework/infrastructure/artificial-intelligence) \ No newline at end of file diff --git a/docs/en/cli/index.md b/docs/en/cli/index.md index 3a3d0c2304..e376887baf 100644 --- a/docs/en/cli/index.md +++ b/docs/en/cli/index.md @@ -73,6 +73,7 @@ Here is the list of all available commands before explaining their details: * **[`clear-download-cache`](../cli#clear-download-cache)**: Clears the templates download cache. * **[`check-extensions`](../cli#check-extensions)**: Checks the latest version of the ABP CLI extensions. * **[`install-old-cli`](../cli#install-old-cli)**: Installs old ABP CLI. +* **[`mcp-studio`](../cli#mcp-studio)**: Starts ABP Studio MCP bridge for AI tools (requires ABP Studio running). * **[`generate-razor-page`](../cli#generate-razor-page)**: Generates a page class that you can use it in the ASP NET Core pipeline to return an HTML page. ### help @@ -981,6 +982,35 @@ Usage: abp install-old-cli [options] ``` +### mcp-studio + +Starts an MCP stdio bridge for AI tools (Cursor, Claude Desktop, VS Code, etc.) that connects to the local ABP Studio instance. ABP Studio must be running for this command to work. + +> You do not need to run this command manually. It is invoked automatically by your AI tool once you add the MCP configuration to your IDE. See the [Configuration](#configuration) examples below. + +> This command connects to the **local ABP Studio** instance. It is separate from the `abp mcp` command, which connects to the ABP.IO cloud MCP service and requires an active license. + +Usage: + +```bash +abp mcp-studio [options] +``` + +Options: + +* `--endpoint` or `-e`: Overrides ABP Studio MCP endpoint. Default value is `http://localhost:38280/mcp/`. + +Example: + +```bash +abp mcp-studio +abp mcp-studio --endpoint http://localhost:38280/mcp/ +``` + +For detailed configuration examples (Cursor, Claude Desktop, VS Code) and the full list of available MCP tools, see the [Model Context Protocol (MCP)](../studio/model-context-protocol.md) documentation. + +> You can also run `abp help mcp-studio` to see available options and example IDE configuration snippets directly in your terminal. + ### generate-razor-page `generate-razor-page` command to generate a page class and then use it in the ASP NET Core pipeline to return an HTML page. diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json index fb94db85b2..3f1abf424f 100644 --- a/docs/en/docs-nav.json +++ b/docs/en/docs-nav.json @@ -340,6 +340,10 @@ "text": "Monitoring Applications", "path": "studio/monitoring-applications.md" }, + { + "text": "Model Context Protocol (MCP)", + "path": "studio/model-context-protocol.md" + }, { "text": "Working with Kubernetes", "path": "studio/kubernetes.md" @@ -697,6 +701,10 @@ "text": "Concurrency Check", "path": "framework/infrastructure/concurrency-check.md" }, + { + "text": "Correlation ID", + "path": "framework/infrastructure/correlation-id.md" + }, { "text": "Current User", "path": "framework/infrastructure/current-user.md" diff --git a/docs/en/framework/infrastructure/audit-logging.md b/docs/en/framework/infrastructure/audit-logging.md index 9811e542ab..ee2cdf7e41 100644 --- a/docs/en/framework/infrastructure/audit-logging.md +++ b/docs/en/framework/infrastructure/audit-logging.md @@ -169,6 +169,8 @@ public class HomeController : AbpController [Application service](../architecture/domain-driven-design/application-services.md) method calls also included into the audit log by default. You can use the `[DisableAuditing]` in service or method level. +> **Blazor Server limitation (Entity history):** In `Blazor Server` applications, entity change history is currently not guaranteed to be complete for every UI interaction. Blazor Server uses SignalR-based event handling, and under some flows the audit scope/action tracking may not align with `DbContext.SaveChanges`, which can cause missing or partial entity change records. This is a known platform-level limitation and not a regular configuration issue. See [#11682](https://github.com/abpframework/abp/issues/11682) for related discussions. + #### Enable/Disable for Other Services Action audit logging can be enabled for any type of class (registered to and resolved from the [dependency injection](../fundamentals/dependency-injection.md)) while it is only enabled for the controllers and the application services by default. diff --git a/docs/en/framework/infrastructure/correlation-id.md b/docs/en/framework/infrastructure/correlation-id.md index 6f66c93fb7..15ce5b9677 100644 --- a/docs/en/framework/infrastructure/correlation-id.md +++ b/docs/en/framework/infrastructure/correlation-id.md @@ -1,3 +1,178 @@ +```json +//[doc-seo] +{ + "Description": "Learn how the ABP Framework uses Correlation IDs to trace and correlate operations across HTTP requests, distributed events, audit logs, and microservices." +} +``` + # Correlation ID -This document is planned to be written later. \ No newline at end of file +A **Correlation ID** is a unique identifier that is assigned to a request or operation and propagated across all related processing steps. It allows you to **trace** and **correlate** logs, events, and operations that belong to the same logical transaction, even when they span multiple services or components. + +ABP provides a built-in correlation ID infrastructure that: + +- **Automatically assigns** a unique correlation ID to each incoming HTTP request (or uses the one provided by the caller). +- **Propagates** the correlation ID through distributed event bus messages, HTTP client calls, audit logs, security logs, and Serilog log entries. +- **Provides a simple API** (`ICorrelationIdProvider`) to get or change the current correlation ID in your application code. + +## `AbpCorrelationIdMiddleware` + +`AbpCorrelationIdMiddleware` is an ASP.NET Core middleware that handles correlation ID management for HTTP requests. It is automatically added to the request pipeline when you use ABP's application builder. + +The middleware performs the following steps for each incoming HTTP request: + +1. **Reads** the correlation ID from the incoming request's `X-Correlation-Id` header (configurable via `AbpCorrelationIdOptions` as explained below). +2. **Generates** a new correlation ID (`Guid.NewGuid().ToString("N")`) if the request does not contain one. +3. **Sets** the correlation ID in the current async context using `ICorrelationIdProvider`, making it available throughout the request pipeline. +4. **Writes** the correlation ID to the response header (if `SetResponseHeader` option is enabled). + +You can add the middleware to your request pipeline by calling the `UseCorrelationId` extension method: + +```csharp +app.UseCorrelationId(); +``` + +> This is already configured in the application startup template. You typically don't need to add it manually. + +## `ICorrelationIdProvider` + +`ICorrelationIdProvider` is the core service for working with correlation IDs. It allows you to retrieve the current correlation ID or temporarily change it. + +```csharp +public interface ICorrelationIdProvider +{ + string? Get(); + + IDisposable Change(string? correlationId); +} +``` + +- `Get()`: Returns the current correlation ID for the executing context. Returns `null` if no correlation ID has been set. +- `Change(string? correlationId)`: Changes the correlation ID for the current context and returns an `IDisposable` object. When the returned object is disposed, the correlation ID is restored to its previous value. + +### Using `ICorrelationIdProvider` + +You can inject `ICorrelationIdProvider` into any service to access the current correlation ID: + +```csharp +public class MyService : ITransientDependency +{ + public ILogger Logger { get; set; } + + private readonly ICorrelationIdProvider _correlationIdProvider; + + public MyService(ICorrelationIdProvider correlationIdProvider) + { + Logger = NullLogger.Instance; + _correlationIdProvider = correlationIdProvider; + } + + public async Task DoSomethingAsync() + { + // Get the current correlation ID + var correlationId = _correlationIdProvider.Get(); + + // Use it for logging, tracing, etc. + Logger.LogInformation("Processing with Correlation ID: {CorrelationId}", correlationId); + + await SomeOperationAsync(); + } +} +``` + +### Changing the Correlation ID + +You can temporarily change the correlation ID using the `Change` method. This is useful when you want to create a new scope with a different correlation ID: + +```csharp +public async Task ProcessAsync() +{ + var currentCorrelationId = _correlationIdProvider.Get(); + // currentCorrelationId = "abc123" + + using (_correlationIdProvider.Change("new-correlation-id")) + { + var innerCorrelationId = _correlationIdProvider.Get(); + // innerCorrelationId = "new-correlation-id" + } + + var restoredCorrelationId = _correlationIdProvider.Get(); + // restoredCorrelationId = "abc123" (restored to original) +} +``` + +The `Change` method returns an `IDisposable`. When disposed, the correlation ID is automatically restored to its previous value. This pattern supports nested scopes safely. + +### Default Implementation + +The default implementation (`DefaultCorrelationIdProvider`) uses `AsyncLocal` to store the correlation ID. This ensures that the correlation ID is isolated per async execution flow and is thread-safe. + +## `AbpCorrelationIdOptions` + +You can configure the correlation ID behavior using `AbpCorrelationIdOptions`: + +```csharp +Configure(options => +{ + options.HttpHeaderName = "X-Correlation-Id"; + options.SetResponseHeader = true; +}); +``` + +- `HttpHeaderName` (default: `"X-Correlation-Id"`): The HTTP header name used to read/write the correlation ID. You can change this if your infrastructure uses a different header name. +- `SetResponseHeader` (default: `true`): If `true`, the middleware automatically adds the correlation ID to the HTTP response headers. Set it to `false` if you don't want to expose the correlation ID in response headers. + +## Correlation ID Across ABP Services + +One of the most valuable aspects of ABP's correlation ID infrastructure is that it **automatically propagates** the correlation ID across various system boundaries. This allows you to trace a single user action as it flows through multiple services and components. + +### HTTP Client Calls + +When you use ABP's [dynamic client proxies](../api-development/dynamic-csharp-clients.md) to call remote services, the correlation ID is automatically added to the outgoing HTTP request headers. This means downstream services will receive the same correlation ID, enabling end-to-end tracing across microservices. + +``` +Client Request (X-Correlation-Id: abc123) + → Service A (receives abc123, sets in context) + → Service B via HTTP Client Proxy (forwards abc123 in header) + → Service C via HTTP Client Proxy (forwards abc123 in header) +``` + +No manual configuration is required. ABP's `ClientProxyBase` automatically reads the current correlation ID from `ICorrelationIdProvider` and adds it as a request header. + +### Distributed Event Bus + +When you publish a [distributed event](./event-bus/distributed/index.md), ABP automatically attaches the current correlation ID to the outgoing event message. When the event is consumed (potentially by a different service), the correlation ID is extracted from the message and set in the consumer's context. + +> This works with all supported event bus providers, including [RabbitMQ](./event-bus/distributed/rabbitmq.md), [Kafka](./event-bus/distributed/kafka.md), [Azure Service Bus](./event-bus/distributed/azure.md) and [Rebus](./event-bus/distributed/rebus.md). + +``` +Service A publishes event (CorrelationId: abc123) + → Event Bus (carries abc123 in message metadata) + → Service B receives event (CorrelationId restored to abc123) +``` + +### Audit Logging + +ABP's [audit logging](./audit-logging.md) system automatically captures the current correlation ID when creating audit log entries. This is stored in the `CorrelationId` property of `AuditLogInfo`, allowing you to query and filter audit logs by correlation ID. + +This is particularly useful for: + +- Tracing all database changes made during a single request. +- Correlating audit log entries across multiple services for the same user action. +- Debugging and investigating issues by filtering logs with a specific correlation ID. + +### Security Logging + +Similar to audit logging, ABP's security log system also captures the current correlation ID. When security-related events are logged (such as login attempts, permission checks, etc.), the correlation ID is included in the `SecurityLogInfo.CorrelationId` property. + +### Serilog Integration + +If you use the **ABP Serilog integration**, the correlation ID is automatically added to the Serilog log context as a property. This means every log entry within a request will include the correlation ID, making it easy to filter and search logs. + +The correlation ID is enriched as a log property named `CorrelationId` by default. You can use it in your Serilog output template or structured log queries. + +## See Also + +- [Audit Logging](./audit-logging.md) +- [Distributed Event Bus](./event-bus/distributed/index.md) +- [Dynamic Client Proxies](../api-development/dynamic-csharp-clients.md) diff --git a/docs/en/framework/ui/angular/environment.md b/docs/en/framework/ui/angular/environment.md index 4395141c13..887bd3d4ec 100644 --- a/docs/en/framework/ui/angular/environment.md +++ b/docs/en/framework/ui/angular/environment.md @@ -108,6 +108,80 @@ export interface RemoteEnv { - `method`: HTTP method to be used when retrieving environment config. Default: `GET` - `headers`: If extra headers are needed for the request, it can be set through this field. +### Example RemoteEnv Configuration + +To enable dynamic environment configuration at runtime, add the `remoteEnv` property to your environment file: + +```ts +export const environment = { + // ... other configurations + remoteEnv: { + url: '/getEnvConfig', + mergeStrategy: 'deepmerge' + } +} as Environment; +``` + +### Web Server Configuration + +When using `remoteEnv` with a URL like `/getEnvConfig`, you need to configure your web server to serve the `dynamic-env.json` file with the correct content type (`application/json`). Otherwise, the application may receive HTML (e.g., your `index.html`) instead of JSON, causing configuration to fail silently. + +#### IIS Configuration (web.config) + +```xml + + + + + + + + + + + + + + + + + + + + + +``` + +#### Nginx Configuration + +```nginx +server { + listen 80; + listen [::]:80; + server_name _; + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + try_files $uri $uri/ /index.html =404; + } + + location /getEnvConfig { + default_type 'application/json'; + add_header 'Access-Control-Allow-Origin' '*' always; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always; + add_header 'Content-Type' 'application/json'; + root /usr/share/nginx/html; + try_files $uri /dynamic-env.json; + } + + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } +} +``` + ## Configure Core Provider with Environment `environment` variable comes from angular host application. diff --git a/docs/en/images/exist-user-accept.png b/docs/en/images/exist-user-accept.png new file mode 100644 index 0000000000..23f35c0904 Binary files /dev/null and b/docs/en/images/exist-user-accept.png differ diff --git a/docs/en/images/invite-admin-user-to-join-tenant-modal.png b/docs/en/images/invite-admin-user-to-join-tenant-modal.png new file mode 100644 index 0000000000..8fa9d2fee9 Binary files /dev/null and b/docs/en/images/invite-admin-user-to-join-tenant-modal.png differ diff --git a/docs/en/images/invite-admin-user-to-join-tenant.png b/docs/en/images/invite-admin-user-to-join-tenant.png new file mode 100644 index 0000000000..edfb5bedb0 Binary files /dev/null and b/docs/en/images/invite-admin-user-to-join-tenant.png differ diff --git a/docs/en/images/invite-user.png b/docs/en/images/invite-user.png new file mode 100644 index 0000000000..67a3f04073 Binary files /dev/null and b/docs/en/images/invite-user.png differ diff --git a/docs/en/images/manage-invitations.png b/docs/en/images/manage-invitations.png new file mode 100644 index 0000000000..969d09cc53 Binary files /dev/null and b/docs/en/images/manage-invitations.png differ diff --git a/docs/en/images/new-user-accept.png b/docs/en/images/new-user-accept.png new file mode 100644 index 0000000000..ffc887f1ed Binary files /dev/null and b/docs/en/images/new-user-accept.png differ diff --git a/docs/en/images/new-user-join-strategy-create-tenant-success.png b/docs/en/images/new-user-join-strategy-create-tenant-success.png new file mode 100644 index 0000000000..2d2969b631 Binary files /dev/null and b/docs/en/images/new-user-join-strategy-create-tenant-success.png differ diff --git a/docs/en/images/new-user-join-strategy-create-tenant.png b/docs/en/images/new-user-join-strategy-create-tenant.png new file mode 100644 index 0000000000..7d4a64c7c0 Binary files /dev/null and b/docs/en/images/new-user-join-strategy-create-tenant.png differ diff --git a/docs/en/images/new-user-join-strategy-inform.png b/docs/en/images/new-user-join-strategy-inform.png new file mode 100644 index 0000000000..a6a62e1c96 Binary files /dev/null and b/docs/en/images/new-user-join-strategy-inform.png differ diff --git a/docs/en/images/switch-tenant.png b/docs/en/images/switch-tenant.png new file mode 100644 index 0000000000..6f19de1da7 Binary files /dev/null and b/docs/en/images/switch-tenant.png differ diff --git a/docs/en/images/tenant-selection.png b/docs/en/images/tenant-selection.png new file mode 100644 index 0000000000..e40bf6aaeb Binary files /dev/null and b/docs/en/images/tenant-selection.png differ diff --git a/docs/en/images/user-accepted.png b/docs/en/images/user-accepted.png new file mode 100644 index 0000000000..5273333f6f Binary files /dev/null and b/docs/en/images/user-accepted.png differ diff --git a/docs/en/modules/account-pro.md b/docs/en/modules/account-pro.md index 7944c7448a..a79c3d4992 100644 --- a/docs/en/modules/account-pro.md +++ b/docs/en/modules/account-pro.md @@ -425,3 +425,5 @@ This module doesn't define any additional distributed event. See the [standard d * [Session Management](./account/session-management.md) * [Idle Session Timeout](./account/idle-session-timeout.md) * [Web Authentication API (WebAuthn) passkeys](./account/passkey.md) +* [Shared user accounts](./account/shared-user-accounts.md) +``` \ No newline at end of file diff --git a/docs/en/modules/account/shared-user-accounts.md b/docs/en/modules/account/shared-user-accounts.md new file mode 100644 index 0000000000..4df18e2fdf --- /dev/null +++ b/docs/en/modules/account/shared-user-accounts.md @@ -0,0 +1,151 @@ +```json +//[doc-seo] +{ + "Description": "Learn how Shared User Accounts work in ABP (UserSharingStrategy): login flow with tenant selection, switching tenants, inviting users, and the Pending Tenant registration flow." +} +``` + +# Shared User Accounts + +This document explains **Shared User Accounts**: a single user account can belong to multiple tenants, and the user can choose/switch the active tenant when signing in. + +> This is a **commercial** feature. It is mainly provided by Account.Pro and Identity.Pro (and related SaaS UI). + +## Introduction + +In a typical multi-tenant setup with the **Isolated** user strategy, a user belongs to exactly one tenant (or the Host), and uniqueness rules (username/email) are usually scoped per tenant. + +If you want a `one account, multiple tenants` experience (for example, inviting the same email address into multiple tenants), you should enable the **Shared** user strategy. + +## Enabling Shared User Accounts + +Enable shared accounts by configuring `AbpMultiTenancyOptions.UserSharingStrategy`: + +```csharp +Configure(options => +{ + options.IsEnabled = true; + options.UserSharingStrategy = TenantUserSharingStrategy.Shared; +}); +``` + +### Constraints and Behavior + +When you use Shared User Accounts: + +- Username/email uniqueness becomes **global** (Host + all tenants). A username/email can exist only once, but that user can be invited into multiple tenants. +- Some security/user management settings (2FA, lockout, password policies, recaptcha, etc.) are managed at the **Host** level. + +If you are migrating from an isolated strategy, ABP will validate the existing data when you switch to Shared. If there are conflicts (e.g., the same email registered as separate users in different tenants), you must resolve them before enabling the shared strategy. See the [Migration Guide](#migration-guide) section below. + +## Tenant Selection During Login + +If a user account belongs to multiple tenants, the login flow prompts the user to select the tenant to sign in to: + +![Tenant Selection](../../images/tenant-selection.png) + +## Switching Tenants + +After signing in, the user can switch between the tenants they have joined using the tenant switcher in the user menu: + +![Tenant Switching](../../images/switch-tenant.png) + +## Leaving a Tenant + +Users can leave a tenant. After leaving, the user is no longer a member of that tenant, and the tenant can invite the user again later. + +> When a user leaves and later re-joins the same tenant, the `UserId` does not change and tenant-related data (roles, permissions, etc.) is preserved. + +## Inviting Users to a Tenant + +Tenant administrators can invite existing or not-yet-registered users to join a tenant. The invited user receives an email; clicking the link completes the join process. If the user doesn't have an account yet, they can register and join through the same flow. + +While inviting, you can also assign roles so the user gets the relevant permissions automatically after joining. + +> The invitation feature is also available in the Isolated strategy, but invited users can join only a single tenant. + +![Invite User](../../images/invite-user.png) + +## Managing Invitations + +From the invitation modal, you can view and manage sent invitations, including resending an invitation email and revoking individual or all invitations. + +![Manage Invitations](../../images/manage-invitations.png) + +## Accepting an Invitation + +If the invited person already has an account, clicking the email link shows a confirmation screen to join the tenant: + +![Accept Invitation](../../images/exist-user-accept.png) + +If the invited person doesn't have an account yet, clicking the email link takes them to registration and then joins them to the tenant: + +![Accept Invitation New User](../../images/new-user-accept.png) + +After accepting the invitation, the user can sign in and switch to that tenant. + +![Accepted Invitation](../../images/user-accepted.png) + +## Inviting an Admin After Tenant Creation + +With Shared User Accounts, you typically don't create an `admin` user during tenant creation. Instead, create the tenant first, then invite an existing user (or a new user) and grant the required roles. + +![Invite tenant admin user](../../images/invite-admin-user-to-join-tenant.png) + +![Invite tenant admin user](../../images/invite-admin-user-to-join-tenant-modal.png) + +> In the Isolated strategy, tenant creation commonly seeds an `admin` user automatically. With Shared User Accounts, you usually use invitations instead. + +### Registration Strategy for New Users + +When a user registers a new account, the user is not a member of any tenant by default (and is not a Host user). You can configure `AbpIdentityPendingTenantUserOptions.Strategy` to decide what happens next. + +Available strategies: + +- **CreateTenant**: Automatically creates a tenant for the new user and adds the user to that tenant. +- **Redirect**: Redirects the user to a URL where you can implement custom logic (commonly: a tenant selection/join experience). +- **Inform** (default): Shows an informational message telling the user to contact an administrator to join a tenant. + +> In this state, the user can't proceed into a tenant context until they follow the configured strategy. + +### CreateTenant Strategy + +```csharp +Configure(options => +{ + options.Strategy = AbpIdentityPendingTenantUserStrategy.CreateTenant; +}); +``` + +![new-user--join-strategy-create-tenant](../../images/new-user-join-strategy-create-tenant.png) + +![new-user--join-strategy-create-tenant-success](../../images/new-user-join-strategy-create-tenant-success.png) + +### Redirect Strategy + +```csharp +Configure(options => +{ + options.Strategy = AbpIdentityPendingTenantUserStrategy.Redirect; + options.RedirectUrl = "/your-custom-logic-url"; +}); +``` + +### Inform Strategy + +```csharp +Configure(options => +{ + options.Strategy = AbpIdentityPendingTenantUserStrategy.Inform; +}); +``` + +![new-user--join-strategy-inform](../../images/new-user-join-strategy-inform.png) + +## Migration Guide + +If you plan to migrate an existing multi-tenant application from an isolated strategy to Shared User Accounts, keep the following in mind: + +1. **Uniqueness check**: Before enabling Shared, ensure all existing usernames and emails are unique globally. ABP performs this check when you switch the strategy and reports conflicts. +2. **Tenants with separate databases**: If some tenants use separate databases, you must ensure the Host database contains matching user records in the `AbpUsers` table (and, if you use social login / passkeys, also sync `AbpUserLogins` and `AbpUserPasskeys`) so the Host-side records match the tenant-side data. After that, the framework can create/manage the user-to-tenant associations. + diff --git a/docs/en/modules/ai-management/index.md b/docs/en/modules/ai-management/index.md index e50253c22c..7f617eafbe 100644 --- a/docs/en/modules/ai-management/index.md +++ b/docs/en/modules/ai-management/index.md @@ -9,14 +9,11 @@ > You must have an ABP Team or a higher license to use this module. -> **⚠️ Important Notice** -> The **AI Management Module** is currently in **preview**. The documentation and implementation are subject to change. - -This module implements AI (Artificial Intelligence) management capabilities on top of the [Artificial Intelligence Workspaces](../../framework/infrastructure/artificial-intelligence/index.md) feature of the ABP Framework and allows to manage workspaces dynamically from the application including UI components and API endpoints. +This module implements AI (Artificial Intelligence) management capabilities on top of the [Artificial Intelligence Workspaces](../../framework/infrastructure/artificial-intelligence/index.md) feature of the ABP Framework and allows managing workspaces dynamically from the application, including UI components and API endpoints. ## How to Install -AI Management module is not pre-installed in [the startup templates](../solution-templates/layered-web-application). You can install it using the ABP CLI or ABP Studio. +The **AI Management Module** is not included in [the startup templates](../solution-templates/layered-web-application) by default. However, when creating a new application with [ABP Studio](../../tools/abp-studio/index.md), you can easily enable it during setup via the *AI Integration* step in the project creation wizard. Alternatively, you can install it using the ABP CLI or ABP Studio: **Using ABP CLI:** @@ -28,6 +25,30 @@ abp add-module Volo.AIManagement Open ABP Studio, navigate to your solution explorer, **Right Click** on the project and select **Import Module**. Choose `Volo.AIManagement` from `NuGet` tab and check the "Install this Module" checkbox. Click the "OK" button to install the module. +### Adding an AI Provider + +> [!IMPORTANT] +> The AI Management module requires **at least one AI provider** package to be installed. Without a provider, the module won't be able to create chat clients for your workspaces. + +Install one of the built-in provider packages using the ABP CLI: + +**For OpenAI (including Azure OpenAI-compatible endpoints):** + +```bash +abp add-package Volo.AIManagement.OpenAI +``` + +**For Ollama (local AI models):** + +```bash +abp add-package Volo.AIManagement.Ollama +``` + +> [!TIP] +> You can install multiple provider packages to support different AI providers simultaneously in your workspaces. + +If you need to integrate with a provider that isn't covered by the built-in packages, you can implement your own. See the [Implementing Custom AI Provider Factories](#implementing-custom-ai-provider-factories) section for details. + ## Packages This module follows the [module development best practices guide](../../framework/architecture/best-practices) and consists of several NuGet and NPM packages. See the guide if you want to understand the packages and relations between them. @@ -38,9 +59,15 @@ AI Management module packages are designed for various usage scenarios. Packages ## User Interface +This module provides UI integration for all three officially supported UI frameworks by ABP: + +* **MVC / Razor Pages** UI +* **Angular** UI +* **Blazor** UI (Server & WebAssembly) + ### Menu Items -AI Management module adds the following items to the "Main" menu: +The **AI Management Module** adds the following items to the "Main" menu: * **AI Management**: Root menu item for AI Management module. (`AIManagement`) * **Workspaces**: Workspace management page. (`AIManagement.Workspaces`) @@ -459,8 +486,7 @@ Your application acts as a proxy, forwarding these requests to the AI Management | **4. Client Proxy** | No | Remote Service | Remote Service | Yes | API Gateway pattern, proxy services | - -## Client Usage (MVC UI) +## Client Usage AI Management uses different packages depending on the usage scenario: @@ -468,6 +494,8 @@ AI Management uses different packages depending on the usage scenario: - **`Volo.AIManagement.Client.*` packages**: These are designed for applications that need to consume AI services from a remote application. They provide both server and client side of remote access to the AI services. +### MVC / Razor Pages UI + **List of packages:** - `Volo.AIManagement.Client.Application` - `Volo.AIManagement.Client.Application.Contracts` @@ -475,10 +503,12 @@ AI Management uses different packages depending on the usage scenario: - `Volo.AIManagement.Client.HttpApi.Client` - `Volo.AIManagement.Client.Web` -### The Chat Widget +#### The Chat Widget + The `Volo.AIManagement.Client.Web` package provides a chat widget to allow you to easily integrate a chat interface into your application that uses a specific AI workspace named `ChatClientChatViewComponent`. -#### Basic Usage +##### Basic Usage + You can invoke the `ChatClientChatViewComponent` Widget in your razor page with the following code: ```csharp @@ -490,8 +520,10 @@ You can invoke the `ChatClientChatViewComponent` Widget in your razor page with ![ai-management-workspaces](../../images/ai-management-widget.png) -#### Properties +##### Properties + You can customize the chat widget with the following properties: + - `WorkspaceName`: The name of the workspace to use. - `ComponentId`: Unique identifier for accessing the component via JavaScript API (stored in abp.chatComponents). - `ConversationId`: The unique identifier for persisting and retrieving chat history from client-side storage. @@ -511,7 +543,8 @@ You can customize the chat widget with the following properties: }) ``` -#### Using the Conversation Id +##### Using the Conversation Id + You can use the `ConversationId` property to specify the id of the conversation to use. When the Conversation Id is provided, the chat will be stored at the client side and will be retrieved when the user revisits the page that contains the chat widget. If it's not provided or provided as **null**, the chat will be temporary and will not be saved, it'll be lost when the component lifetime ends. ```csharp @@ -522,7 +555,8 @@ You can use the `ConversationId` property to specify the id of the conversation }) ``` -#### JavaScript API +##### JavaScript API + The chat components are initialized automatically when the ViewComponent is rendered in the page. All the initialized components in the page are stored in the `abp.chatComponents` object. You can retrieve a specific component by its `ComponentId` which is defined while invoking the ViewComponent. ```csharp @@ -603,6 +637,141 @@ chatComponent.off('messageSent', callbackFunction); }); ``` +### Angular UI + +#### Installation + +In order to configure the application to use the AI Management module, you first need to import `provideAIManagementConfig` from `@volo/abp.ng.ai-management/config` to root application configuration. Then, you will need to append it to the `appConfig` array: + +```js +// app.config.ts +import { provideAIManagementConfig } from '@volo/abp.ng.ai-management/config'; + +export const appConfig: ApplicationConfig = { + providers: [ + // ... + provideAIManagementConfig(), + ], +}; +``` + +The AI Management module should be imported and lazy-loaded in your routing array. It has a static `createRoutes` method for configuration. It is available for import from `@volo/abp.ng.ai-management`. + +```js +// app.routes.ts +const APP_ROUTES: Routes = [ + // ... + { + path: 'ai-management', + loadChildren: () => + import('@volo/abp.ng.ai-management').then(m => m.createRoutes(/* options here */)), + }, +]; +``` + +#### Services / Models + +AI Management module services and models are generated via `generate-proxy` command of the [ABP CLI](../../cli). If you need the module's proxies, you can run the following command in the Angular project directory: + +```bash +abp generate-proxy --module aiManagement +``` + +#### Remote Endpoint URL + +The AI Management module remote endpoint URLs can be configured in the environment files. + +```js +export const environment = { + // other configurations + apis: { + default: { + url: 'default url here', + }, + AIManagement: { + url: 'AI Management remote url here', + }, + // other api configurations + }, +}; +``` + +The AI Management module remote URL configurations shown above are optional. + +> If you don't set the `AIManagement` property, the `default.url` will be used as fallback. + +#### The Chat Widget + +The `@volo/abp.ng.ai-management` package provides a `ChatInterfaceComponent` (`abp-chat-interface`) that you can use to embed a chat interface into your Angular application that communicates with a specific AI workspace. + +**Example: You can use the `abp-chat-interface` component in your template**: + +```html + +``` + +- `workspaceName` (required): The name of the workspace to use. +- `conversationId`: The unique identifier for persisting and retrieving chat history from client-side storage. When provided, the chat history is stored in the browser and restored when the user revisits the page. If `null`, the chat is ephemeral and will be lost when the component is destroyed. +- `providerName`: The name of the AI provider. Used for displaying contextual error messages. + +### Blazor UI + +#### Remote Endpoint URL + +The AI Management module remote endpoint URLs can be configured in your `appsettings.json`: + +```json +"RemoteServices": { + "Default": { + "BaseUrl": "Default url here" + }, + "AIManagement": { + "BaseUrl": "AI Management remote url here" + } +} +``` + +For **Blazor WebAssembly**, you can also configure the remote endpoint URL via `AIManagementClientBlazorWebAssemblyOptions`: + +```csharp +Configure(options => +{ + options.RemoteServiceUrl = builder.Configuration["RemoteServices:AIManagement:BaseUrl"]; +}); +``` + +> If you don't set the `BaseUrl` for AIManagement, the `Default.BaseUrl` will be used as fallback. + +#### The Chat Widget + +The `Volo.AIManagement.Client.Blazor` package provides a `ChatClientChat` Blazor component that you can use to embed a chat interface into your Blazor application that communicates with a specific AI workspace. + +**Example: You can use the `ChatClientChat` component in your Blazor page:** + +```xml + +``` + +- `WorkspaceName` (required): The name of the workspace to use. +- `ConversationId`: The unique identifier for persisting and retrieving chat history from client-side storage. When provided, the chat history is stored in the browser's local storage and restored when the user revisits the page. If not provided or `null`, the chat is ephemeral and will be lost when the component is disposed. +- `Title`: The title displayed in the chat widget header. +- `ShowStreamCheckbox`: Whether to show a checkbox that allows the user to toggle streaming on and off. Default is `false`. +- `OnFirstMessage`: An `EventCallback` that is triggered when the first message is sent in a conversation. It can be used to determine the chat title after the first prompt like applied in the chat playground. The event args contain `ConversationId` and `Message` properties. + +```xml + +``` + ## Using Dynamic Workspace Configurations for custom requirements The AI Management module allows you to access only configuration of a workspace without resolving pre-constructed chat client. This is useful when you want to use a workspace for your own purposes and you don't need to use the chat client. diff --git a/docs/en/modules/audit-logging-pro.md b/docs/en/modules/audit-logging-pro.md index d86e0b7de2..851787d390 100644 --- a/docs/en/modules/audit-logging-pro.md +++ b/docs/en/modules/audit-logging-pro.md @@ -73,6 +73,8 @@ You can export audit logs to Excel by clicking the "Export to Excel" button in t Entity changes tab is used to list, view and filter entity change logs. +> **Blazor Server note:** Entity change history can be missing or incomplete in some `Blazor Server` scenarios due to known SignalR/event-pipeline limitations. See [Audit Logging](../framework/infrastructure/audit-logging.md) and [#11682](https://github.com/abpframework/abp/issues/11682). + ![audit-logging-module-entity-changes-list-page](../images/audit-logging-module-entity-changes-list-page.png) diff --git a/docs/en/package-version-changes.md b/docs/en/package-version-changes.md new file mode 100644 index 0000000000..d0f7114552 --- /dev/null +++ b/docs/en/package-version-changes.md @@ -0,0 +1,9 @@ +# Package Version Changes + +## 10.1.0 + +| Package | Old Version | New Version | PR | +|---------|-------------|-------------|-----| +| Microsoft.SemanticKernel | 1.67.1 | 1.71.0 | #24891 | +| Microsoft.SemanticKernel.Abstractions | 1.67.1 | 1.71.0 | #24891 | + diff --git a/docs/en/studio/model-context-protocol.md b/docs/en/studio/model-context-protocol.md new file mode 100644 index 0000000000..7be6557df9 --- /dev/null +++ b/docs/en/studio/model-context-protocol.md @@ -0,0 +1,133 @@ +```json +//[doc-seo] +{ + "Description": "Learn how to connect AI tools like Cursor, Claude Desktop, and VS Code to ABP Studio using the Model Context Protocol (MCP)." +} +``` + +# ABP Studio: Model Context Protocol (MCP) + +````json +//[doc-nav] +{ + "Next": { + "Name": "Working with Kubernetes", + "Path": "studio/kubernetes" + } +} +```` + +ABP Studio includes built-in [Model Context Protocol (MCP)](https://modelcontextprotocol.io/) support so AI tools can query runtime telemetry and control solution runner operations. + +## How It Works + +ABP Studio runs a local MCP server in the background. The `abp mcp-studio` CLI command acts as a stdio bridge that AI clients connect to. The bridge forwards requests to ABP Studio and returns responses. + +```text +MCP Client (Cursor / Claude Desktop / VS Code) + ──stdio──▶ abp mcp-studio ──HTTP──▶ ABP Studio +``` + +> ABP Studio must be running while MCP is used. If ABP Studio is not running (or its MCP endpoint is unavailable), `abp mcp-studio` returns an error to the AI client. + +## Configuration + +### Cursor (`.cursor/mcp.json`) + +```json +{ + "mcpServers": { + "abp-studio": { + "command": "abp", + "args": ["mcp-studio"] + } + } +} +``` + +### Claude Desktop (`claude_desktop_config.json`) + +```json +{ + "mcpServers": { + "abp-studio": { + "command": "abp", + "args": ["mcp-studio"] + } + } +} +``` + +Claude Desktop config file locations: + +- macOS: `~/Library/Application Support/Claude/claude_desktop_config.json` +- Windows: `%APPDATA%\Claude\claude_desktop_config.json` +- Linux: `~/.config/Claude/claude_desktop_config.json` + +### VS Code (`.vscode/mcp.json`) + +```json +{ + "servers": { + "abp-studio": { + "command": "abp", + "args": ["mcp-studio"] + } + } +} +``` + +### Quick Reference + +You can run `abp help mcp-studio` at any time to see the available options and example configuration snippets for each supported IDE directly in your terminal. + +### Generating Config Files from ABP Studio + +When creating a new solution, ABP Studio can generate MCP configuration files for Cursor and VS Code automatically. + +## Available Tools + +ABP Studio exposes the following tools to MCP clients. All tools operate on the currently open solution and selected run profile in ABP Studio. + +### Monitoring + +| Tool | Description | +|------|-------------| +| `list_applications` | Lists all running ABP applications connected to ABP Studio. | +| `get_exceptions` | Gets recent exceptions including stack traces and error messages. | +| `get_logs` | Gets log entries. Can be filtered by log level. | +| `get_requests` | Gets HTTP request information. Can be filtered by status code. | +| `get_events` | Gets distributed events for debugging inter-service communication. | +| `clear_monitor` | Clears collected monitor data. | + +### Application Control + +| Tool | Description | +|------|-------------| +| `list_runnable_applications` | Lists all applications in the current run profile with their state. | +| `start_application` | Starts a stopped application. | +| `stop_application` | Stops a running application. | +| `restart_application` | Restarts a running application. | +| `build_application` | Builds a .NET application using `dotnet build`. | + +### Container Control + +| Tool | Description | +|------|-------------| +| `list_containers` | Lists Docker containers in the current run profile with their state. | +| `start_containers` | Starts Docker containers (docker-compose up). | +| `stop_containers` | Stops Docker containers (docker-compose down). | + +### Solution Structure + +| Tool | Description | +|------|-------------| +| `get_solution_info` | Gets solution name, path, template, and run profile information. | +| `list_modules` | Lists all modules in the solution. | +| `list_packages` | Lists packages (projects) in the solution. Can be filtered by module. | +| `get_module_dependencies` | Gets module dependency/import information. | + +## Notes + +- Monitor data (exceptions, logs, requests, events) is kept in memory and is cleared when the solution is closed. +- The `abp mcp-studio` command connects to the local ABP Studio instance. This is separate from the `abp mcp` command, which connects to the ABP.IO cloud MCP service and requires an active license. diff --git a/docs/en/studio/monitoring-applications.md b/docs/en/studio/monitoring-applications.md index 04dac9ef13..e06d387146 100644 --- a/docs/en/studio/monitoring-applications.md +++ b/docs/en/studio/monitoring-applications.md @@ -11,8 +11,8 @@ //[doc-nav] { "Next": { - "Name": "Working with Kubernetes", - "Path": "studio/kubernetes" + "Name": "Model Context Protocol (MCP)", + "Path": "studio/model-context-protocol" } } ```` diff --git a/docs/en/studio/overview.md b/docs/en/studio/overview.md index 256389f79d..f875e9ebf1 100644 --- a/docs/en/studio/overview.md +++ b/docs/en/studio/overview.md @@ -103,6 +103,8 @@ This pane is dedicated to managing Kubernetes services. It simplifies the proces The AI Assistant is an integrated chat interface within ABP Studio that provides intelligent assistance for ABP-related questions. You can access it from the left sidebar by clicking the AI icon. +For external AI tool integrations through MCP, see the [Model Context Protocol (MCP)](./model-context-protocol.md) documentation. + ![ai-assistant](./images/overview/ai-assistant.png) Key features of the AI Assistant include: diff --git a/docs/en/studio/version-mapping.md b/docs/en/studio/version-mapping.md index f399c97390..d3fe945967 100644 --- a/docs/en/studio/version-mapping.md +++ b/docs/en/studio/version-mapping.md @@ -11,7 +11,8 @@ This document provides a general overview of the relationship between various ve | **ABP Studio Version** | **ABP Version of Startup Template** | |------------------------|---------------------------| -| 2.1.0 - 2.1.3 | 10.0.1 | +| 2.1.5 - 2.1.9 | 10.0.2 | +| 2.1.0 - 2.1.4 | 10.0.1 | | 2.0.0 to 2.0.2 | 10.0.0 | | 1.4.2 | 9.3.6 | | 1.3.3 to 1.4.1 | 9.3.5 | diff --git a/framework/Volo.Abp.slnx b/framework/Volo.Abp.slnx index 3d74af9f95..1302600c09 100644 --- a/framework/Volo.Abp.slnx +++ b/framework/Volo.Abp.slnx @@ -181,6 +181,7 @@ + diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/AbpBlazorClientHttpMessageHandler.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpBlazorClientHttpMessageHandler.cs similarity index 94% rename from framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/AbpBlazorClientHttpMessageHandler.cs rename to framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpBlazorClientHttpMessageHandler.cs index 5fa70baabe..88855e3fc5 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/AbpBlazorClientHttpMessageHandler.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpBlazorClientHttpMessageHandler.cs @@ -4,13 +4,15 @@ using System.Net.Http.Headers; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.WebAssembly.Http; using Microsoft.Extensions.DependencyInjection; using Microsoft.JSInterop; using Volo.Abp.AspNetCore.Components.Progression; +using Volo.Abp.AspNetCore.Components.Web; using Volo.Abp.DependencyInjection; using Volo.Abp.Timing; -namespace Volo.Abp.AspNetCore.Components.Web; +namespace Volo.Abp.AspNetCore.Components.WebAssembly; public class AbpBlazorClientHttpMessageHandler : DelegatingHandler, ITransientDependency { @@ -51,6 +53,7 @@ public class AbpBlazorClientHttpMessageHandler : DelegatingHandler, ITransientDe options.Type = UiPageProgressType.Info; }); + request.SetBrowserRequestStreamingEnabled(true); await SetLanguageAsync(request, cancellationToken); await SetAntiForgeryTokenAsync(request); await SetTimeZoneAsync(request); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs index e3d3c12370..5d87371ae8 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs @@ -1,4 +1,5 @@ using System; +using System.Globalization; using Microsoft.AspNetCore.Http; using System.Threading.Tasks; using Microsoft.Extensions.Caching.Distributed; @@ -7,6 +8,7 @@ using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations; using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ClientProxies; using Volo.Abp.Caching; using Volo.Abp.DependencyInjection; +using Volo.Abp.Localization; using Volo.Abp.Threading; using Volo.Abp.Users; @@ -82,28 +84,47 @@ public class MvcCachedApplicationConfigurationClient : ICachedApplicationConfigu return configuration; } - private async Task GetRemoteConfigurationAsync() + protected virtual async Task GetRemoteConfigurationAsync() { - var config = await ApplicationConfigurationAppService.GetAsync( + var cultureName = CultureInfo.CurrentUICulture.Name; + + var configTask = ApplicationConfigurationAppService.GetAsync( new ApplicationConfigurationRequestOptions { IncludeLocalizationResources = false } ); - var localizationDto = await ApplicationLocalizationClientProxy.GetAsync( - new ApplicationLocalizationRequestDto { - CultureName = config.Localization.CurrentCulture.Name, + var localizationTask = ApplicationLocalizationClientProxy.GetAsync( + new ApplicationLocalizationRequestDto + { + CultureName = cultureName, OnlyDynamics = true } ); + await Task.WhenAll(configTask, localizationTask); + + var config = configTask.Result; + var localizationDto = localizationTask.Result; + + if (!CultureHelper.IsCompatibleCulture(config.Localization.CurrentCulture.Name, cultureName)) + { + localizationDto = await ApplicationLocalizationClientProxy.GetAsync( + new ApplicationLocalizationRequestDto + { + CultureName = config.Localization.CurrentCulture.Name, + OnlyDynamics = true + } + ); + } + config.Localization.Resources = localizationDto.Resources; return config; } - public ApplicationConfigurationDto Get() + public virtual ApplicationConfigurationDto Get() { string? cacheKey = null; var httpContext = HttpContextAccessor?.HttpContext; diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo.Abp.AspNetCore.Mvc.Contracts.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo.Abp.AspNetCore.Mvc.Contracts.csproj index c98b9b39d1..887ee1fa08 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo.Abp.AspNetCore.Mvc.Contracts.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo.Abp.AspNetCore.Mvc.Contracts.csproj @@ -18,6 +18,7 @@ + diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcContractsModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcContractsModule.cs index 278fe6eb21..2132764b75 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcContractsModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcContractsModule.cs @@ -1,11 +1,13 @@ using Volo.Abp.Application; using Volo.Abp.Modularity; +using Volo.Abp.MultiTenancy; namespace Volo.Abp.AspNetCore.Mvc; [DependsOn( - typeof(AbpDddApplicationContractsModule) - )] + typeof(AbpDddApplicationContractsModule), + typeof(AbpMultiTenancyAbstractionsModule) +)] public class AbpAspNetCoreMvcContractsModule : AbpModule { diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/MultiTenancy/MultiTenancyInfoDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/MultiTenancy/MultiTenancyInfoDto.cs index fcbb911ad7..27085a645d 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/MultiTenancy/MultiTenancyInfoDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/MultiTenancy/MultiTenancyInfoDto.cs @@ -1,6 +1,10 @@ -namespace Volo.Abp.AspNetCore.Mvc.MultiTenancy; +using Volo.Abp.MultiTenancy; + +namespace Volo.Abp.AspNetCore.Mvc.MultiTenancy; public class MultiTenancyInfoDto { public bool IsEnabled { get; set; } + + public TenantUserSharingStrategy UserSharingStrategy { get; set; } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs index 73edea9fdf..b1ae63c39b 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs @@ -135,7 +135,8 @@ public class AbpApplicationConfigurationAppService : ApplicationService, IAbpApp { return new MultiTenancyInfoDto { - IsEnabled = _multiTenancyOptions.IsEnabled + IsEnabled = _multiTenancyOptions.IsEnabled, + UserSharingStrategy = _multiTenancyOptions.UserSharingStrategy }; } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs index ad3dcc003e..2df5dea048 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs @@ -121,6 +121,7 @@ public class AspNetCoreApiDescriptionModelProvider : IApiDescriptionModelProvide Logger.LogDebug($"ActionApiDescriptionModel.Create: {controllerModel.ControllerName}.{uniqueMethodName}"); bool? allowAnonymous = null; + var authorizeModels = new List(); if (apiDescription.ActionDescriptor.EndpointMetadata.Any(x => x is IAllowAnonymous)) { allowAnonymous = true; @@ -128,6 +129,12 @@ public class AspNetCoreApiDescriptionModelProvider : IApiDescriptionModelProvide else if (apiDescription.ActionDescriptor.EndpointMetadata.Any(x => x is IAuthorizeData)) { allowAnonymous = false; + var authorizeDatas = apiDescription.ActionDescriptor.EndpointMetadata.Where(x => x is IAuthorizeData).Cast().ToList(); + authorizeModels.AddRange(authorizeDatas.Select(authorizeData => new AuthorizeDataApiDescriptionModel + { + Policy = authorizeData.Policy, + Roles = authorizeData.Roles + })); } var implementFrom = controllerType.FullName; @@ -147,6 +154,7 @@ public class AspNetCoreApiDescriptionModelProvider : IApiDescriptionModelProvide apiDescription.HttpMethod, GetSupportedVersions(controllerType, method, setting), allowAnonymous, + authorizeModels, implementFrom ) ); diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/EntityPropertyChangeInfo.cs b/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/EntityPropertyChangeInfo.cs index e25369d7b2..df7a6e88ec 100644 --- a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/EntityPropertyChangeInfo.cs +++ b/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/EntityPropertyChangeInfo.cs @@ -21,7 +21,7 @@ public class EntityPropertyChangeInfo /// Maximum length of property. /// Value: 512. /// - public static int MaxPropertyTypeFullNameLength = 192; + public static int MaxPropertyTypeFullNameLength = 512; public virtual string? NewValue { get; set; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/SolutionRenamer.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/SolutionRenamer.cs index 36006ecd18..e5c950f082 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/SolutionRenamer.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/SolutionRenamer.cs @@ -1,5 +1,6 @@ -using System; +using System; using System.Collections.Generic; +using System.Linq; using Volo.Abp.Cli.ProjectBuilding.Files; namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps; @@ -41,7 +42,7 @@ public class SolutionRenamer if (_companyName != null) { RenameHelper.RenameAll(_entries, _companyNamePlaceHolder, _companyName); - RenameHelper.RenameAll(_entries, _companyNamePlaceHolder.ToCamelCase(), _companyName.ToCamelCase()); + RenameHelper.RenameAll(_entries, _companyNamePlaceHolder.ToCamelCase(), ToCamelCaseWithNamespace(_companyName)); RenameHelper.RenameAll(_entries, _companyNamePlaceHolder.ToKebabCase(), _companyName.ToKebabCase()); RenameHelper.RenameAll(_entries, _companyNamePlaceHolder.ToLowerInvariant(), _companyName.ToLowerInvariant()); } @@ -55,9 +56,19 @@ public class SolutionRenamer } RenameHelper.RenameAll(_entries, _projectNamePlaceHolder, _projectName); - RenameHelper.RenameAll(_entries, _projectNamePlaceHolder.ToCamelCase(), _projectName.ToCamelCase()); + RenameHelper.RenameAll(_entries, _projectNamePlaceHolder.ToCamelCase(), ToCamelCaseWithNamespace(_projectName)); RenameHelper.RenameAll(_entries, _projectNamePlaceHolder.ToKebabCase(), _projectName.ToKebabCase()); RenameHelper.RenameAll(_entries, _projectNamePlaceHolder.ToLowerInvariant(), _projectName.ToLowerInvariant()); RenameHelper.RenameAll(_entries, _projectNamePlaceHolder.ToSnakeCase().ToUpper(), _projectName.ToSnakeCase().ToUpper()); } + + private static string ToCamelCaseWithNamespace(string name) + { + if (name.Contains('.')) + { + return name.Split('.').Select(n => n.ToCamelCase()).JoinAsString("."); + } + + return name.ToCamelCase(); + } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataFilterExtensions.cs b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataFilterExtensions.cs new file mode 100644 index 0000000000..8123ab7528 --- /dev/null +++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataFilterExtensions.cs @@ -0,0 +1,270 @@ +using System; + +namespace Volo.Abp.Data; + +public static class DataFilterExtensions +{ + private sealed class CompositeDisposable : IDisposable + { + private readonly IDisposable[] _disposables; + private bool _disposed; + + public CompositeDisposable(IDisposable[] disposables) + { + _disposables = disposables; + } + + public void Dispose() + { + if (_disposed) + { + return; + } + + _disposed = true; + + foreach (var disposable in _disposables) + { + disposable?.Dispose(); + } + } + } + + public static IDisposable Disable(this IDataFilter filter) + where T1 : class + where T2 : class + { + return new CompositeDisposable(new[] + { + filter.Disable(), + filter.Disable() + }); + } + + public static IDisposable Disable(this IDataFilter filter) + where T1 : class + where T2 : class + where T3 : class + { + return new CompositeDisposable(new[] + { + filter.Disable(), + filter.Disable(), + filter.Disable() + }); + } + + public static IDisposable Disable(this IDataFilter filter) + where T1 : class + where T2 : class + where T3 : class + where T4 : class + { + return new CompositeDisposable(new[] + { + filter.Disable(), + filter.Disable(), + filter.Disable(), + filter.Disable() + }); + } + + public static IDisposable Disable(this IDataFilter filter) + where T1 : class + where T2 : class + where T3 : class + where T4 : class + where T5 : class + { + return new CompositeDisposable(new[] + { + filter.Disable(), + filter.Disable(), + filter.Disable(), + filter.Disable(), + filter.Disable() + }); + } + + public static IDisposable Disable(this IDataFilter filter) + where T1 : class + where T2 : class + where T3 : class + where T4 : class + where T5 : class + where T6 : class + { + return new CompositeDisposable(new[] + { + filter.Disable(), + filter.Disable(), + filter.Disable(), + filter.Disable(), + filter.Disable(), + filter.Disable() + }); + } + + public static IDisposable Disable(this IDataFilter filter) + where T1 : class + where T2 : class + where T3 : class + where T4 : class + where T5 : class + where T6 : class + where T7 : class + { + return new CompositeDisposable(new[] + { + filter.Disable(), + filter.Disable(), + filter.Disable(), + filter.Disable(), + filter.Disable(), + filter.Disable(), + filter.Disable() + }); + } + + public static IDisposable Disable(this IDataFilter filter) + where T1 : class + where T2 : class + where T3 : class + where T4 : class + where T5 : class + where T6 : class + where T7 : class + where T8 : class + { + return new CompositeDisposable(new[] + { + filter.Disable(), + filter.Disable(), + filter.Disable(), + filter.Disable(), + filter.Disable(), + filter.Disable(), + filter.Disable(), + filter.Disable() + }); + } + + public static IDisposable Enable(this IDataFilter filter) + where T1 : class + where T2 : class + { + return new CompositeDisposable(new[] + { + filter.Enable(), + filter.Enable() + }); + } + + public static IDisposable Enable(this IDataFilter filter) + where T1 : class + where T2 : class + where T3 : class + { + return new CompositeDisposable(new[] + { + filter.Enable(), + filter.Enable(), + filter.Enable() + }); + } + + public static IDisposable Enable(this IDataFilter filter) + where T1 : class + where T2 : class + where T3 : class + where T4 : class + { + return new CompositeDisposable(new[] + { + filter.Enable(), + filter.Enable(), + filter.Enable(), + filter.Enable() + }); + } + + public static IDisposable Enable(this IDataFilter filter) + where T1 : class + where T2 : class + where T3 : class + where T4 : class + where T5 : class + { + return new CompositeDisposable(new[] + { + filter.Enable(), + filter.Enable(), + filter.Enable(), + filter.Enable(), + filter.Enable() + }); + } + + public static IDisposable Enable(this IDataFilter filter) + where T1 : class + where T2 : class + where T3 : class + where T4 : class + where T5 : class + where T6 : class + { + return new CompositeDisposable(new[] + { + filter.Enable(), + filter.Enable(), + filter.Enable(), + filter.Enable(), + filter.Enable(), + filter.Enable() + }); + } + + public static IDisposable Enable(this IDataFilter filter) + where T1 : class + where T2 : class + where T3 : class + where T4 : class + where T5 : class + where T6 : class + where T7 : class + { + return new CompositeDisposable(new[] + { + filter.Enable(), + filter.Enable(), + filter.Enable(), + filter.Enable(), + filter.Enable(), + filter.Enable(), + filter.Enable() + }); + } + + public static IDisposable Enable(this IDataFilter filter) + where T1 : class + where T2 : class + where T3 : class + where T4 : class + where T5 : class + where T6 : class + where T7 : class + where T8 : class + { + return new CompositeDisposable(new[] + { + filter.Enable(), + filter.Enable(), + filter.Enable(), + filter.Enable(), + filter.Enable(), + filter.Enable(), + filter.Enable(), + filter.Enable() + }); + } +} diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs index 07ea443fdf..dd2a9cfde7 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs @@ -277,7 +277,19 @@ public abstract class AbpDbContext : DbContext, IAbpEfCoreDbContext, finally { ChangeTracker.AutoDetectChangesEnabled = true; - AbpEfCoreNavigationHelper.RemoveChangedEntityEntries(); + AbpEfCoreNavigationHelper.ResetChangedFlags(); + if (UnitOfWorkManager.Current != null) + { + UnitOfWorkManager.Current.OnCompleted(() => + { + AbpEfCoreNavigationHelper.Clear(); + return Task.CompletedTask; + }); + } + else + { + AbpEfCoreNavigationHelper.Clear(); + } } } @@ -994,7 +1006,7 @@ public abstract class AbpDbContext : DbContext, IAbpEfCoreDbContext, return expression; } - protected virtual bool UseDbFunction() + public virtual bool UseDbFunction() { return LazyServiceProvider != null && GlobalFilterOptions.Value.UseDbFunction && DbContextOptions.FindExtension() != null; } diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ChangeTrackers/AbpEfCoreNavigationHelper.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ChangeTrackers/AbpEfCoreNavigationHelper.cs index 39835569cb..077ff21d2b 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ChangeTrackers/AbpEfCoreNavigationHelper.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ChangeTrackers/AbpEfCoreNavigationHelper.cs @@ -222,9 +222,19 @@ public class AbpEfCoreNavigationHelper : ITransientDependency return null; } - public virtual void RemoveChangedEntityEntries() + public virtual void ResetChangedFlags() { - EntityEntries.RemoveAll(x => x.Value.IsModified); + foreach (var entry in EntityEntries.Values) + { + if (entry.IsModified) + { + entry.IsModified = false; + foreach (var navigation in entry.NavigationEntries) + { + navigation.IsModified = false; + } + } + } } public virtual void Clear() diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/AbpCompiledQueryCacheKeyGenerator.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/AbpCompiledQueryCacheKeyGenerator.cs index e43ae1e04d..8ce26b7ce1 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/AbpCompiledQueryCacheKeyGenerator.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/AbpCompiledQueryCacheKeyGenerator.cs @@ -1,7 +1,9 @@ using System; +using System.Collections.Generic; using System.Linq.Expressions; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Query; +using Microsoft.Extensions.DependencyInjection; namespace Volo.Abp.EntityFrameworkCore.GlobalFilters; @@ -23,7 +25,21 @@ public class AbpCompiledQueryCacheKeyGenerator : ICompiledQueryCacheKeyGenerator var cacheKey = InnerCompiledQueryCacheKeyGenerator.GenerateCacheKey(query, async); if (CurrentContext.Context is IAbpEfCoreDbFunctionContext abpEfCoreDbFunctionContext) { - return new AbpCompiledQueryCacheKey(cacheKey, abpEfCoreDbFunctionContext.GetCompiledQueryCacheKey()); + var abpCacheKey = abpEfCoreDbFunctionContext.GetCompiledQueryCacheKey(); + var cacheKeyProviders = abpEfCoreDbFunctionContext.LazyServiceProvider.GetService>(); + if (cacheKeyProviders != null) + { + foreach (var provider in cacheKeyProviders) + { + var key = provider.GetCompiledQueryCacheKey(); + if (!key.IsNullOrWhiteSpace()) + { + abpCacheKey += $":{key}"; + } + } + } + + return new AbpCompiledQueryCacheKey(cacheKey, abpCacheKey); } return cacheKey; diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/IAbpEfCoreCompiledQueryCacheKeyProvider.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/IAbpEfCoreCompiledQueryCacheKeyProvider.cs new file mode 100644 index 0000000000..80d563fc15 --- /dev/null +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/IAbpEfCoreCompiledQueryCacheKeyProvider.cs @@ -0,0 +1,6 @@ +namespace Volo.Abp.EntityFrameworkCore.GlobalFilters; + +public interface IAbpEfCoreCompiledQueryCacheKeyProvider +{ + string? GetCompiledQueryCacheKey(); +} diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/IAbpEfCoreDbFunctionContext.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/IAbpEfCoreDbFunctionContext.cs index 85096e9e0a..3948de48b5 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/IAbpEfCoreDbFunctionContext.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/GlobalFilters/IAbpEfCoreDbFunctionContext.cs @@ -12,5 +12,7 @@ public interface IAbpEfCoreDbFunctionContext IDataFilter DataFilter { get; } + bool UseDbFunction(); + string GetCompiledQueryCacheKey(); } diff --git a/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ActionApiDescriptionModel.cs b/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ActionApiDescriptionModel.cs index 890637d801..83bacddd8c 100644 --- a/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ActionApiDescriptionModel.cs +++ b/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ActionApiDescriptionModel.cs @@ -28,6 +28,8 @@ public class ActionApiDescriptionModel public bool? AllowAnonymous { get; set; } + public IList AuthorizeDatas { get; set; } = default!; + public string? ImplementFrom { get; set; } public ActionApiDescriptionModel() @@ -35,7 +37,7 @@ public class ActionApiDescriptionModel } - public static ActionApiDescriptionModel Create([NotNull] string uniqueName, [NotNull] MethodInfo method, [NotNull] string url, string? httpMethod, [NotNull] IList supportedVersions, bool? allowAnonymous = null, string? implementFrom = null) + public static ActionApiDescriptionModel Create([NotNull] string uniqueName, [NotNull] MethodInfo method, [NotNull] string url, string? httpMethod, [NotNull] IList supportedVersions, bool? allowAnonymous = null, IList? authorizeDatas = null, string? implementFrom = null) { Check.NotNull(uniqueName, nameof(uniqueName)); Check.NotNull(method, nameof(method)); @@ -56,6 +58,7 @@ public class ActionApiDescriptionModel .ToList(), SupportedVersions = supportedVersions, AllowAnonymous = allowAnonymous, + AuthorizeDatas = authorizeDatas ?? new List(), ImplementFrom = implementFrom }; } diff --git a/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/AuthorizeDataApiDescriptionModel.cs b/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/AuthorizeDataApiDescriptionModel.cs new file mode 100644 index 0000000000..d218b5508d --- /dev/null +++ b/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/AuthorizeDataApiDescriptionModel.cs @@ -0,0 +1,8 @@ +namespace Volo.Abp.Http.Modeling; + +public class AuthorizeDataApiDescriptionModel +{ + public string? Policy { get; set; } + + public string? Roles { get; set; } +} diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs index 4beb71d188..e6b014b6f4 100644 --- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs +++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs @@ -98,7 +98,7 @@ public class MongoDbRepository public IMongoDbBulkOperationProvider? BulkOperationProvider => LazyServiceProvider.LazyGetService(); - public IMongoDbRepositoryFilterer RepositoryFilterer => LazyServiceProvider.LazyGetService>()!; + public IEnumerable> RepositoryFilterers => LazyServiceProvider.LazyGetService>>()!; public MongoDbRepository(IMongoDbContextProvider dbContextProvider) : base(AbpMongoDbConsts.ProviderName) @@ -774,7 +774,10 @@ public class MongoDbRepository { if (typeof(TOtherEntity) == typeof(TEntity)) { - return base.ApplyDataFilters((TQueryable)RepositoryFilterer.FilterQueryable(query.As>())); + foreach (var filterer in RepositoryFilterers) + { + query = (TQueryable) filterer.FilterQueryable(query.As>()); + } } return base.ApplyDataFilters(query); } @@ -786,7 +789,7 @@ public class MongoDbRepository where TMongoDbContext : IAbpMongoDbContext where TEntity : class, IEntity { - public IMongoDbRepositoryFilterer RepositoryFiltererWithKey => LazyServiceProvider.LazyGetService>()!; + public IEnumerable> RepositoryFiltererWithKeys => LazyServiceProvider.LazyGetService>>()!; public MongoDbRepository(IMongoDbContextProvider dbContextProvider) : base(dbContextProvider) @@ -844,19 +847,38 @@ public class MongoDbRepository { if (typeof(TOtherEntity) == typeof(TEntity)) { - return base.ApplyDataFilters((TQueryable)RepositoryFiltererWithKey.FilterQueryable(query.As>())); + foreach (var filterer in RepositoryFiltererWithKeys) + { + query = (TQueryable) filterer.FilterQueryable(query.As>()); + } } return base.ApplyDataFilters(query); } - protected async override Task> CreateEntityFilterAsync(TEntity entity, bool withConcurrencyStamp = false, string? concurrencyStamp = null) + protected override async Task> CreateEntityFilterAsync(TEntity entity, bool withConcurrencyStamp = false, string? concurrencyStamp = null) { - return await RepositoryFiltererWithKey.CreateEntityFilterAsync(entity, withConcurrencyStamp, concurrencyStamp); + FilterDefinition fieldDefinition = Builders.Filter.Empty; + foreach (var filterer in RepositoryFiltererWithKeys) + { + fieldDefinition = Builders.Filter.And( + fieldDefinition, + await filterer.CreateEntityFilterAsync(entity, withConcurrencyStamp, concurrencyStamp) + ); + } + return fieldDefinition; } - protected async override Task> CreateEntitiesFilterAsync(IEnumerable entities, bool withConcurrencyStamp = false) + protected override async Task> CreateEntitiesFilterAsync(IEnumerable entities, bool withConcurrencyStamp = false) { - return await RepositoryFiltererWithKey.CreateEntitiesFilterAsync(entities, withConcurrencyStamp); + FilterDefinition fieldDefinition = Builders.Filter.Empty; + foreach (var filterer in RepositoryFiltererWithKeys) + { + fieldDefinition = Builders.Filter.And( + fieldDefinition, + await filterer.CreateEntitiesFilterAsync(entities, withConcurrencyStamp) + ); + } + return fieldDefinition; } } diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbModule.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbModule.cs index fb9d6eaea1..fc233e5695 100644 --- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbModule.cs +++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbModule.cs @@ -36,15 +36,17 @@ public class AbpMongoDbModule : AbpModule typeof(UnitOfWorkMongoDbContextProvider<>) ); - context.Services.TryAddTransient( - typeof(IMongoDbRepositoryFilterer<>), - typeof(MongoDbRepositoryFilterer<>) - ); + context.Services.TryAddEnumerable( + ServiceDescriptor.Transient( + typeof(IMongoDbRepositoryFilterer<>), + typeof(MongoDbRepositoryFilterer<>) + )); - context.Services.TryAddTransient( - typeof(IMongoDbRepositoryFilterer<,>), - typeof(MongoDbRepositoryFilterer<,>) - ); + context.Services.TryAddEnumerable( + ServiceDescriptor.Transient( + typeof(IMongoDbRepositoryFilterer<,>), + typeof(MongoDbRepositoryFilterer<,>) + )); context.Services.AddTransient( typeof(IMongoDbContextEventOutbox<>), diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/AbpMultiTenancyOptions.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/AbpMultiTenancyOptions.cs index fac41e5f20..247eba34ee 100644 --- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/AbpMultiTenancyOptions.cs +++ b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/AbpMultiTenancyOptions.cs @@ -4,7 +4,7 @@ public class AbpMultiTenancyOptions { /// /// A central point to enable/disable multi-tenancy. - /// Default: false. + /// Default: false. /// public bool IsEnabled { get; set; } @@ -13,4 +13,10 @@ public class AbpMultiTenancyOptions /// Default: . /// public MultiTenancyDatabaseStyle DatabaseStyle { get; set; } = MultiTenancyDatabaseStyle.Hybrid; + + /// + /// User sharing strategy between tenants. + /// Default: . + /// + public TenantUserSharingStrategy UserSharingStrategy { get; set; } = TenantUserSharingStrategy.Isolated; } diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/CreateTenantEto.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/CreateTenantEto.cs new file mode 100644 index 0000000000..c5d7c255df --- /dev/null +++ b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/CreateTenantEto.cs @@ -0,0 +1,14 @@ +using System; +using Volo.Abp.Domain.Entities.Events.Distributed; +using Volo.Abp.EventBus; + +namespace Volo.Abp.MultiTenancy; + +[Serializable] +[EventName("abp.multi_tenancy.create.tenant")] +public class CreateTenantEto : EtoBase +{ + public string Name { get; set; } = default!; + + public string AdminEmailAddress { get; set; } = default!; +} diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/Localization/de.json b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/Localization/de.json index cc4c857370..75e37d51aa 100644 --- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/Localization/de.json +++ b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/Localization/de.json @@ -1,9 +1,9 @@ { "culture": "de", "texts": { - "TenantNotFoundMessage": "Mieter nicht gefunden!", + "TenantNotFoundMessage": "Mandant nicht gefunden!", "TenantNotFoundDetails": "Es gibt keinen Mandanten mit der Mandanten-ID oder dem Namen: {0}", - "TenantNotActiveMessage": "Mieter ist nicht aktiv!", + "TenantNotActiveMessage": "Mandant ist nicht aktiv!", "TenantNotActiveDetails": "Der Mandant ist mit der Mandanten-ID oder dem Namen nicht aktiv: {0}" } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantUserSharingStrategy.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantUserSharingStrategy.cs new file mode 100644 index 0000000000..0e413d7af2 --- /dev/null +++ b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantUserSharingStrategy.cs @@ -0,0 +1,8 @@ +namespace Volo.Abp.MultiTenancy; + +public enum TenantUserSharingStrategy +{ + Isolated = 0, + + Shared = 1 +} diff --git a/framework/src/Volo.Abp.Swashbuckle/Microsoft/Extensions/DependencyInjection/AbpSwaggerUIOptionsExtensions.cs b/framework/src/Volo.Abp.Swashbuckle/Microsoft/Extensions/DependencyInjection/AbpSwaggerUIOptionsExtensions.cs new file mode 100644 index 0000000000..d307bc7e34 --- /dev/null +++ b/framework/src/Volo.Abp.Swashbuckle/Microsoft/Extensions/DependencyInjection/AbpSwaggerUIOptionsExtensions.cs @@ -0,0 +1,47 @@ +using System; +using System.Text; +using System.Text.Json; +using JetBrains.Annotations; +using Swashbuckle.AspNetCore.SwaggerUI; +using Volo.Abp; + +namespace Microsoft.Extensions.DependencyInjection; + +public static class AbpSwaggerUIOptionsExtensions +{ + /// + /// Sets the abp.appPath used by the Swagger UI scripts. + /// + /// The Swagger UI options. + /// The application base path. + public static void AbpAppPath([NotNull] this SwaggerUIOptions options, [NotNull] string appPath) + { + Check.NotNull(options, nameof(options)); + Check.NotNull(appPath, nameof(appPath)); + + var normalizedAppPath = NormalizeAppPath(appPath); + options.HeadContent = BuildAppPathScript(normalizedAppPath, options.HeadContent ?? string.Empty); + } + + private static string NormalizeAppPath(string appPath) + { + return string.IsNullOrWhiteSpace(appPath) + ? "/" + : appPath.Trim().EnsureStartsWith('/').EnsureEndsWith('/'); + } + + private static string BuildAppPathScript(string normalizedAppPath, string headContent) + { + var builder = new StringBuilder(headContent); + if (builder.Length > 0) + { + builder.AppendLine(); + } + + builder.AppendLine(""); + return builder.ToString(); + } +} diff --git a/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.js b/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.js index 11cbe56803..da996ea6f5 100644 --- a/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.js +++ b/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.js @@ -2,11 +2,7 @@ var abp = abp || {}; (function () { /* Application paths *****************************************/ - - //Current application root path (including virtual directory if exists). - var baseElement = document.querySelector('base'); - var baseHref = baseElement ? baseElement.getAttribute('href') : null; - abp.appPath = baseHref || abp.appPath || '/'; + abp.appPath = abp.appPath || '/'; /* UTILS ***************************************************/ diff --git a/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js b/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js index db054056d1..e961f6bc2d 100644 --- a/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js +++ b/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js @@ -11,7 +11,7 @@ var abp = abp || {}; var oidcSupportedScopes = configObject.oidcSupportedScopes || []; var oidcDiscoveryEndpoint = configObject.oidcDiscoveryEndpoint || []; var tenantPlaceHolders = ["{{tenantId}}", "{{tenantName}}", "{0}"] - abp.appPath = configObject.baseUrl || abp.appPath; + abp.appPath = abp.appPath || "/"; var requestInterceptor = configObject.requestInterceptor; var responseInterceptor = configObject.responseInterceptor; diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Client.Tests/Volo.Abp.AspNetCore.Mvc.Client.Tests.csproj b/framework/test/Volo.Abp.AspNetCore.Mvc.Client.Tests/Volo.Abp.AspNetCore.Mvc.Client.Tests.csproj new file mode 100644 index 0000000000..d1190652a3 --- /dev/null +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Client.Tests/Volo.Abp.AspNetCore.Mvc.Client.Tests.csproj @@ -0,0 +1,17 @@ + + + + + + net10.0 + + + + + + + + + + + diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Client.Tests/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientTestBase.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Client.Tests/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientTestBase.cs new file mode 100644 index 0000000000..96e82fe105 --- /dev/null +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Client.Tests/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientTestBase.cs @@ -0,0 +1,11 @@ +using Volo.Abp.Testing; + +namespace Volo.Abp.AspNetCore.Mvc.Client; + +public abstract class AbpAspNetCoreMvcClientTestBase : AbpIntegratedTest +{ + protected override void SetAbpApplicationCreationOptions(AbpApplicationCreationOptions options) + { + options.UseAutofac(); + } +} diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Client.Tests/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientTestModule.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Client.Tests/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientTestModule.cs new file mode 100644 index 0000000000..04e9f856a2 --- /dev/null +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Client.Tests/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientTestModule.cs @@ -0,0 +1,17 @@ +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.Autofac; +using Volo.Abp.Modularity; + +namespace Volo.Abp.AspNetCore.Mvc.Client; + +[DependsOn( + typeof(AbpAspNetCoreMvcClientModule), + typeof(AbpAutofacModule) +)] +public class AbpAspNetCoreMvcClientTestModule : AbpModule +{ + public override void ConfigureServices(ServiceConfigurationContext context) + { + context.Services.AddHttpContextAccessor(); + } +} diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Client.Tests/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Client.Tests/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient_Tests.cs new file mode 100644 index 0000000000..6784c69954 --- /dev/null +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Client.Tests/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient_Tests.cs @@ -0,0 +1,105 @@ +using System.Collections.Generic; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; +using NSubstitute; +using Shouldly; +using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations; +using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ClientProxies; +using Volo.Abp.Localization; +using Xunit; + +namespace Volo.Abp.AspNetCore.Mvc.Client; + +public class MvcCachedApplicationConfigurationClient_Tests : AbpAspNetCoreMvcClientTestBase +{ + private AbpApplicationConfigurationClientProxy _configProxy; + private AbpApplicationLocalizationClientProxy _localizationProxy; + + private readonly ICachedApplicationConfigurationClient _applicationConfigurationClient; + + public MvcCachedApplicationConfigurationClient_Tests() + { + _applicationConfigurationClient = GetRequiredService(); + } + + protected override void AfterAddApplication(IServiceCollection services) + { + _configProxy = Substitute.For(); + _localizationProxy = Substitute.For(); + + services.Replace(ServiceDescriptor.Transient(_ => _configProxy)); + services.Replace(ServiceDescriptor.Transient(_ => _localizationProxy)); + } + + [Fact] + public async Task Should_Use_CurrentUICulture_For_Localization_Request() + { + var cultureName = "en"; + + using (CultureHelper.Use(cultureName)) + { + var configTcs = new TaskCompletionSource(); + _configProxy.GetAsync(Arg.Any()).Returns(configTcs.Task); + + var expectedResources = new Dictionary + { + ["TestResource"] = new() + }; + + _localizationProxy.GetAsync(Arg.Any()).Returns(new ApplicationLocalizationDto { Resources = expectedResources }); + + var resultTask = _applicationConfigurationClient.GetAsync(); + + // Localization request should be fired before config completes (concurrent). + await _localizationProxy.Received(1).GetAsync(Arg.Is(x => x.CultureName == cultureName && x.OnlyDynamics == true)); + + // Now let config complete. + configTcs.SetResult(CreateConfigDto(cultureName)); + var result = await resultTask; + + result.Localization.Resources.ShouldBe(expectedResources); + + await _configProxy.Received(1).GetAsync(Arg.Is(x => x.IncludeLocalizationResources == false)); + } + } + + [Fact] + public async Task Should_Refetch_Localization_When_Culture_Differs() + { + var currentCulture = "en"; + var serverCulture = "tr"; + + using (CultureHelper.Use(currentCulture)) + { + _configProxy.GetAsync(Arg.Any()).Returns(CreateConfigDto(serverCulture)); + + var wrongResources = new Dictionary(); + var correctResources = new Dictionary + { + ["TestResource"] = new() + }; + + _localizationProxy.GetAsync(Arg.Is(x => x.CultureName == currentCulture)).Returns(new ApplicationLocalizationDto { Resources = wrongResources }); + _localizationProxy.GetAsync(Arg.Is(x => x.CultureName == serverCulture)).Returns(new ApplicationLocalizationDto { Resources = correctResources }); + + var result = await _applicationConfigurationClient.GetAsync(); + + result.Localization.Resources.ShouldBe(correctResources); + + await _localizationProxy.Received(1).GetAsync(Arg.Is(x => x.CultureName == currentCulture)); + await _localizationProxy.Received(1).GetAsync(Arg.Is(x => x.CultureName == serverCulture)); + } + } + + private static ApplicationConfigurationDto CreateConfigDto(string cultureName) + { + return new ApplicationConfigurationDto + { + Localization = + { + CurrentCulture = new CurrentCultureDto { Name = cultureName } + } + }; + } +} diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ApiExploring/AbpApiDefinitionController_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ApiExploring/AbpApiDefinitionController_Tests.cs index 4ddd057889..5404555ffb 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ApiExploring/AbpApiDefinitionController_Tests.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ApiExploring/AbpApiDefinitionController_Tests.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; using Shouldly; using Volo.Abp.Http.Modeling; @@ -23,4 +24,67 @@ public class AbpApiDefinitionController_Tests : AspNetCoreMvcTestBase model.ShouldNotBeNull(); model.Types.IsNullOrEmpty().ShouldBeFalse(); } + + [Fact] + public async Task Should_Have_Null_AllowAnonymous_For_Actions_Without_Authorization() + { + var model = await GetResponseAsObjectAsync("/api/abp/api-definition"); + + var peopleController = GetPeopleController(model); + var action = GetAction(peopleController, "GetPhones"); + + action.AllowAnonymous.ShouldBeNull(); + action.AuthorizeDatas.ShouldBeEmpty(); + } + + [Fact] + public async Task Should_Set_AllowAnonymous_True_For_AllowAnonymous_Actions() + { + var model = await GetResponseAsObjectAsync("/api/abp/api-definition"); + + var peopleController = GetPeopleController(model); + var action = GetAction(peopleController, "GetWithAllowAnonymous"); + + action.AllowAnonymous.ShouldBe(true); + action.AuthorizeDatas.ShouldBeEmpty(); + } + + [Fact] + public async Task Should_Set_AllowAnonymous_False_And_AuthorizeDatas_For_Authorize_Actions() + { + var model = await GetResponseAsObjectAsync("/api/abp/api-definition"); + + var peopleController = GetPeopleController(model); + var action = GetAction(peopleController, "GetWithAuthorized"); + + action.AllowAnonymous.ShouldBe(false); + action.AuthorizeDatas.ShouldNotBeEmpty(); + } + + [Fact] + public async Task Should_Contain_Policy_And_Roles_In_AuthorizeDatas() + { + var model = await GetResponseAsObjectAsync("/api/abp/api-definition"); + + var peopleController = GetPeopleController(model); + var action = GetAction(peopleController, "GetWithAuthorizePolicy"); + + action.AllowAnonymous.ShouldBe(false); + action.AuthorizeDatas.Count.ShouldBe(2); + action.AuthorizeDatas.ShouldContain(a => a.Policy == "TestPolicy" && a.Roles == "Admin"); + action.AuthorizeDatas.ShouldContain(a => a.Policy == "TestPolicy2" && a.Roles == "Manager"); + } + + private static ControllerApiDescriptionModel GetPeopleController(ApplicationApiDescriptionModel model) + { + return model.Modules.Values + .SelectMany(m => m.Controllers.Values) + .First(c => c.ControllerName == "People"); + } + + private static ActionApiDescriptionModel GetAction(ControllerApiDescriptionModel controller, string actionName) + { + return controller.Actions.Values + .First(a => a.Name == actionName + "Async" || a.Name == actionName); + } } diff --git a/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectBuilding/Building/Steps/SolutionRenamer_Tests.cs b/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectBuilding/Building/Steps/SolutionRenamer_Tests.cs new file mode 100644 index 0000000000..a3c5cee0d6 --- /dev/null +++ b/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectBuilding/Building/Steps/SolutionRenamer_Tests.cs @@ -0,0 +1,87 @@ +using Shouldly; +using System.Collections.Generic; +using System.Reflection; +using Volo.Abp.Cli.ProjectBuilding.Files; +using Xunit; + +namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps; + +public class SolutionRenamer_Tests +{ + [Theory] + [InlineData("Demo", "demo")] + [InlineData("MyCompany", "myCompany")] + [InlineData("Acme", "acme")] + [InlineData("ABC", "aBC")] + public void ToCamelCaseWithNamespace_Should_Handle_Single_Segment_Names(string input, string expected) + { + // Act + var result = InvokeToCamelCaseWithNamespace(input); + + // Assert + result.ShouldBe(expected); + } + + [Theory] + [InlineData("Demo.App", "demo.app")] + [InlineData("MyCompany.MyProject", "myCompany.myProject")] + [InlineData("Acme.Bookstore", "acme.bookstore")] + [InlineData("ABC.XYZ", "aBC.xYZ")] + public void ToCamelCaseWithNamespace_Should_Handle_Two_Segment_Names(string input, string expected) + { + // Act + var result = InvokeToCamelCaseWithNamespace(input); + + // Assert + result.ShouldBe(expected); + } + + [Theory] + [InlineData("Demo.App.QoL", "demo.app.qoL")] + [InlineData("MyCompany.MyProject.Module", "myCompany.myProject.module")] + [InlineData("Acme.Bookstore.Application", "acme.bookstore.application")] + [InlineData("A.B.C.D", "a.b.c.d")] + public void ToCamelCaseWithNamespace_Should_Handle_Multi_Segment_Names(string input, string expected) + { + // Act + var result = InvokeToCamelCaseWithNamespace(input); + + // Assert + result.ShouldBe(expected); + } + + [Theory] + [InlineData("", "")] + [InlineData("A", "a")] + [InlineData(".", ".")] + [InlineData("...", "...")] + public void ToCamelCaseWithNamespace_Should_Handle_Edge_Cases(string input, string expected) + { + // Act + var result = InvokeToCamelCaseWithNamespace(input); + + // Assert + result.ShouldBe(expected); + } + + [Fact] + public void ToCamelCaseWithNamespace_Should_Throw_On_Null_Input() + { + // Act & Assert + var exception = Should.Throw(() => InvokeToCamelCaseWithNamespace(null)); + exception.InnerException.ShouldBeOfType(); + } + + /// + /// Helper method to invoke the private static ToCamelCaseWithNamespace method using reflection + /// + private static string InvokeToCamelCaseWithNamespace(string input) + { + var type = typeof(SolutionRenamer); + var method = type.GetMethod("ToCamelCaseWithNamespace", BindingFlags.NonPublic | BindingFlags.Static); + + method.ShouldNotBeNull("ToCamelCaseWithNamespace method should exist"); + + return (string)method.Invoke(null, new object[] { input }); + } +} diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/IPeopleAppService.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/IPeopleAppService.cs index 7aea19c141..a39216add5 100644 --- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/IPeopleAppService.cs +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/IPeopleAppService.cs @@ -20,6 +20,10 @@ public interface IPeopleAppService : ICrudAppService Task GetWithAuthorized(); + Task GetWithAllowAnonymous(); + + Task GetWithAuthorizePolicy(); + Task GetWithComplexType(GetWithComplexTypeInput input); Task DownloadAsync(); diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/PeopleAppService.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/PeopleAppService.cs index 6981eb1e57..a3920ec8ca 100644 --- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/PeopleAppService.cs +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/PeopleAppService.cs @@ -67,6 +67,19 @@ public class PeopleAppService : CrudAppService, IPeople return Task.CompletedTask; } + [AllowAnonymous] + public Task GetWithAllowAnonymous() + { + return Task.CompletedTask; + } + + [Authorize("TestPolicy", Roles = "Admin")] + [Authorize("TestPolicy2", Roles = "Manager")] + public Task GetWithAuthorizePolicy() + { + return Task.CompletedTask; + } + public Task GetWithComplexType(GetWithComplexTypeInput input) { return Task.FromResult(input); diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/EntityChange_Tests.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/EntityChange_Tests.cs index adb80c89d7..538fa45778 100644 --- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/EntityChange_Tests.cs +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/EntityChange_Tests.cs @@ -1,10 +1,12 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; using Shouldly; using Volo.Abp.Domain.Repositories; using Volo.Abp.Modularity; using Volo.Abp.TestApp.Domain; +using Volo.Abp.Uow; using Xunit; namespace Volo.Abp.TestApp.Testing; @@ -100,6 +102,116 @@ public abstract class EntityChange_Tests : TestAppTestBase() + { + new AppEntityWithNavigationChildOneToMany(child1Id) + { + AppEntityWithNavigationId = entityId, + ChildName = "Child1" + } + } + }); + + var unitOfWorkManager = ServiceProvider.GetRequiredService(); + + string concurrencyStampAfterFirstSave = null; + + // Within a single UoW, remove Child1 (first SaveChanges), then add Child2 (second SaveChanges). + // Before the fix, the second SaveChanges would not detect the navigation change + // because the entity entries were removed after the first SaveChanges. + await WithUnitOfWorkAsync(async () => + { + var entity = await AppEntityWithNavigationsRepository.GetAsync(entityId); + var originalConcurrencyStamp = entity.ConcurrencyStamp; + + // Remove Child1 + entity.OneToMany.Clear(); + await AppEntityWithNavigationsRepository.UpdateAsync(entity); + await unitOfWorkManager.Current!.SaveChangesAsync(); + + // ConcurrencyStamp should have been updated after the first navigation change + entity.ConcurrencyStamp.ShouldNotBe(originalConcurrencyStamp); + concurrencyStampAfterFirstSave = entity.ConcurrencyStamp; + + // Add Child2 + entity.OneToMany.Add(new AppEntityWithNavigationChildOneToMany(Guid.NewGuid()) + { + AppEntityWithNavigationId = entityId, + ChildName = "Child2" + }); + await AppEntityWithNavigationsRepository.UpdateAsync(entity); + }); + + // After UoW completes, verify ConcurrencyStamp was updated again by the second SaveChanges + await WithUnitOfWorkAsync(async () => + { + var entity = await AppEntityWithNavigationsRepository.GetAsync(entityId); + entity.ConcurrencyStamp.ShouldNotBe(concurrencyStampAfterFirstSave); + entity.OneToMany.Count.ShouldBe(1); + entity.OneToMany[0].ChildName.ShouldBe("Child2"); + }); + } + + [Fact] + public async Task Should_Detect_Navigation_Changes_On_Second_SaveChanges_After_Remove_And_Add_ManyToMany() + { + var entityId = Guid.NewGuid(); + + await AppEntityWithNavigationsRepository.InsertAsync(new AppEntityWithNavigations(entityId, "TestEntity") + { + ManyToMany = new List() + { + new AppEntityWithNavigationChildManyToMany + { + ChildName = "ManyToManyChild1" + } + } + }); + + var unitOfWorkManager = ServiceProvider.GetRequiredService(); + + string concurrencyStampAfterFirstSave = null; + // Within a single UoW, remove ManyToManyChild1 (first SaveChanges), then add ManyToManyChild2 (second SaveChanges). + await WithUnitOfWorkAsync(async () => + { + var entity = await AppEntityWithNavigationsRepository.GetAsync(entityId); + var originalConcurrencyStamp = entity.ConcurrencyStamp; + + // Remove ManyToManyChild1 + entity.ManyToMany.Clear(); + await AppEntityWithNavigationsRepository.UpdateAsync(entity); + await unitOfWorkManager.Current!.SaveChangesAsync(); + + // ConcurrencyStamp should have been updated after the first navigation change + entity.ConcurrencyStamp.ShouldNotBe(originalConcurrencyStamp); + concurrencyStampAfterFirstSave = entity.ConcurrencyStamp; + + // Add ManyToManyChild2 + entity.ManyToMany.Add(new AppEntityWithNavigationChildManyToMany + { + ChildName = "ManyToManyChild2" + }); + await AppEntityWithNavigationsRepository.UpdateAsync(entity); + }); + + // After UoW completes, verify ConcurrencyStamp was updated again by the second SaveChanges + await WithUnitOfWorkAsync(async () => + { + var entity = await AppEntityWithNavigationsRepository.GetAsync(entityId); + entity.ConcurrencyStamp.ShouldNotBe(concurrencyStampAfterFirstSave); + entity.ManyToMany.Count.ShouldBe(1); + entity.ManyToMany[0].ChildName.ShouldBe("ManyToManyChild2"); + }); } } diff --git a/latest-versions.json b/latest-versions.json index 007d19f046..ed22914b59 100644 --- a/latest-versions.json +++ b/latest-versions.json @@ -1,4 +1,13 @@ [ + { + "version": "10.0.3", + "releaseDate": "", + "type": "stable", + "message": "", + "leptonx": { + "version": "5.0.3" + } + }, { "version": "10.0.2", "releaseDate": "", diff --git a/lowcode/schema/definitions/command-interceptor-descriptor.schema.json b/lowcode/schema/definitions/command-interceptor-descriptor.schema.json new file mode 100644 index 0000000000..ad0d0b02bd --- /dev/null +++ b/lowcode/schema/definitions/command-interceptor-descriptor.schema.json @@ -0,0 +1,23 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "command-interceptor-descriptor.schema.json", + "title": "CommandInterceptorDescriptor", + "description": "Describes a command interceptor", + "type": "object", + "properties": { + "commandName": { + "type": "string", + "description": "Name of the command to intercept", + "enum": ["Create", "Update", "Delete"] + }, + "type": { + "$ref": "interceptor-type.schema.json" + }, + "javascript": { + "type": "string", + "description": "JavaScript code to execute" + } + }, + "required": ["commandName", "type", "javascript"], + "additionalProperties": false +} \ No newline at end of file diff --git a/lowcode/schema/definitions/endpoint-descriptor.schema.json b/lowcode/schema/definitions/endpoint-descriptor.schema.json new file mode 100644 index 0000000000..7837e47f69 --- /dev/null +++ b/lowcode/schema/definitions/endpoint-descriptor.schema.json @@ -0,0 +1,45 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "urn:abp:lowcode:endpoint-descriptor", + "title": "Custom Endpoint Descriptor", + "description": "Defines a custom HTTP endpoint that executes JavaScript code", + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "Unique identifier for the endpoint" + }, + "route": { + "type": "string", + "description": "URL route pattern (e.g., '/api/custom/products/{id}')" + }, + "method": { + "type": "string", + "description": "HTTP method", + "enum": ["GET", "POST", "PUT", "DELETE", "PATCH"], + "default": "GET" + }, + "javascript": { + "type": "string", + "description": "JavaScript code to execute. Has access to context object with request, db, currentUser, emailSender." + }, + "requireAuthentication": { + "type": "boolean", + "description": "Whether authentication is required", + "default": true + }, + "requiredPermissions": { + "type": "array", + "description": "Permission names required to access the endpoint", + "items": { + "type": "string" + } + }, + "description": { + "type": "string", + "description": "Optional description for documentation" + } + }, + "required": ["name", "route", "javascript"], + "additionalProperties": false +} diff --git a/lowcode/schema/definitions/entity-descriptor.schema.json b/lowcode/schema/definitions/entity-descriptor.schema.json new file mode 100644 index 0000000000..2023a043bc --- /dev/null +++ b/lowcode/schema/definitions/entity-descriptor.schema.json @@ -0,0 +1,42 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "entity-descriptor.schema.json", + "title": "EntityDescriptor", + "description": "Describes an entity configuration", + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "Full name of the entity (e.g., 'Namespace.EntityName')", + "minLength": 1 + }, + "displayProperty": { + "type": "string", + "description": "The property to be used as the display property for the entity" + }, + "parent": { + "type": "string", + "description": "Full name of the parent entity (e.g., 'Namespace.EntityName')", + "minLength": 1 + }, + "ui": { + "$ref": "entity-ui-descriptor.schema.json" + }, + "properties": { + "type": "array", + "description": "List of property descriptors", + "items": { + "$ref": "entity-property-descriptor.schema.json" + } + }, + "interceptors": { + "type": "array", + "description": "List of command interceptors", + "items": { + "$ref": "command-interceptor-descriptor.schema.json" + } + } + }, + "required": ["name"], + "additionalProperties": false +} \ No newline at end of file diff --git a/lowcode/schema/definitions/entity-property-descriptor.schema.json b/lowcode/schema/definitions/entity-property-descriptor.schema.json new file mode 100644 index 0000000000..ceeeb9eb60 --- /dev/null +++ b/lowcode/schema/definitions/entity-property-descriptor.schema.json @@ -0,0 +1,58 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "entity-property-descriptor.schema.json", + "title": "EntityPropertyDescriptor", + "description": "Describes a property configuration", + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "Name of the property", + "minLength": 1 + }, + "type": { + "$ref": "entity-property-type.schema.json" + }, + "enumType": { + "type": "string", + "description": "Name of a JSON-defined enum (or full type name for code enums)" + }, + "allowSetByClients": { + "type": "boolean", + "description": "Indicates whether clients are allowed to set this property" + }, + "serverOnly": { + "type": "boolean", + "description": "When true, this property is completely hidden from clients (API responses and UI definitions). Use for sensitive data like passwords." + }, + "isMappedToDbField": { + "type": "boolean", + "description": "Indicates whether the property is mapped to a database field" + }, + "isUnique": { + "type": "boolean", + "description": "Indicates whether the property value must be unique across all entities" + }, + "isRequired": { + "type": "boolean", + "description": "When true, the property is required (not nullable). Affects DB column (NOT NULL), UI validation, and backend validation." + }, + "ui": { + "$ref": "entity-property-ui-descriptor.schema.json" + }, + "foreignKey": { + "$ref": "foreign-key-descriptor.schema.json" + }, + "validators": { + "type": "array", + "description": "Array of validators to apply to this property", + "items": { + "$ref": "validator-descriptor.schema.json" + } + } + }, + "required": [ + "name" + ], + "additionalProperties": false +} \ No newline at end of file diff --git a/lowcode/schema/definitions/entity-property-type.schema.json b/lowcode/schema/definitions/entity-property-type.schema.json new file mode 100644 index 0000000000..5eb7defa6a --- /dev/null +++ b/lowcode/schema/definitions/entity-property-type.schema.json @@ -0,0 +1,25 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "entity-property-type.schema.json", + "title": "EntityPropertyType", + "description": "Data type of the property", + "type": "string", + "enum": [ + "string", + "String", + "int", + "Int", + "long", + "Long", + "decimal", + "Decimal", + "dateTime", + "DateTime", + "boolean", + "Boolean", + "guid", + "Guid", + "enum", + "Enum" + ] +} \ No newline at end of file diff --git a/lowcode/schema/definitions/entity-property-ui-descriptor.schema.json b/lowcode/schema/definitions/entity-property-ui-descriptor.schema.json new file mode 100644 index 0000000000..1a0ded7b76 --- /dev/null +++ b/lowcode/schema/definitions/entity-property-ui-descriptor.schema.json @@ -0,0 +1,32 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "entity-property-ui-descriptor.schema.json", + "title": "EntityPropertyUIDescriptor", + "description": "UI configuration for a property", + "type": "object", + "properties": { + "displayName": { + "type": "string", + "description": "Display name for the property in UI. Falls back to property name if not set." + }, + "isAvailableOnDataTable": { + "type": "boolean", + "description": "Whether the property is shown in the data table listing" + }, + "isAvailableOnDataTableFiltering": { + "type": "boolean", + "description": "Whether the property is available for filtering in the data table" + }, + "creationFormAvailability": { + "$ref": "entity-property-ui-form-availability.schema.json" + }, + "editingFormAvailability": { + "$ref": "entity-property-ui-form-availability.schema.json" + }, + "quickLookOrder": { + "type": "integer", + "description": "Order of the property in quick look views. Higher numbers appear first. Set to -1 to exclude from quick look. If no property has a value, first 5 properties by name are shown." + } + }, + "additionalProperties": false +} \ No newline at end of file diff --git a/lowcode/schema/definitions/entity-property-ui-form-availability.schema.json b/lowcode/schema/definitions/entity-property-ui-form-availability.schema.json new file mode 100644 index 0000000000..dff4a5665c --- /dev/null +++ b/lowcode/schema/definitions/entity-property-ui-form-availability.schema.json @@ -0,0 +1,15 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "entity-property-ui-form-availability.schema.json", + "title": "EntityPropertyUIFormAvailability", + "description": "Availability of the property on forms", + "type": "string", + "enum": [ + "Available", + "available", + "Hidden", + "hidden", + "NotAvailable", + "notAvailable" + ] +} \ No newline at end of file diff --git a/lowcode/schema/definitions/entity-ui-descriptor.schema.json b/lowcode/schema/definitions/entity-ui-descriptor.schema.json new file mode 100644 index 0000000000..3525d6c38e --- /dev/null +++ b/lowcode/schema/definitions/entity-ui-descriptor.schema.json @@ -0,0 +1,14 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "entity-ui-descriptor.schema.json", + "title": "EntityUIDescriptor", + "description": "UI configuration for the entity", + "type": "object", + "properties": { + "pageTitle": { + "type": "string", + "description": "Title to display on the entity's page" + } + }, + "additionalProperties": false +} \ No newline at end of file diff --git a/lowcode/schema/definitions/enum-descriptor.schema.json b/lowcode/schema/definitions/enum-descriptor.schema.json new file mode 100644 index 0000000000..347f7e66ff --- /dev/null +++ b/lowcode/schema/definitions/enum-descriptor.schema.json @@ -0,0 +1,41 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "enum-descriptor.schema.json", + "title": "EnumDescriptor", + "description": "Describes an enum definition for use in entity properties", + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "Unique name for the enum", + "minLength": 1 + }, + "values": { + "type": "array", + "description": "List of enum values", + "items": { + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "Display name of the enum value" + }, + "value": { + "type": "integer", + "description": "Integer value (auto-assigned if omitted)" + } + }, + "required": [ + "name" + ], + "additionalProperties": false + }, + "minItems": 1 + } + }, + "required": [ + "name", + "values" + ], + "additionalProperties": false +} \ No newline at end of file diff --git a/lowcode/schema/definitions/foreign-key-descriptor.schema.json b/lowcode/schema/definitions/foreign-key-descriptor.schema.json new file mode 100644 index 0000000000..27d0e81f03 --- /dev/null +++ b/lowcode/schema/definitions/foreign-key-descriptor.schema.json @@ -0,0 +1,27 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "foreign-key-descriptor.schema.json", + "title": "ForeignKeyDescriptor", + "description": "Describes a foreign key relationship", + "type": "object", + "properties": { + "entityName": { + "type": "string", + "description": "Full name of the related entity", + "minLength": 1 + }, + "displayPropertyName": { + "type": "string", + "description": "Property name to display from the related entity", + "minLength": 1 + }, + "access": { + "type": "string", + "description": "Access level for managing this relation from the referenced entity side. When set to 'view' or 'edit', the referenced entity can see/manage items that reference it.", + "enum": ["none", "view", "edit"], + "default": "none" + } + }, + "required": ["entityName"], + "additionalProperties": false +} \ No newline at end of file diff --git a/lowcode/schema/definitions/interceptor-type.schema.json b/lowcode/schema/definitions/interceptor-type.schema.json new file mode 100644 index 0000000000..435c26b434 --- /dev/null +++ b/lowcode/schema/definitions/interceptor-type.schema.json @@ -0,0 +1,15 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "interceptor-type.schema.json", + "title": "InterceptorType", + "description": "When the interceptor runs", + "type": "string", + "enum": [ + "Pre", + "pre", + "Post", + "post", + "Replace", + "replace" + ] +} \ No newline at end of file diff --git a/lowcode/schema/definitions/validator-descriptor.schema.json b/lowcode/schema/definitions/validator-descriptor.schema.json new file mode 100644 index 0000000000..7eeac0eba9 --- /dev/null +++ b/lowcode/schema/definitions/validator-descriptor.schema.json @@ -0,0 +1,69 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "validator-descriptor.schema.json", + "title": "ValidatorDescriptor", + "description": "A single validator in the validators array", + "type": "object", + "required": ["type"], + "properties": { + "type": { + "type": "string", + "description": "Type of validator", + "enum": [ + "required", + "minLength", + "maxLength", + "stringLength", + "min", + "minimum", + "max", + "maximum", + "range", + "pattern", + "regularExpression", + "email", + "emailAddress", + "phone", + "url", + "creditCard" + ] + }, + "message": { + "type": "string", + "description": "Custom error message for this validator" + }, + "length": { + "type": "integer", + "description": "Length value for minLength, maxLength validators", + "minimum": 0 + }, + "minimumLength": { + "type": "integer", + "description": "Minimum length for stringLength validator", + "minimum": 0 + }, + "maximumLength": { + "type": "integer", + "description": "Maximum length for stringLength validator", + "minimum": 0 + }, + "value": { + "type": "number", + "description": "Value for min/minimum, max/maximum validators" + }, + "minimum": { + "type": "number", + "description": "Minimum value for range validator" + }, + "maximum": { + "type": "number", + "description": "Maximum value for range validator" + }, + "pattern": { + "type": "string", + "description": "Regular expression pattern for pattern/regularExpression validators" + } + }, + "additionalProperties": true +} + diff --git a/lowcode/schema/model.schema.json b/lowcode/schema/model.schema.json new file mode 100644 index 0000000000..c958f126fe --- /dev/null +++ b/lowcode/schema/model.schema.json @@ -0,0 +1,35 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "model.schema.json", + "title": "ABP Low Code Model", + "description": "Schema for ABP Low Code model.json configuration file", + "type": "object", + "properties": { + "$schema": { + "type": "string", + "description": "Reference to the JSON schema" + }, + "enums": { + "type": "array", + "description": "List of enum definitions", + "items": { + "$ref": "definitions/enum-descriptor.schema.json" + } + }, + "entities": { + "type": "array", + "description": "List of entity descriptors", + "items": { + "$ref": "definitions/entity-descriptor.schema.json" + } + }, + "endpoints": { + "type": "array", + "description": "List of custom HTTP endpoints that execute JavaScript code", + "items": { + "$ref": "definitions/endpoint-descriptor.schema.json" + } + } + }, + "additionalProperties": false +} \ No newline at end of file diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/EntityChangeConsts.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/EntityChangeConsts.cs index 9a01c44454..adb7d2334f 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/EntityChangeConsts.cs +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/EntityChangeConsts.cs @@ -3,9 +3,9 @@ public class EntityChangeConsts { /// - /// Default value: 128 + /// Default value: 512 /// - public static int MaxEntityTypeFullNameLength { get; set; } = 128; + public static int MaxEntityTypeFullNameLength { get; set; } = 512; /// /// Default value: 128 diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/EntityPropertyChangeConsts.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/EntityPropertyChangeConsts.cs index 86f1b0588a..60fe5ce7df 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/EntityPropertyChangeConsts.cs +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/EntityPropertyChangeConsts.cs @@ -18,7 +18,7 @@ public class EntityPropertyChangeConsts public static int MaxPropertyNameLength { get; set; } = 128; /// - /// Default value: 64 + /// Default value: 512 /// - public static int MaxPropertyTypeFullNameLength { get; set; } = 64; + public static int MaxPropertyTypeFullNameLength { get; set; } = 512; } diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/de-DE.json b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/de-DE.json index 334ada8c9a..38a291b077 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/de-DE.json +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/de-DE.json @@ -24,7 +24,7 @@ "BrowserInfo": "Browser-Informationen", "Url": "URL", "UserName": "Benutzername", - "TenantImpersonator": "Mieter-Imitator", + "TenantImpersonator": "Mandanten-Imitator", "UserImpersonator": "Benutzer-Imitator", "UrlFilter": "URL-Filter", "Exceptions": "Ausnahmen", diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/de.json b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/de.json index 64f7ef591d..0f236d0393 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/de.json +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/de.json @@ -24,7 +24,7 @@ "BrowserInfo": "Browserinformationen", "Url": "URL", "UserName": "Nutzername", - "TenantImpersonator": "Mieter-Imitator", + "TenantImpersonator": "Mandanten-Imitator", "UserImpersonator": "Benutzer-Imitator", "UrlFilter": "URL-Filter", "Exceptions": "Ausnahmen", diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json index e372a4405b..d787d89173 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json @@ -3,8 +3,8 @@ "name": "asp.net", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~10.1.0-rc.2", - "@abp/prismjs": "~10.1.0-rc.2", - "@abp/highlight.js": "~10.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.shared": "~10.1.0", + "@abp/prismjs": "~10.1.0", + "@abp/highlight.js": "~10.1.0" } } diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock index 07e9b7f188..ba0eed3a53 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock @@ -2,203 +2,203 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.shared@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.1.0-rc.2.tgz#e5056e4e159f5815e3cffecab5c46f3d7d4f79d7" - integrity sha512-bo56XzQZPYL/3ckWTTTSSUsSFSFJobvfE29cz13NIrZ/tBtWyQCAJn92wYHuY+6IezYUWb4ga3PkFeHRzR142A== - dependencies: - "@abp/aspnetcore.mvc.ui" "~10.1.0-rc.2" - "@abp/bootstrap" "~10.1.0-rc.2" - "@abp/bootstrap-datepicker" "~10.1.0-rc.2" - "@abp/bootstrap-daterangepicker" "~10.1.0-rc.2" - "@abp/datatables.net-bs5" "~10.1.0-rc.2" - "@abp/font-awesome" "~10.1.0-rc.2" - "@abp/jquery-form" "~10.1.0-rc.2" - "@abp/jquery-validation-unobtrusive" "~10.1.0-rc.2" - "@abp/lodash" "~10.1.0-rc.2" - "@abp/luxon" "~10.1.0-rc.2" - "@abp/malihu-custom-scrollbar-plugin" "~10.1.0-rc.2" - "@abp/moment" "~10.1.0-rc.2" - "@abp/select2" "~10.1.0-rc.2" - "@abp/sweetalert2" "~10.1.0-rc.2" - "@abp/timeago" "~10.1.0-rc.2" - -"@abp/aspnetcore.mvc.ui@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.1.0-rc.2.tgz#e25d3575d40bfcb3f809bd2d355671181ee5ff40" - integrity sha512-MOF86bVbi7N/nIla+361nsBrN4tiSka8xzpWcgqlLcCAl9ILG4rugbtafBAjN81taPma2peZM7egaOR4SDkTMw== +"@abp/aspnetcore.mvc.ui.theme.shared@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.1.0.tgz#b89c5d38fdeceda9e421f9357842838be36dce49" + integrity sha512-9QyZ7lYr17thTKxq9WN/KVCxNyYurY5Ph9y3vFBkA3u+uOZcaxdw0T417vy0hJvAB7RGlkpLRTmZL7q5P9FzJA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~10.1.0" + "@abp/bootstrap" "~10.1.0" + "@abp/bootstrap-datepicker" "~10.1.0" + "@abp/bootstrap-daterangepicker" "~10.1.0" + "@abp/datatables.net-bs5" "~10.1.0" + "@abp/font-awesome" "~10.1.0" + "@abp/jquery-form" "~10.1.0" + "@abp/jquery-validation-unobtrusive" "~10.1.0" + "@abp/lodash" "~10.1.0" + "@abp/luxon" "~10.1.0" + "@abp/malihu-custom-scrollbar-plugin" "~10.1.0" + "@abp/moment" "~10.1.0" + "@abp/select2" "~10.1.0" + "@abp/sweetalert2" "~10.1.0" + "@abp/timeago" "~10.1.0" + +"@abp/aspnetcore.mvc.ui@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.1.0.tgz#79d76232aacb9c8e1762d903f75007d0418bf5a8" + integrity sha512-brVfaSUicZuSuwtizrEcMvtRjFsoAHr9i56HjJZb7bmElr+q5STiul3stRumly4IfoLkYqdy85hMk+B3G0bJDg== dependencies: ansi-colors "^4.1.3" -"@abp/bootstrap-datepicker@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.1.0-rc.2.tgz#be80c6104ba53e18935fbf62ca2c1890f4b2fde4" - integrity sha512-BNcDYUSbZaLah4SfXm0efoqFTsOViVm6370k9L7vix/OGpIWwklJsr8y78lvdM5ANgNCfl0LPSq+seLJFc/OLA== +"@abp/bootstrap-datepicker@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.1.0.tgz#68270ed8cf8e0c23a77331ef2ba6ef2d1da3cefc" + integrity sha512-ahKKHlluo4U1Z238mBNzpL0YaErTPENLQDVLNZB1BnZcUTqz1j7WJHGZoy4j3CXZKt7mnFCRe1+vJMCcwP+DYA== dependencies: bootstrap-datepicker "^1.10.1" -"@abp/bootstrap-daterangepicker@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.1.0-rc.2.tgz#f189f7d070ebd97d9cfdcb99571cab2d6a198ab5" - integrity sha512-bV8J0MuiAFVLkr48JsB6aZU6aPoqw+Gyhq1szQ74bEwNQlRBPuF92WVA5FACaUBj8dMUzR9HDDAYQuxUzpKYKA== +"@abp/bootstrap-daterangepicker@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.1.0.tgz#69f7775eafe7c038c2684d3e990384c8f2966cff" + integrity sha512-mFMaH7GqPn7W5zzIMOOTl4f0at9Vx8da4ewvPU/IvngrTeezMRPC1tofHmiWDhHfZpzF5J9DDMCGul9Q4nOl5A== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.1.0-rc.2.tgz#2300800a29ea09b91f5ed2e6177e5921fe7d2a0f" - integrity sha512-K+tDI9vz/Y9B/yu0i3AVpm4v3Odi44Q/yH5hAprL7f4pGxEOiqAFB/qzHAxG+7Oa7wjv5tPLv+Cz4DavBQjd8Q== +"@abp/bootstrap@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.1.0.tgz#816436ab547fc46d4c00b1facbdd80e3f4f78af1" + integrity sha512-ioqQDOvjXIUWncmLJuTcLPTnlJ3xGxyKXC9veSTJWFd+5pZswK7/QIlAuTvIIujs/7Z13GLunUIMMjny7WFBMw== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" bootstrap "^5.3.8" -"@abp/clipboard@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-10.1.0-rc.2.tgz#e99dbf190e3684e99c8e909bf38201c70e267502" - integrity sha512-kRS9pWc1jRgr4D4/EV9zdAy3rhhGBrcqk2as5+6Ih49npsEJY/cF5mYH7mj/ZYy8SHqtae/CR7bZsR+uCDKYrQ== +"@abp/clipboard@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-10.1.0.tgz#a59b14370b99fd7df447250b293fd7ac3f8c1a51" + integrity sha512-OulNwy9vhASO8TJ+m0ql6/iXNflE59oGUNAW+qzcaxaazre1mVPahPMBoLSVuOAGtAjLZAN4SWCOC5r3tLt9pA== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" clipboard "^2.0.11" -"@abp/core@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.1.0-rc.2.tgz#403687aff5a30788f7b7ca660abdfd85d89438aa" - integrity sha512-euuG2Hna/DT6/R1dGOjgp3vcehYtF+CcOkRj31oquYKaM5YWk4OaZ314DSpnjgs/xo8DuVc4eKFQwIxD9RK41w== +"@abp/core@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.1.0.tgz#7cb21012deee5510a0774d982f85627d47b368f4" + integrity sha512-/N0K2NVdk5/OM+Q5JDnpC+0CD0mS4wpDhLO1SIQbMXSTFbplhfPw2SFm7+MvPA9pVx2L8TYAzXmS7CtAJxKvCg== dependencies: - "@abp/utils" "~10.1.0-rc.2" + "@abp/utils" "~10.1.0" -"@abp/datatables.net-bs5@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.1.0-rc.2.tgz#a60650d1802b40751d30f8f6c56beb23fd66481b" - integrity sha512-IWwexNqbMpET54Fvm9LoPTJYf+4CoBbjFOvz3sL6CgO2feV5R5fKigjVU8zXKNh2W+RG8L6zEarfVxrr114TsA== +"@abp/datatables.net-bs5@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.1.0.tgz#ea2a60c22bdcc80882662b9f55f198793f6ea556" + integrity sha512-dPe3bVW3Hfnm/X9Bw5k7TuEIsYYwFk1faC8kIxf2Spk+4Z9TdYFS2zGaHBYStE9iRtKmneNYMykG2O88mX3quA== dependencies: - "@abp/datatables.net" "~10.1.0-rc.2" + "@abp/datatables.net" "~10.1.0" datatables.net-bs5 "^2.3.4" -"@abp/datatables.net@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.1.0-rc.2.tgz#9147f68bc6dbc4eb40a9ddf65c7859e788cdcac2" - integrity sha512-a9DJpwg14S4nVOiC4ipw0CQwEYWB602e2gCJiH7W1mxopbQb135RxwhtdTnW//eIONcxC9IrEuvcBEAUVt2B7Q== +"@abp/datatables.net@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.1.0.tgz#7fe641883e6d1417c86a030481777a75c9a5a555" + integrity sha512-p9S/ZaJ4OXpihTOWIxsSQ0s3G4S+ScQLD+Q+w0NrWbUa7HTKg9tdqSh6VDhyW9KZ/iiLUO5jNzsAFXyUjjDQuw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" datatables.net "^2.3.4" -"@abp/font-awesome@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.1.0-rc.2.tgz#364466cfe67e41e0c4d16b57d3923d10f66369f1" - integrity sha512-F1Jy8xoFV2aA+VN+NH1gtrG96/j9w7Picc+KLoCoIyNnJr/xJur11XkJyu5ln8KF4V7p/DY7QaQodWV/btOs8g== +"@abp/font-awesome@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.1.0.tgz#79c5b7eb9a85467b0078b9f9bf201493fc3de358" + integrity sha512-dm4VRtZnvm5p8mYQys9KWLkQ+JdwPahQSan2DV1s5Rq4P96hk8p8VshZu7pI3iE0MS+rSZnXYvetZrqCdt1mOQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" "@fortawesome/fontawesome-free" "^7.0.1" -"@abp/highlight.js@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-10.1.0-rc.2.tgz#6ad0e1ef9e49f0f90eba9d899fd72b6c30a4f9f0" - integrity sha512-jAX4p+i3secAaI3waXoMr7yoH6G1nWvcjR5UVin168H7I4UySxbF799T89v5tK8gtfWgaTjEydFZRypSQU/dHg== +"@abp/highlight.js@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-10.1.0.tgz#b0a798ccdd71b437710978d1ced794c178de6b7c" + integrity sha512-kyDjTkLwkDEBY0jqpPf5KmZWmzJQPsPto4TidX9GG7U8e+biFK4MF/gtPUjjFs9POTQ585AKfk0U/xDjhr42qg== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" "@highlightjs/cdn-assets" "~11.11.1" -"@abp/jquery-form@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.1.0-rc.2.tgz#3857717d07569c22d4bbbe459238abeb816d606a" - integrity sha512-2D5WHVnfK9bhRces1tgPwOEoc7KCYKYiKHBOcqct+LTA7zoRjJv/PM8/JhFVl+grVIw1aSwO4tU3YfZ22Vxipg== +"@abp/jquery-form@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.1.0.tgz#7c19605eb103519fea332d0f153cac185b7f2ebb" + integrity sha512-ddlapZqFVwpXU3uDi/RnQ6uSpseMxPAKE+/LgLF+SVyPzazNFognxPT3ztzqTk84P/gFleNgNjAfUlKrfyIfGw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.1.0-rc.2.tgz#efd7b69a078a20c0bf405408dbdf52a7bf770b3b" - integrity sha512-tZ0MWgzBqp+SNfMxM0z2cGB21NiTHuVJyyQaXKE/ptuD5pc0uRkcqw/J2kWfiqsoVgChz27IB6h8/jqDafS4qg== +"@abp/jquery-validation-unobtrusive@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.1.0.tgz#13aa462c4347d3459541a9a9ea19a60458805328" + integrity sha512-94smwn/W3d+gkX2UKH+/OiB7poKDP1ZK0DqWiiH4BGGmpRk9j3B+eJxPbL86dwNG4XT8upuX3ZOrUb6Fy2SA3A== dependencies: - "@abp/jquery-validation" "~10.1.0-rc.2" + "@abp/jquery-validation" "~10.1.0" jquery-validation-unobtrusive "^4.0.0" -"@abp/jquery-validation@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.1.0-rc.2.tgz#d39537a7356c51f9db2e66f6740cf6df86bd0442" - integrity sha512-LOkS0NKk4pLtLjPU0CCbwROyUg6EtJN8Z/it7QuKK1CIRfYYcAStgNnNm5geZP7CqECIkoiFfgWjI+L5Z9/Tfg== +"@abp/jquery-validation@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.1.0.tgz#5389785f5ff359ecd6291889420d6c2f84e633aa" + integrity sha512-/X5smp0xpNqCM+BuLI9eEyMPQ0uF42hmEfBvCIfWWBhfp7uFfq7sS706QcGfXYqFdpprRYoUJGKDfSaHxPaJUA== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" jquery-validation "^1.21.0" -"@abp/jquery@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.1.0-rc.2.tgz#101a55f70d510978c8c05f5857d0e9d4965263f7" - integrity sha512-bQV1uFWGtwRYjNOsqJ8FM2004idX2Jj7YVL19YF1/PjyPUSMX+s8/IvJizBjyY5hPAiWBBhmV9g+IFWzxlDQoQ== +"@abp/jquery@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.1.0.tgz#d8812a7d410ad959a1ed27696beb9b7885142684" + integrity sha512-cVF2hOP6GGp0N3VMBOFjEHuHFgXbDH8x0d7Agw4DN2ydFU8wYuj3m9u0HCc0aoBG6Zls90tMpTfM0RqDNFgCKA== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" jquery "~3.7.1" -"@abp/lodash@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.1.0-rc.2.tgz#d08c03f8d3d0fbaa3e71e603cbe5fb7f176933ef" - integrity sha512-KCnD1p2y52ZI+2ifpiFIUAiDPsKehnOD8HV5qKeObO6UCP97okif8IP+sQDmNQb8O33y/NKTyx/HcpwBbe/NYQ== +"@abp/lodash@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.1.0.tgz#fdebe764d1142abfd3ecdeef56aa33746e31815b" + integrity sha512-r4WwpqLFFQi721edd8XF5wueAdqEvx75dmRlEuhZoIBA6RQ0yYjTRMNWjTOlIEzFDGj7XrisV5CSUQ9BhhuS+Q== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" lodash "^4.17.21" -"@abp/luxon@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.1.0-rc.2.tgz#ef8d2b323bac054fc9610e241e1b1763d229e065" - integrity sha512-qYFl6XO3g9mZiu0dtIczI7LRuYWwc+RkpbDzSmruXcRks3KA+ZZco2vhHNnlwtXcINl/TXtbW7Wc0MX+8IB1Kw== +"@abp/luxon@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.1.0.tgz#c80cdb1a85e9cc824946dc0009df0daba384a4ca" + integrity sha512-slwiGSrevvWZrBhuy9sw7UP6akk2Ln9eAY3nxxo8xzE7C7uezcNk12dbKN4psdSAVpbDwuqC3GGrkmcFL+6sBQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" luxon "^3.7.2" -"@abp/malihu-custom-scrollbar-plugin@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.1.0-rc.2.tgz#dfaf666442c7c122f7da72c83b9adf194d5b6ec8" - integrity sha512-PudMHmNQgZ6JZeaVt1ZoXLqO0UZXJzUYiBah2LDkC4EMLjnMJFINHBoEVVa4ooXH0yjFv+zsbN0vWZYJ8TBJIA== +"@abp/malihu-custom-scrollbar-plugin@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.1.0.tgz#d257e83b7cc1af89a708e365eef7af0136ccebcf" + integrity sha512-+h8hoYUkjcYBdm/M3b8c3CeE5WNU8K6kQ5MwQXNaaGLCvwEmZHy0A6+U8yxtKv2eRRhAkAqOkQyWYRWA5w1XzQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.1.0-rc.2.tgz#610a1592d13984aea51abbd13df8c5995a089149" - integrity sha512-ep8PnAXARw0t/wtGOVp/oiNhF3B0Bh6y2vRzKrcSoyXAQREGGm4fJdZVYZLGTfI4lFLTjebEgf4O7T9feUwJAw== +"@abp/moment@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.1.0.tgz#5755e4e10a7302e2832b1a1ce571f20b27600303" + integrity sha512-faHV7vmPEjFUJTRNTTlmnpx0VZuyvQt4O98WBLAjPdcqpLfWazdS9Ro405St5liIkgvmAXWsrwVmZb0VKTLcNA== dependencies: moment "^2.30.1" -"@abp/prismjs@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-10.1.0-rc.2.tgz#8565bab503a16fc349f4b0fa2609ad412ff838be" - integrity sha512-SmZWMyJ3cJW+qj4CWJ7y2kD6PMx2zfZMA5X5jPunsytG4Eht4AVyIR38Y4QSpO62zZgkHyZlSTFOozBfhrlv9A== +"@abp/prismjs@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-10.1.0.tgz#632e06b47a9ac11d0131d06a270b97292266df47" + integrity sha512-iqXB3bgrlXDyfuFr23R2JtfN0Ij3ai81KkWM3oc3QikKaCwAHtiU0ZvshRlL9y3YfwjlNpYYFLE4en2xx1xThQ== dependencies: - "@abp/clipboard" "~10.1.0-rc.2" - "@abp/core" "~10.1.0-rc.2" + "@abp/clipboard" "~10.1.0" + "@abp/core" "~10.1.0" prismjs "^1.30.0" -"@abp/select2@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.1.0-rc.2.tgz#40c5418d007fc36817eecbe6388d767e4e7ca887" - integrity sha512-Pq0wlpL01sWRLUg5um3JtBXIqi3mmbwPwvgxP8hFbQngAt9JXAK8geNRiTMrIZgtW/ycXtM1v6I4zuWOLOeAGg== +"@abp/select2@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.1.0.tgz#8b15954e462e65329b8eb481226170df6d55d36a" + integrity sha512-7+1GirZe4i/2/LR4jZgWhiN6lFHhClLtUmrdCjh7FeeuBvy5GGA417DybDihna/GzlcOVI4GHnn2fjEwcFqJiw== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" select2 "^4.0.13" -"@abp/sweetalert2@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.1.0-rc.2.tgz#d35858c69e10c6726b02cdfcea88dfc32385963f" - integrity sha512-s9VPRToohN45uzHcKCF5Mcj8FVjsXcXUb0U3tuaT/Y+u4adHB3fBxYiXJFM0sVsCJ81dFktxwka40Wm8Taz/zA== +"@abp/sweetalert2@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.1.0.tgz#6997cb7909671f9deddaea53f17ed054aab27cd3" + integrity sha512-vlkH+DkuQBvOqnDPqTtyZ5mHb+GfIR/QJBXI7yrS62ML+ZNqkg0vXftCrm4aAR2kPmvgYsbUOJcKJAmgydcOEQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" sweetalert2 "^11.23.0" -"@abp/timeago@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.1.0-rc.2.tgz#98d630cc3843eee64dbcc34fb8ca5afbab034718" - integrity sha512-vJmk+otyXXJE2s2J8iYpLVaFuNAYnIUSOitmi7umYnL+k/UE2KQhBXU7FR0/OBY9mAZYd+shaiGIU1LMSaJ+Xg== +"@abp/timeago@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.1.0.tgz#45c1e8b1451e31910e330053981a871787fe02f1" + integrity sha512-3RVMlBbOepa4WBTLthRmf2VddkNwsjE+FNnaSUaMQ2ZQaXnghnZc4xZ3f3oKraGcWMgqpz1IfrWWV1POKRsEXw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" timeago "^1.6.7" -"@abp/utils@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.1.0-rc.2.tgz#86a980c6536b3b5ce185d406723b28be421864ac" - integrity sha512-Oz863VNA8fraQ81vTvqM0IqwiaseLwfFU5QNn6iOGOfn5wQrEkPwtZ0jMI+DGNtJgPzoKiq+iKc3K+SiuVgldg== +"@abp/utils@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.1.0.tgz#ef7f6bf16abb34b77fa57c156b264154827bc0af" + integrity sha512-UDgbvDMbcQklNu+SlQPhkIcIfZoWsQjCCzihanLBiHc474BCOlcTsO6K/EatV9LwqG3zY0mYd0ExAWjH44G0rQ== dependencies: just-compare "^2.3.0" diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json index a3ecabd4c4..ed8ec8cb2a 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json @@ -3,8 +3,8 @@ "name": "asp.net", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0-rc.2", - "@abp/prismjs": "~10.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0", + "@abp/prismjs": "~10.1.0" }, "devDependencies": {} } diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock index f29a796639..cf3f814ae9 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock @@ -2,202 +2,202 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.1.0-rc.2.tgz#599f5c47a417d1230fc17c0446a0229f920f7246" - integrity sha512-8F4nEK+VtgRRf8n+66HMbtCEaOMCW/OdbSEWRl9ahMNoj860oPIJ8P8Qn/2+LjtkPMdDAfCdEzyDzCd3igaFaA== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~10.1.0-rc.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.1.0-rc.2.tgz#e5056e4e159f5815e3cffecab5c46f3d7d4f79d7" - integrity sha512-bo56XzQZPYL/3ckWTTTSSUsSFSFJobvfE29cz13NIrZ/tBtWyQCAJn92wYHuY+6IezYUWb4ga3PkFeHRzR142A== - dependencies: - "@abp/aspnetcore.mvc.ui" "~10.1.0-rc.2" - "@abp/bootstrap" "~10.1.0-rc.2" - "@abp/bootstrap-datepicker" "~10.1.0-rc.2" - "@abp/bootstrap-daterangepicker" "~10.1.0-rc.2" - "@abp/datatables.net-bs5" "~10.1.0-rc.2" - "@abp/font-awesome" "~10.1.0-rc.2" - "@abp/jquery-form" "~10.1.0-rc.2" - "@abp/jquery-validation-unobtrusive" "~10.1.0-rc.2" - "@abp/lodash" "~10.1.0-rc.2" - "@abp/luxon" "~10.1.0-rc.2" - "@abp/malihu-custom-scrollbar-plugin" "~10.1.0-rc.2" - "@abp/moment" "~10.1.0-rc.2" - "@abp/select2" "~10.1.0-rc.2" - "@abp/sweetalert2" "~10.1.0-rc.2" - "@abp/timeago" "~10.1.0-rc.2" - -"@abp/aspnetcore.mvc.ui@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.1.0-rc.2.tgz#e25d3575d40bfcb3f809bd2d355671181ee5ff40" - integrity sha512-MOF86bVbi7N/nIla+361nsBrN4tiSka8xzpWcgqlLcCAl9ILG4rugbtafBAjN81taPma2peZM7egaOR4SDkTMw== +"@abp/aspnetcore.mvc.ui.theme.basic@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.1.0.tgz#94f68982ce8b67b6ac827f824aed3faad50e56e9" + integrity sha512-wqbEANW8CRZ+/7qGNprC828yNN17TsYtFxywL0B+EA2UfUtcTpzR/3ompZd/XcDm3N2NmS1n5Ao3WEn2NJlHgA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~10.1.0" + +"@abp/aspnetcore.mvc.ui.theme.shared@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.1.0.tgz#b89c5d38fdeceda9e421f9357842838be36dce49" + integrity sha512-9QyZ7lYr17thTKxq9WN/KVCxNyYurY5Ph9y3vFBkA3u+uOZcaxdw0T417vy0hJvAB7RGlkpLRTmZL7q5P9FzJA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~10.1.0" + "@abp/bootstrap" "~10.1.0" + "@abp/bootstrap-datepicker" "~10.1.0" + "@abp/bootstrap-daterangepicker" "~10.1.0" + "@abp/datatables.net-bs5" "~10.1.0" + "@abp/font-awesome" "~10.1.0" + "@abp/jquery-form" "~10.1.0" + "@abp/jquery-validation-unobtrusive" "~10.1.0" + "@abp/lodash" "~10.1.0" + "@abp/luxon" "~10.1.0" + "@abp/malihu-custom-scrollbar-plugin" "~10.1.0" + "@abp/moment" "~10.1.0" + "@abp/select2" "~10.1.0" + "@abp/sweetalert2" "~10.1.0" + "@abp/timeago" "~10.1.0" + +"@abp/aspnetcore.mvc.ui@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.1.0.tgz#79d76232aacb9c8e1762d903f75007d0418bf5a8" + integrity sha512-brVfaSUicZuSuwtizrEcMvtRjFsoAHr9i56HjJZb7bmElr+q5STiul3stRumly4IfoLkYqdy85hMk+B3G0bJDg== dependencies: ansi-colors "^4.1.3" -"@abp/bootstrap-datepicker@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.1.0-rc.2.tgz#be80c6104ba53e18935fbf62ca2c1890f4b2fde4" - integrity sha512-BNcDYUSbZaLah4SfXm0efoqFTsOViVm6370k9L7vix/OGpIWwklJsr8y78lvdM5ANgNCfl0LPSq+seLJFc/OLA== +"@abp/bootstrap-datepicker@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.1.0.tgz#68270ed8cf8e0c23a77331ef2ba6ef2d1da3cefc" + integrity sha512-ahKKHlluo4U1Z238mBNzpL0YaErTPENLQDVLNZB1BnZcUTqz1j7WJHGZoy4j3CXZKt7mnFCRe1+vJMCcwP+DYA== dependencies: bootstrap-datepicker "^1.10.1" -"@abp/bootstrap-daterangepicker@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.1.0-rc.2.tgz#f189f7d070ebd97d9cfdcb99571cab2d6a198ab5" - integrity sha512-bV8J0MuiAFVLkr48JsB6aZU6aPoqw+Gyhq1szQ74bEwNQlRBPuF92WVA5FACaUBj8dMUzR9HDDAYQuxUzpKYKA== +"@abp/bootstrap-daterangepicker@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.1.0.tgz#69f7775eafe7c038c2684d3e990384c8f2966cff" + integrity sha512-mFMaH7GqPn7W5zzIMOOTl4f0at9Vx8da4ewvPU/IvngrTeezMRPC1tofHmiWDhHfZpzF5J9DDMCGul9Q4nOl5A== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.1.0-rc.2.tgz#2300800a29ea09b91f5ed2e6177e5921fe7d2a0f" - integrity sha512-K+tDI9vz/Y9B/yu0i3AVpm4v3Odi44Q/yH5hAprL7f4pGxEOiqAFB/qzHAxG+7Oa7wjv5tPLv+Cz4DavBQjd8Q== +"@abp/bootstrap@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.1.0.tgz#816436ab547fc46d4c00b1facbdd80e3f4f78af1" + integrity sha512-ioqQDOvjXIUWncmLJuTcLPTnlJ3xGxyKXC9veSTJWFd+5pZswK7/QIlAuTvIIujs/7Z13GLunUIMMjny7WFBMw== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" bootstrap "^5.3.8" -"@abp/clipboard@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-10.1.0-rc.2.tgz#e99dbf190e3684e99c8e909bf38201c70e267502" - integrity sha512-kRS9pWc1jRgr4D4/EV9zdAy3rhhGBrcqk2as5+6Ih49npsEJY/cF5mYH7mj/ZYy8SHqtae/CR7bZsR+uCDKYrQ== +"@abp/clipboard@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-10.1.0.tgz#a59b14370b99fd7df447250b293fd7ac3f8c1a51" + integrity sha512-OulNwy9vhASO8TJ+m0ql6/iXNflE59oGUNAW+qzcaxaazre1mVPahPMBoLSVuOAGtAjLZAN4SWCOC5r3tLt9pA== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" clipboard "^2.0.11" -"@abp/core@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.1.0-rc.2.tgz#403687aff5a30788f7b7ca660abdfd85d89438aa" - integrity sha512-euuG2Hna/DT6/R1dGOjgp3vcehYtF+CcOkRj31oquYKaM5YWk4OaZ314DSpnjgs/xo8DuVc4eKFQwIxD9RK41w== +"@abp/core@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.1.0.tgz#7cb21012deee5510a0774d982f85627d47b368f4" + integrity sha512-/N0K2NVdk5/OM+Q5JDnpC+0CD0mS4wpDhLO1SIQbMXSTFbplhfPw2SFm7+MvPA9pVx2L8TYAzXmS7CtAJxKvCg== dependencies: - "@abp/utils" "~10.1.0-rc.2" + "@abp/utils" "~10.1.0" -"@abp/datatables.net-bs5@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.1.0-rc.2.tgz#a60650d1802b40751d30f8f6c56beb23fd66481b" - integrity sha512-IWwexNqbMpET54Fvm9LoPTJYf+4CoBbjFOvz3sL6CgO2feV5R5fKigjVU8zXKNh2W+RG8L6zEarfVxrr114TsA== +"@abp/datatables.net-bs5@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.1.0.tgz#ea2a60c22bdcc80882662b9f55f198793f6ea556" + integrity sha512-dPe3bVW3Hfnm/X9Bw5k7TuEIsYYwFk1faC8kIxf2Spk+4Z9TdYFS2zGaHBYStE9iRtKmneNYMykG2O88mX3quA== dependencies: - "@abp/datatables.net" "~10.1.0-rc.2" + "@abp/datatables.net" "~10.1.0" datatables.net-bs5 "^2.3.4" -"@abp/datatables.net@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.1.0-rc.2.tgz#9147f68bc6dbc4eb40a9ddf65c7859e788cdcac2" - integrity sha512-a9DJpwg14S4nVOiC4ipw0CQwEYWB602e2gCJiH7W1mxopbQb135RxwhtdTnW//eIONcxC9IrEuvcBEAUVt2B7Q== +"@abp/datatables.net@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.1.0.tgz#7fe641883e6d1417c86a030481777a75c9a5a555" + integrity sha512-p9S/ZaJ4OXpihTOWIxsSQ0s3G4S+ScQLD+Q+w0NrWbUa7HTKg9tdqSh6VDhyW9KZ/iiLUO5jNzsAFXyUjjDQuw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" datatables.net "^2.3.4" -"@abp/font-awesome@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.1.0-rc.2.tgz#364466cfe67e41e0c4d16b57d3923d10f66369f1" - integrity sha512-F1Jy8xoFV2aA+VN+NH1gtrG96/j9w7Picc+KLoCoIyNnJr/xJur11XkJyu5ln8KF4V7p/DY7QaQodWV/btOs8g== +"@abp/font-awesome@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.1.0.tgz#79c5b7eb9a85467b0078b9f9bf201493fc3de358" + integrity sha512-dm4VRtZnvm5p8mYQys9KWLkQ+JdwPahQSan2DV1s5Rq4P96hk8p8VshZu7pI3iE0MS+rSZnXYvetZrqCdt1mOQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" "@fortawesome/fontawesome-free" "^7.0.1" -"@abp/jquery-form@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.1.0-rc.2.tgz#3857717d07569c22d4bbbe459238abeb816d606a" - integrity sha512-2D5WHVnfK9bhRces1tgPwOEoc7KCYKYiKHBOcqct+LTA7zoRjJv/PM8/JhFVl+grVIw1aSwO4tU3YfZ22Vxipg== +"@abp/jquery-form@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.1.0.tgz#7c19605eb103519fea332d0f153cac185b7f2ebb" + integrity sha512-ddlapZqFVwpXU3uDi/RnQ6uSpseMxPAKE+/LgLF+SVyPzazNFognxPT3ztzqTk84P/gFleNgNjAfUlKrfyIfGw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.1.0-rc.2.tgz#efd7b69a078a20c0bf405408dbdf52a7bf770b3b" - integrity sha512-tZ0MWgzBqp+SNfMxM0z2cGB21NiTHuVJyyQaXKE/ptuD5pc0uRkcqw/J2kWfiqsoVgChz27IB6h8/jqDafS4qg== +"@abp/jquery-validation-unobtrusive@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.1.0.tgz#13aa462c4347d3459541a9a9ea19a60458805328" + integrity sha512-94smwn/W3d+gkX2UKH+/OiB7poKDP1ZK0DqWiiH4BGGmpRk9j3B+eJxPbL86dwNG4XT8upuX3ZOrUb6Fy2SA3A== dependencies: - "@abp/jquery-validation" "~10.1.0-rc.2" + "@abp/jquery-validation" "~10.1.0" jquery-validation-unobtrusive "^4.0.0" -"@abp/jquery-validation@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.1.0-rc.2.tgz#d39537a7356c51f9db2e66f6740cf6df86bd0442" - integrity sha512-LOkS0NKk4pLtLjPU0CCbwROyUg6EtJN8Z/it7QuKK1CIRfYYcAStgNnNm5geZP7CqECIkoiFfgWjI+L5Z9/Tfg== +"@abp/jquery-validation@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.1.0.tgz#5389785f5ff359ecd6291889420d6c2f84e633aa" + integrity sha512-/X5smp0xpNqCM+BuLI9eEyMPQ0uF42hmEfBvCIfWWBhfp7uFfq7sS706QcGfXYqFdpprRYoUJGKDfSaHxPaJUA== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" jquery-validation "^1.21.0" -"@abp/jquery@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.1.0-rc.2.tgz#101a55f70d510978c8c05f5857d0e9d4965263f7" - integrity sha512-bQV1uFWGtwRYjNOsqJ8FM2004idX2Jj7YVL19YF1/PjyPUSMX+s8/IvJizBjyY5hPAiWBBhmV9g+IFWzxlDQoQ== +"@abp/jquery@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.1.0.tgz#d8812a7d410ad959a1ed27696beb9b7885142684" + integrity sha512-cVF2hOP6GGp0N3VMBOFjEHuHFgXbDH8x0d7Agw4DN2ydFU8wYuj3m9u0HCc0aoBG6Zls90tMpTfM0RqDNFgCKA== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" jquery "~3.7.1" -"@abp/lodash@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.1.0-rc.2.tgz#d08c03f8d3d0fbaa3e71e603cbe5fb7f176933ef" - integrity sha512-KCnD1p2y52ZI+2ifpiFIUAiDPsKehnOD8HV5qKeObO6UCP97okif8IP+sQDmNQb8O33y/NKTyx/HcpwBbe/NYQ== +"@abp/lodash@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.1.0.tgz#fdebe764d1142abfd3ecdeef56aa33746e31815b" + integrity sha512-r4WwpqLFFQi721edd8XF5wueAdqEvx75dmRlEuhZoIBA6RQ0yYjTRMNWjTOlIEzFDGj7XrisV5CSUQ9BhhuS+Q== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" lodash "^4.17.21" -"@abp/luxon@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.1.0-rc.2.tgz#ef8d2b323bac054fc9610e241e1b1763d229e065" - integrity sha512-qYFl6XO3g9mZiu0dtIczI7LRuYWwc+RkpbDzSmruXcRks3KA+ZZco2vhHNnlwtXcINl/TXtbW7Wc0MX+8IB1Kw== +"@abp/luxon@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.1.0.tgz#c80cdb1a85e9cc824946dc0009df0daba384a4ca" + integrity sha512-slwiGSrevvWZrBhuy9sw7UP6akk2Ln9eAY3nxxo8xzE7C7uezcNk12dbKN4psdSAVpbDwuqC3GGrkmcFL+6sBQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" luxon "^3.7.2" -"@abp/malihu-custom-scrollbar-plugin@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.1.0-rc.2.tgz#dfaf666442c7c122f7da72c83b9adf194d5b6ec8" - integrity sha512-PudMHmNQgZ6JZeaVt1ZoXLqO0UZXJzUYiBah2LDkC4EMLjnMJFINHBoEVVa4ooXH0yjFv+zsbN0vWZYJ8TBJIA== +"@abp/malihu-custom-scrollbar-plugin@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.1.0.tgz#d257e83b7cc1af89a708e365eef7af0136ccebcf" + integrity sha512-+h8hoYUkjcYBdm/M3b8c3CeE5WNU8K6kQ5MwQXNaaGLCvwEmZHy0A6+U8yxtKv2eRRhAkAqOkQyWYRWA5w1XzQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.1.0-rc.2.tgz#610a1592d13984aea51abbd13df8c5995a089149" - integrity sha512-ep8PnAXARw0t/wtGOVp/oiNhF3B0Bh6y2vRzKrcSoyXAQREGGm4fJdZVYZLGTfI4lFLTjebEgf4O7T9feUwJAw== +"@abp/moment@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.1.0.tgz#5755e4e10a7302e2832b1a1ce571f20b27600303" + integrity sha512-faHV7vmPEjFUJTRNTTlmnpx0VZuyvQt4O98WBLAjPdcqpLfWazdS9Ro405St5liIkgvmAXWsrwVmZb0VKTLcNA== dependencies: moment "^2.30.1" -"@abp/prismjs@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-10.1.0-rc.2.tgz#8565bab503a16fc349f4b0fa2609ad412ff838be" - integrity sha512-SmZWMyJ3cJW+qj4CWJ7y2kD6PMx2zfZMA5X5jPunsytG4Eht4AVyIR38Y4QSpO62zZgkHyZlSTFOozBfhrlv9A== +"@abp/prismjs@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-10.1.0.tgz#632e06b47a9ac11d0131d06a270b97292266df47" + integrity sha512-iqXB3bgrlXDyfuFr23R2JtfN0Ij3ai81KkWM3oc3QikKaCwAHtiU0ZvshRlL9y3YfwjlNpYYFLE4en2xx1xThQ== dependencies: - "@abp/clipboard" "~10.1.0-rc.2" - "@abp/core" "~10.1.0-rc.2" + "@abp/clipboard" "~10.1.0" + "@abp/core" "~10.1.0" prismjs "^1.30.0" -"@abp/select2@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.1.0-rc.2.tgz#40c5418d007fc36817eecbe6388d767e4e7ca887" - integrity sha512-Pq0wlpL01sWRLUg5um3JtBXIqi3mmbwPwvgxP8hFbQngAt9JXAK8geNRiTMrIZgtW/ycXtM1v6I4zuWOLOeAGg== +"@abp/select2@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.1.0.tgz#8b15954e462e65329b8eb481226170df6d55d36a" + integrity sha512-7+1GirZe4i/2/LR4jZgWhiN6lFHhClLtUmrdCjh7FeeuBvy5GGA417DybDihna/GzlcOVI4GHnn2fjEwcFqJiw== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" select2 "^4.0.13" -"@abp/sweetalert2@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.1.0-rc.2.tgz#d35858c69e10c6726b02cdfcea88dfc32385963f" - integrity sha512-s9VPRToohN45uzHcKCF5Mcj8FVjsXcXUb0U3tuaT/Y+u4adHB3fBxYiXJFM0sVsCJ81dFktxwka40Wm8Taz/zA== +"@abp/sweetalert2@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.1.0.tgz#6997cb7909671f9deddaea53f17ed054aab27cd3" + integrity sha512-vlkH+DkuQBvOqnDPqTtyZ5mHb+GfIR/QJBXI7yrS62ML+ZNqkg0vXftCrm4aAR2kPmvgYsbUOJcKJAmgydcOEQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" sweetalert2 "^11.23.0" -"@abp/timeago@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.1.0-rc.2.tgz#98d630cc3843eee64dbcc34fb8ca5afbab034718" - integrity sha512-vJmk+otyXXJE2s2J8iYpLVaFuNAYnIUSOitmi7umYnL+k/UE2KQhBXU7FR0/OBY9mAZYd+shaiGIU1LMSaJ+Xg== +"@abp/timeago@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.1.0.tgz#45c1e8b1451e31910e330053981a871787fe02f1" + integrity sha512-3RVMlBbOepa4WBTLthRmf2VddkNwsjE+FNnaSUaMQ2ZQaXnghnZc4xZ3f3oKraGcWMgqpz1IfrWWV1POKRsEXw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" timeago "^1.6.7" -"@abp/utils@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.1.0-rc.2.tgz#86a980c6536b3b5ce185d406723b28be421864ac" - integrity sha512-Oz863VNA8fraQ81vTvqM0IqwiaseLwfFU5QNn6iOGOfn5wQrEkPwtZ0jMI+DGNtJgPzoKiq+iKc3K+SiuVgldg== +"@abp/utils@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.1.0.tgz#ef7f6bf16abb34b77fa57c156b264154827bc0af" + integrity sha512-UDgbvDMbcQklNu+SlQPhkIcIfZoWsQjCCzihanLBiHc474BCOlcTsO6K/EatV9LwqG3zY0mYd0ExAWjH44G0rQ== dependencies: just-compare "^2.3.0" diff --git a/modules/blogging/app/Volo.BloggingTestApp/package.json b/modules/blogging/app/Volo.BloggingTestApp/package.json index 0f4e62f9cf..283e915f7e 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/package.json +++ b/modules/blogging/app/Volo.BloggingTestApp/package.json @@ -3,7 +3,7 @@ "name": "volo.blogtestapp", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0-rc.2", - "@abp/blogging": "~10.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0", + "@abp/blogging": "~10.1.0" } } diff --git a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock index 1f2cd9805d..edbedf007e 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock +++ b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock @@ -2,228 +2,228 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.1.0-rc.2.tgz#599f5c47a417d1230fc17c0446a0229f920f7246" - integrity sha512-8F4nEK+VtgRRf8n+66HMbtCEaOMCW/OdbSEWRl9ahMNoj860oPIJ8P8Qn/2+LjtkPMdDAfCdEzyDzCd3igaFaA== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~10.1.0-rc.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.1.0-rc.2.tgz#e5056e4e159f5815e3cffecab5c46f3d7d4f79d7" - integrity sha512-bo56XzQZPYL/3ckWTTTSSUsSFSFJobvfE29cz13NIrZ/tBtWyQCAJn92wYHuY+6IezYUWb4ga3PkFeHRzR142A== - dependencies: - "@abp/aspnetcore.mvc.ui" "~10.1.0-rc.2" - "@abp/bootstrap" "~10.1.0-rc.2" - "@abp/bootstrap-datepicker" "~10.1.0-rc.2" - "@abp/bootstrap-daterangepicker" "~10.1.0-rc.2" - "@abp/datatables.net-bs5" "~10.1.0-rc.2" - "@abp/font-awesome" "~10.1.0-rc.2" - "@abp/jquery-form" "~10.1.0-rc.2" - "@abp/jquery-validation-unobtrusive" "~10.1.0-rc.2" - "@abp/lodash" "~10.1.0-rc.2" - "@abp/luxon" "~10.1.0-rc.2" - "@abp/malihu-custom-scrollbar-plugin" "~10.1.0-rc.2" - "@abp/moment" "~10.1.0-rc.2" - "@abp/select2" "~10.1.0-rc.2" - "@abp/sweetalert2" "~10.1.0-rc.2" - "@abp/timeago" "~10.1.0-rc.2" - -"@abp/aspnetcore.mvc.ui@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.1.0-rc.2.tgz#e25d3575d40bfcb3f809bd2d355671181ee5ff40" - integrity sha512-MOF86bVbi7N/nIla+361nsBrN4tiSka8xzpWcgqlLcCAl9ILG4rugbtafBAjN81taPma2peZM7egaOR4SDkTMw== +"@abp/aspnetcore.mvc.ui.theme.basic@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.1.0.tgz#94f68982ce8b67b6ac827f824aed3faad50e56e9" + integrity sha512-wqbEANW8CRZ+/7qGNprC828yNN17TsYtFxywL0B+EA2UfUtcTpzR/3ompZd/XcDm3N2NmS1n5Ao3WEn2NJlHgA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~10.1.0" + +"@abp/aspnetcore.mvc.ui.theme.shared@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.1.0.tgz#b89c5d38fdeceda9e421f9357842838be36dce49" + integrity sha512-9QyZ7lYr17thTKxq9WN/KVCxNyYurY5Ph9y3vFBkA3u+uOZcaxdw0T417vy0hJvAB7RGlkpLRTmZL7q5P9FzJA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~10.1.0" + "@abp/bootstrap" "~10.1.0" + "@abp/bootstrap-datepicker" "~10.1.0" + "@abp/bootstrap-daterangepicker" "~10.1.0" + "@abp/datatables.net-bs5" "~10.1.0" + "@abp/font-awesome" "~10.1.0" + "@abp/jquery-form" "~10.1.0" + "@abp/jquery-validation-unobtrusive" "~10.1.0" + "@abp/lodash" "~10.1.0" + "@abp/luxon" "~10.1.0" + "@abp/malihu-custom-scrollbar-plugin" "~10.1.0" + "@abp/moment" "~10.1.0" + "@abp/select2" "~10.1.0" + "@abp/sweetalert2" "~10.1.0" + "@abp/timeago" "~10.1.0" + +"@abp/aspnetcore.mvc.ui@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.1.0.tgz#79d76232aacb9c8e1762d903f75007d0418bf5a8" + integrity sha512-brVfaSUicZuSuwtizrEcMvtRjFsoAHr9i56HjJZb7bmElr+q5STiul3stRumly4IfoLkYqdy85hMk+B3G0bJDg== dependencies: ansi-colors "^4.1.3" -"@abp/blogging@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-10.1.0-rc.2.tgz#f60d5fdfef5be11cbbb23ad7b4b246621828e5f9" - integrity sha512-GcI6JWeQKcHA0FaJZYTgx9l63jlSn1cqaWjBx6Y4KYIpy1c8vDKnve85jzsj7UOKgkMFX1c7mN2vwzH3NSr1Qg== +"@abp/blogging@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-10.1.0.tgz#681170a3d27e3726decf60a924e3d9375c77de6b" + integrity sha512-2Dox5XI0EoDigy6cV7GOOFZuN8wpEh5ADjiwMDTpOm0MlHuWUjLdXiHzIogtb/JowxL14SUiUEhendInJ6+eAQ== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~10.1.0-rc.2" - "@abp/owl.carousel" "~10.1.0-rc.2" - "@abp/prismjs" "~10.1.0-rc.2" - "@abp/tui-editor" "~10.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.shared" "~10.1.0" + "@abp/owl.carousel" "~10.1.0" + "@abp/prismjs" "~10.1.0" + "@abp/tui-editor" "~10.1.0" -"@abp/bootstrap-datepicker@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.1.0-rc.2.tgz#be80c6104ba53e18935fbf62ca2c1890f4b2fde4" - integrity sha512-BNcDYUSbZaLah4SfXm0efoqFTsOViVm6370k9L7vix/OGpIWwklJsr8y78lvdM5ANgNCfl0LPSq+seLJFc/OLA== +"@abp/bootstrap-datepicker@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.1.0.tgz#68270ed8cf8e0c23a77331ef2ba6ef2d1da3cefc" + integrity sha512-ahKKHlluo4U1Z238mBNzpL0YaErTPENLQDVLNZB1BnZcUTqz1j7WJHGZoy4j3CXZKt7mnFCRe1+vJMCcwP+DYA== dependencies: bootstrap-datepicker "^1.10.1" -"@abp/bootstrap-daterangepicker@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.1.0-rc.2.tgz#f189f7d070ebd97d9cfdcb99571cab2d6a198ab5" - integrity sha512-bV8J0MuiAFVLkr48JsB6aZU6aPoqw+Gyhq1szQ74bEwNQlRBPuF92WVA5FACaUBj8dMUzR9HDDAYQuxUzpKYKA== +"@abp/bootstrap-daterangepicker@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.1.0.tgz#69f7775eafe7c038c2684d3e990384c8f2966cff" + integrity sha512-mFMaH7GqPn7W5zzIMOOTl4f0at9Vx8da4ewvPU/IvngrTeezMRPC1tofHmiWDhHfZpzF5J9DDMCGul9Q4nOl5A== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.1.0-rc.2.tgz#2300800a29ea09b91f5ed2e6177e5921fe7d2a0f" - integrity sha512-K+tDI9vz/Y9B/yu0i3AVpm4v3Odi44Q/yH5hAprL7f4pGxEOiqAFB/qzHAxG+7Oa7wjv5tPLv+Cz4DavBQjd8Q== +"@abp/bootstrap@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.1.0.tgz#816436ab547fc46d4c00b1facbdd80e3f4f78af1" + integrity sha512-ioqQDOvjXIUWncmLJuTcLPTnlJ3xGxyKXC9veSTJWFd+5pZswK7/QIlAuTvIIujs/7Z13GLunUIMMjny7WFBMw== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" bootstrap "^5.3.8" -"@abp/clipboard@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-10.1.0-rc.2.tgz#e99dbf190e3684e99c8e909bf38201c70e267502" - integrity sha512-kRS9pWc1jRgr4D4/EV9zdAy3rhhGBrcqk2as5+6Ih49npsEJY/cF5mYH7mj/ZYy8SHqtae/CR7bZsR+uCDKYrQ== +"@abp/clipboard@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-10.1.0.tgz#a59b14370b99fd7df447250b293fd7ac3f8c1a51" + integrity sha512-OulNwy9vhASO8TJ+m0ql6/iXNflE59oGUNAW+qzcaxaazre1mVPahPMBoLSVuOAGtAjLZAN4SWCOC5r3tLt9pA== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" clipboard "^2.0.11" -"@abp/core@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.1.0-rc.2.tgz#403687aff5a30788f7b7ca660abdfd85d89438aa" - integrity sha512-euuG2Hna/DT6/R1dGOjgp3vcehYtF+CcOkRj31oquYKaM5YWk4OaZ314DSpnjgs/xo8DuVc4eKFQwIxD9RK41w== +"@abp/core@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.1.0.tgz#7cb21012deee5510a0774d982f85627d47b368f4" + integrity sha512-/N0K2NVdk5/OM+Q5JDnpC+0CD0mS4wpDhLO1SIQbMXSTFbplhfPw2SFm7+MvPA9pVx2L8TYAzXmS7CtAJxKvCg== dependencies: - "@abp/utils" "~10.1.0-rc.2" + "@abp/utils" "~10.1.0" -"@abp/datatables.net-bs5@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.1.0-rc.2.tgz#a60650d1802b40751d30f8f6c56beb23fd66481b" - integrity sha512-IWwexNqbMpET54Fvm9LoPTJYf+4CoBbjFOvz3sL6CgO2feV5R5fKigjVU8zXKNh2W+RG8L6zEarfVxrr114TsA== +"@abp/datatables.net-bs5@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.1.0.tgz#ea2a60c22bdcc80882662b9f55f198793f6ea556" + integrity sha512-dPe3bVW3Hfnm/X9Bw5k7TuEIsYYwFk1faC8kIxf2Spk+4Z9TdYFS2zGaHBYStE9iRtKmneNYMykG2O88mX3quA== dependencies: - "@abp/datatables.net" "~10.1.0-rc.2" + "@abp/datatables.net" "~10.1.0" datatables.net-bs5 "^2.3.4" -"@abp/datatables.net@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.1.0-rc.2.tgz#9147f68bc6dbc4eb40a9ddf65c7859e788cdcac2" - integrity sha512-a9DJpwg14S4nVOiC4ipw0CQwEYWB602e2gCJiH7W1mxopbQb135RxwhtdTnW//eIONcxC9IrEuvcBEAUVt2B7Q== +"@abp/datatables.net@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.1.0.tgz#7fe641883e6d1417c86a030481777a75c9a5a555" + integrity sha512-p9S/ZaJ4OXpihTOWIxsSQ0s3G4S+ScQLD+Q+w0NrWbUa7HTKg9tdqSh6VDhyW9KZ/iiLUO5jNzsAFXyUjjDQuw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" datatables.net "^2.3.4" -"@abp/font-awesome@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.1.0-rc.2.tgz#364466cfe67e41e0c4d16b57d3923d10f66369f1" - integrity sha512-F1Jy8xoFV2aA+VN+NH1gtrG96/j9w7Picc+KLoCoIyNnJr/xJur11XkJyu5ln8KF4V7p/DY7QaQodWV/btOs8g== +"@abp/font-awesome@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.1.0.tgz#79c5b7eb9a85467b0078b9f9bf201493fc3de358" + integrity sha512-dm4VRtZnvm5p8mYQys9KWLkQ+JdwPahQSan2DV1s5Rq4P96hk8p8VshZu7pI3iE0MS+rSZnXYvetZrqCdt1mOQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" "@fortawesome/fontawesome-free" "^7.0.1" -"@abp/jquery-form@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.1.0-rc.2.tgz#3857717d07569c22d4bbbe459238abeb816d606a" - integrity sha512-2D5WHVnfK9bhRces1tgPwOEoc7KCYKYiKHBOcqct+LTA7zoRjJv/PM8/JhFVl+grVIw1aSwO4tU3YfZ22Vxipg== +"@abp/jquery-form@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.1.0.tgz#7c19605eb103519fea332d0f153cac185b7f2ebb" + integrity sha512-ddlapZqFVwpXU3uDi/RnQ6uSpseMxPAKE+/LgLF+SVyPzazNFognxPT3ztzqTk84P/gFleNgNjAfUlKrfyIfGw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.1.0-rc.2.tgz#efd7b69a078a20c0bf405408dbdf52a7bf770b3b" - integrity sha512-tZ0MWgzBqp+SNfMxM0z2cGB21NiTHuVJyyQaXKE/ptuD5pc0uRkcqw/J2kWfiqsoVgChz27IB6h8/jqDafS4qg== +"@abp/jquery-validation-unobtrusive@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.1.0.tgz#13aa462c4347d3459541a9a9ea19a60458805328" + integrity sha512-94smwn/W3d+gkX2UKH+/OiB7poKDP1ZK0DqWiiH4BGGmpRk9j3B+eJxPbL86dwNG4XT8upuX3ZOrUb6Fy2SA3A== dependencies: - "@abp/jquery-validation" "~10.1.0-rc.2" + "@abp/jquery-validation" "~10.1.0" jquery-validation-unobtrusive "^4.0.0" -"@abp/jquery-validation@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.1.0-rc.2.tgz#d39537a7356c51f9db2e66f6740cf6df86bd0442" - integrity sha512-LOkS0NKk4pLtLjPU0CCbwROyUg6EtJN8Z/it7QuKK1CIRfYYcAStgNnNm5geZP7CqECIkoiFfgWjI+L5Z9/Tfg== +"@abp/jquery-validation@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.1.0.tgz#5389785f5ff359ecd6291889420d6c2f84e633aa" + integrity sha512-/X5smp0xpNqCM+BuLI9eEyMPQ0uF42hmEfBvCIfWWBhfp7uFfq7sS706QcGfXYqFdpprRYoUJGKDfSaHxPaJUA== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" jquery-validation "^1.21.0" -"@abp/jquery@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.1.0-rc.2.tgz#101a55f70d510978c8c05f5857d0e9d4965263f7" - integrity sha512-bQV1uFWGtwRYjNOsqJ8FM2004idX2Jj7YVL19YF1/PjyPUSMX+s8/IvJizBjyY5hPAiWBBhmV9g+IFWzxlDQoQ== +"@abp/jquery@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.1.0.tgz#d8812a7d410ad959a1ed27696beb9b7885142684" + integrity sha512-cVF2hOP6GGp0N3VMBOFjEHuHFgXbDH8x0d7Agw4DN2ydFU8wYuj3m9u0HCc0aoBG6Zls90tMpTfM0RqDNFgCKA== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" jquery "~3.7.1" -"@abp/lodash@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.1.0-rc.2.tgz#d08c03f8d3d0fbaa3e71e603cbe5fb7f176933ef" - integrity sha512-KCnD1p2y52ZI+2ifpiFIUAiDPsKehnOD8HV5qKeObO6UCP97okif8IP+sQDmNQb8O33y/NKTyx/HcpwBbe/NYQ== +"@abp/lodash@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.1.0.tgz#fdebe764d1142abfd3ecdeef56aa33746e31815b" + integrity sha512-r4WwpqLFFQi721edd8XF5wueAdqEvx75dmRlEuhZoIBA6RQ0yYjTRMNWjTOlIEzFDGj7XrisV5CSUQ9BhhuS+Q== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" lodash "^4.17.21" -"@abp/luxon@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.1.0-rc.2.tgz#ef8d2b323bac054fc9610e241e1b1763d229e065" - integrity sha512-qYFl6XO3g9mZiu0dtIczI7LRuYWwc+RkpbDzSmruXcRks3KA+ZZco2vhHNnlwtXcINl/TXtbW7Wc0MX+8IB1Kw== +"@abp/luxon@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.1.0.tgz#c80cdb1a85e9cc824946dc0009df0daba384a4ca" + integrity sha512-slwiGSrevvWZrBhuy9sw7UP6akk2Ln9eAY3nxxo8xzE7C7uezcNk12dbKN4psdSAVpbDwuqC3GGrkmcFL+6sBQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" luxon "^3.7.2" -"@abp/malihu-custom-scrollbar-plugin@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.1.0-rc.2.tgz#dfaf666442c7c122f7da72c83b9adf194d5b6ec8" - integrity sha512-PudMHmNQgZ6JZeaVt1ZoXLqO0UZXJzUYiBah2LDkC4EMLjnMJFINHBoEVVa4ooXH0yjFv+zsbN0vWZYJ8TBJIA== +"@abp/malihu-custom-scrollbar-plugin@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.1.0.tgz#d257e83b7cc1af89a708e365eef7af0136ccebcf" + integrity sha512-+h8hoYUkjcYBdm/M3b8c3CeE5WNU8K6kQ5MwQXNaaGLCvwEmZHy0A6+U8yxtKv2eRRhAkAqOkQyWYRWA5w1XzQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.1.0-rc.2.tgz#610a1592d13984aea51abbd13df8c5995a089149" - integrity sha512-ep8PnAXARw0t/wtGOVp/oiNhF3B0Bh6y2vRzKrcSoyXAQREGGm4fJdZVYZLGTfI4lFLTjebEgf4O7T9feUwJAw== +"@abp/moment@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.1.0.tgz#5755e4e10a7302e2832b1a1ce571f20b27600303" + integrity sha512-faHV7vmPEjFUJTRNTTlmnpx0VZuyvQt4O98WBLAjPdcqpLfWazdS9Ro405St5liIkgvmAXWsrwVmZb0VKTLcNA== dependencies: moment "^2.30.1" -"@abp/owl.carousel@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-10.1.0-rc.2.tgz#e7697b7c8954472758547688fa6724b219a5c99c" - integrity sha512-XKciT8HNWoZvlcMGRwOz9opld4BJsAQwMKsKRu1oD4/KMCnT7LelacFPVbj3CLhsLpU+2eq0M947fEI7hQiPOQ== +"@abp/owl.carousel@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-10.1.0.tgz#dd2138b9381626628fcb719c7f9ea9ea343268f7" + integrity sha512-apJpF1/tCca6Xw0j/9UOHhvXth7a3q1sWRQpVd2450MwSCFTjU11ODLnHYxDNe2uLvqwAvolANOYfBpWmWpYOQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" owl.carousel "^2.3.4" -"@abp/prismjs@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-10.1.0-rc.2.tgz#8565bab503a16fc349f4b0fa2609ad412ff838be" - integrity sha512-SmZWMyJ3cJW+qj4CWJ7y2kD6PMx2zfZMA5X5jPunsytG4Eht4AVyIR38Y4QSpO62zZgkHyZlSTFOozBfhrlv9A== +"@abp/prismjs@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-10.1.0.tgz#632e06b47a9ac11d0131d06a270b97292266df47" + integrity sha512-iqXB3bgrlXDyfuFr23R2JtfN0Ij3ai81KkWM3oc3QikKaCwAHtiU0ZvshRlL9y3YfwjlNpYYFLE4en2xx1xThQ== dependencies: - "@abp/clipboard" "~10.1.0-rc.2" - "@abp/core" "~10.1.0-rc.2" + "@abp/clipboard" "~10.1.0" + "@abp/core" "~10.1.0" prismjs "^1.30.0" -"@abp/select2@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.1.0-rc.2.tgz#40c5418d007fc36817eecbe6388d767e4e7ca887" - integrity sha512-Pq0wlpL01sWRLUg5um3JtBXIqi3mmbwPwvgxP8hFbQngAt9JXAK8geNRiTMrIZgtW/ycXtM1v6I4zuWOLOeAGg== +"@abp/select2@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.1.0.tgz#8b15954e462e65329b8eb481226170df6d55d36a" + integrity sha512-7+1GirZe4i/2/LR4jZgWhiN6lFHhClLtUmrdCjh7FeeuBvy5GGA417DybDihna/GzlcOVI4GHnn2fjEwcFqJiw== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" select2 "^4.0.13" -"@abp/sweetalert2@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.1.0-rc.2.tgz#d35858c69e10c6726b02cdfcea88dfc32385963f" - integrity sha512-s9VPRToohN45uzHcKCF5Mcj8FVjsXcXUb0U3tuaT/Y+u4adHB3fBxYiXJFM0sVsCJ81dFktxwka40Wm8Taz/zA== +"@abp/sweetalert2@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.1.0.tgz#6997cb7909671f9deddaea53f17ed054aab27cd3" + integrity sha512-vlkH+DkuQBvOqnDPqTtyZ5mHb+GfIR/QJBXI7yrS62ML+ZNqkg0vXftCrm4aAR2kPmvgYsbUOJcKJAmgydcOEQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" sweetalert2 "^11.23.0" -"@abp/timeago@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.1.0-rc.2.tgz#98d630cc3843eee64dbcc34fb8ca5afbab034718" - integrity sha512-vJmk+otyXXJE2s2J8iYpLVaFuNAYnIUSOitmi7umYnL+k/UE2KQhBXU7FR0/OBY9mAZYd+shaiGIU1LMSaJ+Xg== +"@abp/timeago@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.1.0.tgz#45c1e8b1451e31910e330053981a871787fe02f1" + integrity sha512-3RVMlBbOepa4WBTLthRmf2VddkNwsjE+FNnaSUaMQ2ZQaXnghnZc4xZ3f3oKraGcWMgqpz1IfrWWV1POKRsEXw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" timeago "^1.6.7" -"@abp/tui-editor@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-10.1.0-rc.2.tgz#ebbd5bad1ee180a0c6e6a9cfd894499614a71e96" - integrity sha512-k5V+5ZE+HZebfyXLzddRQDGri3HP7wSjDXEbSMLTgxZTem7IzksyLWLAN/woKRzWX92BJXcsmR8T1rhuMhohhA== +"@abp/tui-editor@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-10.1.0.tgz#3f0556f918a239da9c048bf96f7c6703cff1f796" + integrity sha512-cIpNiIvxkUUzk9TnyhP3wBcsrCcgTFOlqhRWowyq9Kt7iVqoKb6vkCflxKt1oxkLZVBI7qOJGx2o5KmSYFcWiQ== dependencies: - "@abp/jquery" "~10.1.0-rc.2" - "@abp/prismjs" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" + "@abp/prismjs" "~10.1.0" -"@abp/utils@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.1.0-rc.2.tgz#86a980c6536b3b5ce185d406723b28be421864ac" - integrity sha512-Oz863VNA8fraQ81vTvqM0IqwiaseLwfFU5QNn6iOGOfn5wQrEkPwtZ0jMI+DGNtJgPzoKiq+iKc3K+SiuVgldg== +"@abp/utils@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.1.0.tgz#ef7f6bf16abb34b77fa57c156b264154827bc0af" + integrity sha512-UDgbvDMbcQklNu+SlQPhkIcIfZoWsQjCCzihanLBiHc474BCOlcTsO6K/EatV9LwqG3zY0mYd0ExAWjH44G0rQ== dependencies: just-compare "^2.3.0" diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json index 66592df9ff..647abdc641 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json @@ -3,6 +3,6 @@ "name": "client-simulation-web", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0" } } diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock index a2b6e13b29..1910c85cf1 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock @@ -2,185 +2,185 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.1.0-rc.2.tgz#599f5c47a417d1230fc17c0446a0229f920f7246" - integrity sha512-8F4nEK+VtgRRf8n+66HMbtCEaOMCW/OdbSEWRl9ahMNoj860oPIJ8P8Qn/2+LjtkPMdDAfCdEzyDzCd3igaFaA== +"@abp/aspnetcore.mvc.ui.theme.basic@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.1.0.tgz#94f68982ce8b67b6ac827f824aed3faad50e56e9" + integrity sha512-wqbEANW8CRZ+/7qGNprC828yNN17TsYtFxywL0B+EA2UfUtcTpzR/3ompZd/XcDm3N2NmS1n5Ao3WEn2NJlHgA== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~10.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.shared" "~10.1.0" -"@abp/aspnetcore.mvc.ui.theme.shared@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.1.0-rc.2.tgz#e5056e4e159f5815e3cffecab5c46f3d7d4f79d7" - integrity sha512-bo56XzQZPYL/3ckWTTTSSUsSFSFJobvfE29cz13NIrZ/tBtWyQCAJn92wYHuY+6IezYUWb4ga3PkFeHRzR142A== +"@abp/aspnetcore.mvc.ui.theme.shared@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.1.0.tgz#b89c5d38fdeceda9e421f9357842838be36dce49" + integrity sha512-9QyZ7lYr17thTKxq9WN/KVCxNyYurY5Ph9y3vFBkA3u+uOZcaxdw0T417vy0hJvAB7RGlkpLRTmZL7q5P9FzJA== dependencies: - "@abp/aspnetcore.mvc.ui" "~10.1.0-rc.2" - "@abp/bootstrap" "~10.1.0-rc.2" - "@abp/bootstrap-datepicker" "~10.1.0-rc.2" - "@abp/bootstrap-daterangepicker" "~10.1.0-rc.2" - "@abp/datatables.net-bs5" "~10.1.0-rc.2" - "@abp/font-awesome" "~10.1.0-rc.2" - "@abp/jquery-form" "~10.1.0-rc.2" - "@abp/jquery-validation-unobtrusive" "~10.1.0-rc.2" - "@abp/lodash" "~10.1.0-rc.2" - "@abp/luxon" "~10.1.0-rc.2" - "@abp/malihu-custom-scrollbar-plugin" "~10.1.0-rc.2" - "@abp/moment" "~10.1.0-rc.2" - "@abp/select2" "~10.1.0-rc.2" - "@abp/sweetalert2" "~10.1.0-rc.2" - "@abp/timeago" "~10.1.0-rc.2" - -"@abp/aspnetcore.mvc.ui@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.1.0-rc.2.tgz#e25d3575d40bfcb3f809bd2d355671181ee5ff40" - integrity sha512-MOF86bVbi7N/nIla+361nsBrN4tiSka8xzpWcgqlLcCAl9ILG4rugbtafBAjN81taPma2peZM7egaOR4SDkTMw== + "@abp/aspnetcore.mvc.ui" "~10.1.0" + "@abp/bootstrap" "~10.1.0" + "@abp/bootstrap-datepicker" "~10.1.0" + "@abp/bootstrap-daterangepicker" "~10.1.0" + "@abp/datatables.net-bs5" "~10.1.0" + "@abp/font-awesome" "~10.1.0" + "@abp/jquery-form" "~10.1.0" + "@abp/jquery-validation-unobtrusive" "~10.1.0" + "@abp/lodash" "~10.1.0" + "@abp/luxon" "~10.1.0" + "@abp/malihu-custom-scrollbar-plugin" "~10.1.0" + "@abp/moment" "~10.1.0" + "@abp/select2" "~10.1.0" + "@abp/sweetalert2" "~10.1.0" + "@abp/timeago" "~10.1.0" + +"@abp/aspnetcore.mvc.ui@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.1.0.tgz#79d76232aacb9c8e1762d903f75007d0418bf5a8" + integrity sha512-brVfaSUicZuSuwtizrEcMvtRjFsoAHr9i56HjJZb7bmElr+q5STiul3stRumly4IfoLkYqdy85hMk+B3G0bJDg== dependencies: ansi-colors "^4.1.3" -"@abp/bootstrap-datepicker@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.1.0-rc.2.tgz#be80c6104ba53e18935fbf62ca2c1890f4b2fde4" - integrity sha512-BNcDYUSbZaLah4SfXm0efoqFTsOViVm6370k9L7vix/OGpIWwklJsr8y78lvdM5ANgNCfl0LPSq+seLJFc/OLA== +"@abp/bootstrap-datepicker@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.1.0.tgz#68270ed8cf8e0c23a77331ef2ba6ef2d1da3cefc" + integrity sha512-ahKKHlluo4U1Z238mBNzpL0YaErTPENLQDVLNZB1BnZcUTqz1j7WJHGZoy4j3CXZKt7mnFCRe1+vJMCcwP+DYA== dependencies: bootstrap-datepicker "^1.10.1" -"@abp/bootstrap-daterangepicker@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.1.0-rc.2.tgz#f189f7d070ebd97d9cfdcb99571cab2d6a198ab5" - integrity sha512-bV8J0MuiAFVLkr48JsB6aZU6aPoqw+Gyhq1szQ74bEwNQlRBPuF92WVA5FACaUBj8dMUzR9HDDAYQuxUzpKYKA== +"@abp/bootstrap-daterangepicker@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.1.0.tgz#69f7775eafe7c038c2684d3e990384c8f2966cff" + integrity sha512-mFMaH7GqPn7W5zzIMOOTl4f0at9Vx8da4ewvPU/IvngrTeezMRPC1tofHmiWDhHfZpzF5J9DDMCGul9Q4nOl5A== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.1.0-rc.2.tgz#2300800a29ea09b91f5ed2e6177e5921fe7d2a0f" - integrity sha512-K+tDI9vz/Y9B/yu0i3AVpm4v3Odi44Q/yH5hAprL7f4pGxEOiqAFB/qzHAxG+7Oa7wjv5tPLv+Cz4DavBQjd8Q== +"@abp/bootstrap@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.1.0.tgz#816436ab547fc46d4c00b1facbdd80e3f4f78af1" + integrity sha512-ioqQDOvjXIUWncmLJuTcLPTnlJ3xGxyKXC9veSTJWFd+5pZswK7/QIlAuTvIIujs/7Z13GLunUIMMjny7WFBMw== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" bootstrap "^5.3.8" -"@abp/core@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.1.0-rc.2.tgz#403687aff5a30788f7b7ca660abdfd85d89438aa" - integrity sha512-euuG2Hna/DT6/R1dGOjgp3vcehYtF+CcOkRj31oquYKaM5YWk4OaZ314DSpnjgs/xo8DuVc4eKFQwIxD9RK41w== +"@abp/core@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.1.0.tgz#7cb21012deee5510a0774d982f85627d47b368f4" + integrity sha512-/N0K2NVdk5/OM+Q5JDnpC+0CD0mS4wpDhLO1SIQbMXSTFbplhfPw2SFm7+MvPA9pVx2L8TYAzXmS7CtAJxKvCg== dependencies: - "@abp/utils" "~10.1.0-rc.2" + "@abp/utils" "~10.1.0" -"@abp/datatables.net-bs5@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.1.0-rc.2.tgz#a60650d1802b40751d30f8f6c56beb23fd66481b" - integrity sha512-IWwexNqbMpET54Fvm9LoPTJYf+4CoBbjFOvz3sL6CgO2feV5R5fKigjVU8zXKNh2W+RG8L6zEarfVxrr114TsA== +"@abp/datatables.net-bs5@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.1.0.tgz#ea2a60c22bdcc80882662b9f55f198793f6ea556" + integrity sha512-dPe3bVW3Hfnm/X9Bw5k7TuEIsYYwFk1faC8kIxf2Spk+4Z9TdYFS2zGaHBYStE9iRtKmneNYMykG2O88mX3quA== dependencies: - "@abp/datatables.net" "~10.1.0-rc.2" + "@abp/datatables.net" "~10.1.0" datatables.net-bs5 "^2.3.4" -"@abp/datatables.net@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.1.0-rc.2.tgz#9147f68bc6dbc4eb40a9ddf65c7859e788cdcac2" - integrity sha512-a9DJpwg14S4nVOiC4ipw0CQwEYWB602e2gCJiH7W1mxopbQb135RxwhtdTnW//eIONcxC9IrEuvcBEAUVt2B7Q== +"@abp/datatables.net@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.1.0.tgz#7fe641883e6d1417c86a030481777a75c9a5a555" + integrity sha512-p9S/ZaJ4OXpihTOWIxsSQ0s3G4S+ScQLD+Q+w0NrWbUa7HTKg9tdqSh6VDhyW9KZ/iiLUO5jNzsAFXyUjjDQuw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" datatables.net "^2.3.4" -"@abp/font-awesome@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.1.0-rc.2.tgz#364466cfe67e41e0c4d16b57d3923d10f66369f1" - integrity sha512-F1Jy8xoFV2aA+VN+NH1gtrG96/j9w7Picc+KLoCoIyNnJr/xJur11XkJyu5ln8KF4V7p/DY7QaQodWV/btOs8g== +"@abp/font-awesome@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.1.0.tgz#79c5b7eb9a85467b0078b9f9bf201493fc3de358" + integrity sha512-dm4VRtZnvm5p8mYQys9KWLkQ+JdwPahQSan2DV1s5Rq4P96hk8p8VshZu7pI3iE0MS+rSZnXYvetZrqCdt1mOQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" "@fortawesome/fontawesome-free" "^7.0.1" -"@abp/jquery-form@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.1.0-rc.2.tgz#3857717d07569c22d4bbbe459238abeb816d606a" - integrity sha512-2D5WHVnfK9bhRces1tgPwOEoc7KCYKYiKHBOcqct+LTA7zoRjJv/PM8/JhFVl+grVIw1aSwO4tU3YfZ22Vxipg== +"@abp/jquery-form@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.1.0.tgz#7c19605eb103519fea332d0f153cac185b7f2ebb" + integrity sha512-ddlapZqFVwpXU3uDi/RnQ6uSpseMxPAKE+/LgLF+SVyPzazNFognxPT3ztzqTk84P/gFleNgNjAfUlKrfyIfGw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.1.0-rc.2.tgz#efd7b69a078a20c0bf405408dbdf52a7bf770b3b" - integrity sha512-tZ0MWgzBqp+SNfMxM0z2cGB21NiTHuVJyyQaXKE/ptuD5pc0uRkcqw/J2kWfiqsoVgChz27IB6h8/jqDafS4qg== +"@abp/jquery-validation-unobtrusive@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.1.0.tgz#13aa462c4347d3459541a9a9ea19a60458805328" + integrity sha512-94smwn/W3d+gkX2UKH+/OiB7poKDP1ZK0DqWiiH4BGGmpRk9j3B+eJxPbL86dwNG4XT8upuX3ZOrUb6Fy2SA3A== dependencies: - "@abp/jquery-validation" "~10.1.0-rc.2" + "@abp/jquery-validation" "~10.1.0" jquery-validation-unobtrusive "^4.0.0" -"@abp/jquery-validation@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.1.0-rc.2.tgz#d39537a7356c51f9db2e66f6740cf6df86bd0442" - integrity sha512-LOkS0NKk4pLtLjPU0CCbwROyUg6EtJN8Z/it7QuKK1CIRfYYcAStgNnNm5geZP7CqECIkoiFfgWjI+L5Z9/Tfg== +"@abp/jquery-validation@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.1.0.tgz#5389785f5ff359ecd6291889420d6c2f84e633aa" + integrity sha512-/X5smp0xpNqCM+BuLI9eEyMPQ0uF42hmEfBvCIfWWBhfp7uFfq7sS706QcGfXYqFdpprRYoUJGKDfSaHxPaJUA== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" jquery-validation "^1.21.0" -"@abp/jquery@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.1.0-rc.2.tgz#101a55f70d510978c8c05f5857d0e9d4965263f7" - integrity sha512-bQV1uFWGtwRYjNOsqJ8FM2004idX2Jj7YVL19YF1/PjyPUSMX+s8/IvJizBjyY5hPAiWBBhmV9g+IFWzxlDQoQ== +"@abp/jquery@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.1.0.tgz#d8812a7d410ad959a1ed27696beb9b7885142684" + integrity sha512-cVF2hOP6GGp0N3VMBOFjEHuHFgXbDH8x0d7Agw4DN2ydFU8wYuj3m9u0HCc0aoBG6Zls90tMpTfM0RqDNFgCKA== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" jquery "~3.7.1" -"@abp/lodash@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.1.0-rc.2.tgz#d08c03f8d3d0fbaa3e71e603cbe5fb7f176933ef" - integrity sha512-KCnD1p2y52ZI+2ifpiFIUAiDPsKehnOD8HV5qKeObO6UCP97okif8IP+sQDmNQb8O33y/NKTyx/HcpwBbe/NYQ== +"@abp/lodash@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.1.0.tgz#fdebe764d1142abfd3ecdeef56aa33746e31815b" + integrity sha512-r4WwpqLFFQi721edd8XF5wueAdqEvx75dmRlEuhZoIBA6RQ0yYjTRMNWjTOlIEzFDGj7XrisV5CSUQ9BhhuS+Q== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" lodash "^4.17.21" -"@abp/luxon@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.1.0-rc.2.tgz#ef8d2b323bac054fc9610e241e1b1763d229e065" - integrity sha512-qYFl6XO3g9mZiu0dtIczI7LRuYWwc+RkpbDzSmruXcRks3KA+ZZco2vhHNnlwtXcINl/TXtbW7Wc0MX+8IB1Kw== +"@abp/luxon@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.1.0.tgz#c80cdb1a85e9cc824946dc0009df0daba384a4ca" + integrity sha512-slwiGSrevvWZrBhuy9sw7UP6akk2Ln9eAY3nxxo8xzE7C7uezcNk12dbKN4psdSAVpbDwuqC3GGrkmcFL+6sBQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" luxon "^3.7.2" -"@abp/malihu-custom-scrollbar-plugin@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.1.0-rc.2.tgz#dfaf666442c7c122f7da72c83b9adf194d5b6ec8" - integrity sha512-PudMHmNQgZ6JZeaVt1ZoXLqO0UZXJzUYiBah2LDkC4EMLjnMJFINHBoEVVa4ooXH0yjFv+zsbN0vWZYJ8TBJIA== +"@abp/malihu-custom-scrollbar-plugin@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.1.0.tgz#d257e83b7cc1af89a708e365eef7af0136ccebcf" + integrity sha512-+h8hoYUkjcYBdm/M3b8c3CeE5WNU8K6kQ5MwQXNaaGLCvwEmZHy0A6+U8yxtKv2eRRhAkAqOkQyWYRWA5w1XzQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.1.0-rc.2.tgz#610a1592d13984aea51abbd13df8c5995a089149" - integrity sha512-ep8PnAXARw0t/wtGOVp/oiNhF3B0Bh6y2vRzKrcSoyXAQREGGm4fJdZVYZLGTfI4lFLTjebEgf4O7T9feUwJAw== +"@abp/moment@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.1.0.tgz#5755e4e10a7302e2832b1a1ce571f20b27600303" + integrity sha512-faHV7vmPEjFUJTRNTTlmnpx0VZuyvQt4O98WBLAjPdcqpLfWazdS9Ro405St5liIkgvmAXWsrwVmZb0VKTLcNA== dependencies: moment "^2.30.1" -"@abp/select2@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.1.0-rc.2.tgz#40c5418d007fc36817eecbe6388d767e4e7ca887" - integrity sha512-Pq0wlpL01sWRLUg5um3JtBXIqi3mmbwPwvgxP8hFbQngAt9JXAK8geNRiTMrIZgtW/ycXtM1v6I4zuWOLOeAGg== +"@abp/select2@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.1.0.tgz#8b15954e462e65329b8eb481226170df6d55d36a" + integrity sha512-7+1GirZe4i/2/LR4jZgWhiN6lFHhClLtUmrdCjh7FeeuBvy5GGA417DybDihna/GzlcOVI4GHnn2fjEwcFqJiw== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" select2 "^4.0.13" -"@abp/sweetalert2@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.1.0-rc.2.tgz#d35858c69e10c6726b02cdfcea88dfc32385963f" - integrity sha512-s9VPRToohN45uzHcKCF5Mcj8FVjsXcXUb0U3tuaT/Y+u4adHB3fBxYiXJFM0sVsCJ81dFktxwka40Wm8Taz/zA== +"@abp/sweetalert2@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.1.0.tgz#6997cb7909671f9deddaea53f17ed054aab27cd3" + integrity sha512-vlkH+DkuQBvOqnDPqTtyZ5mHb+GfIR/QJBXI7yrS62ML+ZNqkg0vXftCrm4aAR2kPmvgYsbUOJcKJAmgydcOEQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" sweetalert2 "^11.23.0" -"@abp/timeago@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.1.0-rc.2.tgz#98d630cc3843eee64dbcc34fb8ca5afbab034718" - integrity sha512-vJmk+otyXXJE2s2J8iYpLVaFuNAYnIUSOitmi7umYnL+k/UE2KQhBXU7FR0/OBY9mAZYd+shaiGIU1LMSaJ+Xg== +"@abp/timeago@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.1.0.tgz#45c1e8b1451e31910e330053981a871787fe02f1" + integrity sha512-3RVMlBbOepa4WBTLthRmf2VddkNwsjE+FNnaSUaMQ2ZQaXnghnZc4xZ3f3oKraGcWMgqpz1IfrWWV1POKRsEXw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" timeago "^1.6.7" -"@abp/utils@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.1.0-rc.2.tgz#86a980c6536b3b5ce185d406723b28be421864ac" - integrity sha512-Oz863VNA8fraQ81vTvqM0IqwiaseLwfFU5QNn6iOGOfn5wQrEkPwtZ0jMI+DGNtJgPzoKiq+iKc3K+SiuVgldg== +"@abp/utils@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.1.0.tgz#ef7f6bf16abb34b77fa57c156b264154827bc0af" + integrity sha512-UDgbvDMbcQklNu+SlQPhkIcIfZoWsQjCCzihanLBiHc474BCOlcTsO6K/EatV9LwqG3zY0mYd0ExAWjH44G0rQ== dependencies: just-compare "^2.3.0" diff --git a/modules/cms-kit/angular/package.json b/modules/cms-kit/angular/package.json index d4bc7712ef..530ccee465 100644 --- a/modules/cms-kit/angular/package.json +++ b/modules/cms-kit/angular/package.json @@ -15,11 +15,11 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~10.1.0-rc.2", - "@abp/ng.identity": "~10.1.0-rc.2", - "@abp/ng.setting-management": "~10.1.0-rc.1", - "@abp/ng.tenant-management": "~10.1.0-rc.2", - "@abp/ng.theme.basic": "~10.1.0-rc.2", + "@abp/ng.account": "~10.1.0", + "@abp/ng.identity": "~10.1.0", + "@abp/ng.setting-management": "~10.1.0", + "@abp/ng.tenant-management": "~10.1.0", + "@abp/ng.theme.basic": "~10.1.0", "@angular/animations": "~10.0.0", "@angular/common": "~10.0.0", "@angular/compiler": "~10.0.0", diff --git a/modules/cms-kit/angular/projects/cms-kit/package.json b/modules/cms-kit/angular/projects/cms-kit/package.json index aa92688cca..b3c89721dd 100644 --- a/modules/cms-kit/angular/projects/cms-kit/package.json +++ b/modules/cms-kit/angular/projects/cms-kit/package.json @@ -4,8 +4,8 @@ "peerDependencies": { "@angular/common": "^9.1.11", "@angular/core": "^9.1.11", - "@abp/ng.core": ">=10.1.0-rc.2", - "@abp/ng.theme.shared": ">=10.1.0-rc.2" + "@abp/ng.core": ">=10.1.0", + "@abp/ng.theme.shared": ">=10.1.0" }, "dependencies": { "tslib": "^2.0.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json index 7588fb2989..0a69024f15 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-identityserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock index a2b6e13b29..1910c85cf1 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock @@ -2,185 +2,185 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.1.0-rc.2.tgz#599f5c47a417d1230fc17c0446a0229f920f7246" - integrity sha512-8F4nEK+VtgRRf8n+66HMbtCEaOMCW/OdbSEWRl9ahMNoj860oPIJ8P8Qn/2+LjtkPMdDAfCdEzyDzCd3igaFaA== +"@abp/aspnetcore.mvc.ui.theme.basic@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.1.0.tgz#94f68982ce8b67b6ac827f824aed3faad50e56e9" + integrity sha512-wqbEANW8CRZ+/7qGNprC828yNN17TsYtFxywL0B+EA2UfUtcTpzR/3ompZd/XcDm3N2NmS1n5Ao3WEn2NJlHgA== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~10.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.shared" "~10.1.0" -"@abp/aspnetcore.mvc.ui.theme.shared@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.1.0-rc.2.tgz#e5056e4e159f5815e3cffecab5c46f3d7d4f79d7" - integrity sha512-bo56XzQZPYL/3ckWTTTSSUsSFSFJobvfE29cz13NIrZ/tBtWyQCAJn92wYHuY+6IezYUWb4ga3PkFeHRzR142A== +"@abp/aspnetcore.mvc.ui.theme.shared@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.1.0.tgz#b89c5d38fdeceda9e421f9357842838be36dce49" + integrity sha512-9QyZ7lYr17thTKxq9WN/KVCxNyYurY5Ph9y3vFBkA3u+uOZcaxdw0T417vy0hJvAB7RGlkpLRTmZL7q5P9FzJA== dependencies: - "@abp/aspnetcore.mvc.ui" "~10.1.0-rc.2" - "@abp/bootstrap" "~10.1.0-rc.2" - "@abp/bootstrap-datepicker" "~10.1.0-rc.2" - "@abp/bootstrap-daterangepicker" "~10.1.0-rc.2" - "@abp/datatables.net-bs5" "~10.1.0-rc.2" - "@abp/font-awesome" "~10.1.0-rc.2" - "@abp/jquery-form" "~10.1.0-rc.2" - "@abp/jquery-validation-unobtrusive" "~10.1.0-rc.2" - "@abp/lodash" "~10.1.0-rc.2" - "@abp/luxon" "~10.1.0-rc.2" - "@abp/malihu-custom-scrollbar-plugin" "~10.1.0-rc.2" - "@abp/moment" "~10.1.0-rc.2" - "@abp/select2" "~10.1.0-rc.2" - "@abp/sweetalert2" "~10.1.0-rc.2" - "@abp/timeago" "~10.1.0-rc.2" - -"@abp/aspnetcore.mvc.ui@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.1.0-rc.2.tgz#e25d3575d40bfcb3f809bd2d355671181ee5ff40" - integrity sha512-MOF86bVbi7N/nIla+361nsBrN4tiSka8xzpWcgqlLcCAl9ILG4rugbtafBAjN81taPma2peZM7egaOR4SDkTMw== + "@abp/aspnetcore.mvc.ui" "~10.1.0" + "@abp/bootstrap" "~10.1.0" + "@abp/bootstrap-datepicker" "~10.1.0" + "@abp/bootstrap-daterangepicker" "~10.1.0" + "@abp/datatables.net-bs5" "~10.1.0" + "@abp/font-awesome" "~10.1.0" + "@abp/jquery-form" "~10.1.0" + "@abp/jquery-validation-unobtrusive" "~10.1.0" + "@abp/lodash" "~10.1.0" + "@abp/luxon" "~10.1.0" + "@abp/malihu-custom-scrollbar-plugin" "~10.1.0" + "@abp/moment" "~10.1.0" + "@abp/select2" "~10.1.0" + "@abp/sweetalert2" "~10.1.0" + "@abp/timeago" "~10.1.0" + +"@abp/aspnetcore.mvc.ui@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.1.0.tgz#79d76232aacb9c8e1762d903f75007d0418bf5a8" + integrity sha512-brVfaSUicZuSuwtizrEcMvtRjFsoAHr9i56HjJZb7bmElr+q5STiul3stRumly4IfoLkYqdy85hMk+B3G0bJDg== dependencies: ansi-colors "^4.1.3" -"@abp/bootstrap-datepicker@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.1.0-rc.2.tgz#be80c6104ba53e18935fbf62ca2c1890f4b2fde4" - integrity sha512-BNcDYUSbZaLah4SfXm0efoqFTsOViVm6370k9L7vix/OGpIWwklJsr8y78lvdM5ANgNCfl0LPSq+seLJFc/OLA== +"@abp/bootstrap-datepicker@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.1.0.tgz#68270ed8cf8e0c23a77331ef2ba6ef2d1da3cefc" + integrity sha512-ahKKHlluo4U1Z238mBNzpL0YaErTPENLQDVLNZB1BnZcUTqz1j7WJHGZoy4j3CXZKt7mnFCRe1+vJMCcwP+DYA== dependencies: bootstrap-datepicker "^1.10.1" -"@abp/bootstrap-daterangepicker@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.1.0-rc.2.tgz#f189f7d070ebd97d9cfdcb99571cab2d6a198ab5" - integrity sha512-bV8J0MuiAFVLkr48JsB6aZU6aPoqw+Gyhq1szQ74bEwNQlRBPuF92WVA5FACaUBj8dMUzR9HDDAYQuxUzpKYKA== +"@abp/bootstrap-daterangepicker@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.1.0.tgz#69f7775eafe7c038c2684d3e990384c8f2966cff" + integrity sha512-mFMaH7GqPn7W5zzIMOOTl4f0at9Vx8da4ewvPU/IvngrTeezMRPC1tofHmiWDhHfZpzF5J9DDMCGul9Q4nOl5A== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.1.0-rc.2.tgz#2300800a29ea09b91f5ed2e6177e5921fe7d2a0f" - integrity sha512-K+tDI9vz/Y9B/yu0i3AVpm4v3Odi44Q/yH5hAprL7f4pGxEOiqAFB/qzHAxG+7Oa7wjv5tPLv+Cz4DavBQjd8Q== +"@abp/bootstrap@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.1.0.tgz#816436ab547fc46d4c00b1facbdd80e3f4f78af1" + integrity sha512-ioqQDOvjXIUWncmLJuTcLPTnlJ3xGxyKXC9veSTJWFd+5pZswK7/QIlAuTvIIujs/7Z13GLunUIMMjny7WFBMw== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" bootstrap "^5.3.8" -"@abp/core@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.1.0-rc.2.tgz#403687aff5a30788f7b7ca660abdfd85d89438aa" - integrity sha512-euuG2Hna/DT6/R1dGOjgp3vcehYtF+CcOkRj31oquYKaM5YWk4OaZ314DSpnjgs/xo8DuVc4eKFQwIxD9RK41w== +"@abp/core@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.1.0.tgz#7cb21012deee5510a0774d982f85627d47b368f4" + integrity sha512-/N0K2NVdk5/OM+Q5JDnpC+0CD0mS4wpDhLO1SIQbMXSTFbplhfPw2SFm7+MvPA9pVx2L8TYAzXmS7CtAJxKvCg== dependencies: - "@abp/utils" "~10.1.0-rc.2" + "@abp/utils" "~10.1.0" -"@abp/datatables.net-bs5@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.1.0-rc.2.tgz#a60650d1802b40751d30f8f6c56beb23fd66481b" - integrity sha512-IWwexNqbMpET54Fvm9LoPTJYf+4CoBbjFOvz3sL6CgO2feV5R5fKigjVU8zXKNh2W+RG8L6zEarfVxrr114TsA== +"@abp/datatables.net-bs5@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.1.0.tgz#ea2a60c22bdcc80882662b9f55f198793f6ea556" + integrity sha512-dPe3bVW3Hfnm/X9Bw5k7TuEIsYYwFk1faC8kIxf2Spk+4Z9TdYFS2zGaHBYStE9iRtKmneNYMykG2O88mX3quA== dependencies: - "@abp/datatables.net" "~10.1.0-rc.2" + "@abp/datatables.net" "~10.1.0" datatables.net-bs5 "^2.3.4" -"@abp/datatables.net@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.1.0-rc.2.tgz#9147f68bc6dbc4eb40a9ddf65c7859e788cdcac2" - integrity sha512-a9DJpwg14S4nVOiC4ipw0CQwEYWB602e2gCJiH7W1mxopbQb135RxwhtdTnW//eIONcxC9IrEuvcBEAUVt2B7Q== +"@abp/datatables.net@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.1.0.tgz#7fe641883e6d1417c86a030481777a75c9a5a555" + integrity sha512-p9S/ZaJ4OXpihTOWIxsSQ0s3G4S+ScQLD+Q+w0NrWbUa7HTKg9tdqSh6VDhyW9KZ/iiLUO5jNzsAFXyUjjDQuw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" datatables.net "^2.3.4" -"@abp/font-awesome@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.1.0-rc.2.tgz#364466cfe67e41e0c4d16b57d3923d10f66369f1" - integrity sha512-F1Jy8xoFV2aA+VN+NH1gtrG96/j9w7Picc+KLoCoIyNnJr/xJur11XkJyu5ln8KF4V7p/DY7QaQodWV/btOs8g== +"@abp/font-awesome@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.1.0.tgz#79c5b7eb9a85467b0078b9f9bf201493fc3de358" + integrity sha512-dm4VRtZnvm5p8mYQys9KWLkQ+JdwPahQSan2DV1s5Rq4P96hk8p8VshZu7pI3iE0MS+rSZnXYvetZrqCdt1mOQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" "@fortawesome/fontawesome-free" "^7.0.1" -"@abp/jquery-form@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.1.0-rc.2.tgz#3857717d07569c22d4bbbe459238abeb816d606a" - integrity sha512-2D5WHVnfK9bhRces1tgPwOEoc7KCYKYiKHBOcqct+LTA7zoRjJv/PM8/JhFVl+grVIw1aSwO4tU3YfZ22Vxipg== +"@abp/jquery-form@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.1.0.tgz#7c19605eb103519fea332d0f153cac185b7f2ebb" + integrity sha512-ddlapZqFVwpXU3uDi/RnQ6uSpseMxPAKE+/LgLF+SVyPzazNFognxPT3ztzqTk84P/gFleNgNjAfUlKrfyIfGw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.1.0-rc.2.tgz#efd7b69a078a20c0bf405408dbdf52a7bf770b3b" - integrity sha512-tZ0MWgzBqp+SNfMxM0z2cGB21NiTHuVJyyQaXKE/ptuD5pc0uRkcqw/J2kWfiqsoVgChz27IB6h8/jqDafS4qg== +"@abp/jquery-validation-unobtrusive@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.1.0.tgz#13aa462c4347d3459541a9a9ea19a60458805328" + integrity sha512-94smwn/W3d+gkX2UKH+/OiB7poKDP1ZK0DqWiiH4BGGmpRk9j3B+eJxPbL86dwNG4XT8upuX3ZOrUb6Fy2SA3A== dependencies: - "@abp/jquery-validation" "~10.1.0-rc.2" + "@abp/jquery-validation" "~10.1.0" jquery-validation-unobtrusive "^4.0.0" -"@abp/jquery-validation@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.1.0-rc.2.tgz#d39537a7356c51f9db2e66f6740cf6df86bd0442" - integrity sha512-LOkS0NKk4pLtLjPU0CCbwROyUg6EtJN8Z/it7QuKK1CIRfYYcAStgNnNm5geZP7CqECIkoiFfgWjI+L5Z9/Tfg== +"@abp/jquery-validation@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.1.0.tgz#5389785f5ff359ecd6291889420d6c2f84e633aa" + integrity sha512-/X5smp0xpNqCM+BuLI9eEyMPQ0uF42hmEfBvCIfWWBhfp7uFfq7sS706QcGfXYqFdpprRYoUJGKDfSaHxPaJUA== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" jquery-validation "^1.21.0" -"@abp/jquery@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.1.0-rc.2.tgz#101a55f70d510978c8c05f5857d0e9d4965263f7" - integrity sha512-bQV1uFWGtwRYjNOsqJ8FM2004idX2Jj7YVL19YF1/PjyPUSMX+s8/IvJizBjyY5hPAiWBBhmV9g+IFWzxlDQoQ== +"@abp/jquery@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.1.0.tgz#d8812a7d410ad959a1ed27696beb9b7885142684" + integrity sha512-cVF2hOP6GGp0N3VMBOFjEHuHFgXbDH8x0d7Agw4DN2ydFU8wYuj3m9u0HCc0aoBG6Zls90tMpTfM0RqDNFgCKA== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" jquery "~3.7.1" -"@abp/lodash@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.1.0-rc.2.tgz#d08c03f8d3d0fbaa3e71e603cbe5fb7f176933ef" - integrity sha512-KCnD1p2y52ZI+2ifpiFIUAiDPsKehnOD8HV5qKeObO6UCP97okif8IP+sQDmNQb8O33y/NKTyx/HcpwBbe/NYQ== +"@abp/lodash@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.1.0.tgz#fdebe764d1142abfd3ecdeef56aa33746e31815b" + integrity sha512-r4WwpqLFFQi721edd8XF5wueAdqEvx75dmRlEuhZoIBA6RQ0yYjTRMNWjTOlIEzFDGj7XrisV5CSUQ9BhhuS+Q== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" lodash "^4.17.21" -"@abp/luxon@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.1.0-rc.2.tgz#ef8d2b323bac054fc9610e241e1b1763d229e065" - integrity sha512-qYFl6XO3g9mZiu0dtIczI7LRuYWwc+RkpbDzSmruXcRks3KA+ZZco2vhHNnlwtXcINl/TXtbW7Wc0MX+8IB1Kw== +"@abp/luxon@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.1.0.tgz#c80cdb1a85e9cc824946dc0009df0daba384a4ca" + integrity sha512-slwiGSrevvWZrBhuy9sw7UP6akk2Ln9eAY3nxxo8xzE7C7uezcNk12dbKN4psdSAVpbDwuqC3GGrkmcFL+6sBQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" luxon "^3.7.2" -"@abp/malihu-custom-scrollbar-plugin@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.1.0-rc.2.tgz#dfaf666442c7c122f7da72c83b9adf194d5b6ec8" - integrity sha512-PudMHmNQgZ6JZeaVt1ZoXLqO0UZXJzUYiBah2LDkC4EMLjnMJFINHBoEVVa4ooXH0yjFv+zsbN0vWZYJ8TBJIA== +"@abp/malihu-custom-scrollbar-plugin@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.1.0.tgz#d257e83b7cc1af89a708e365eef7af0136ccebcf" + integrity sha512-+h8hoYUkjcYBdm/M3b8c3CeE5WNU8K6kQ5MwQXNaaGLCvwEmZHy0A6+U8yxtKv2eRRhAkAqOkQyWYRWA5w1XzQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.1.0-rc.2.tgz#610a1592d13984aea51abbd13df8c5995a089149" - integrity sha512-ep8PnAXARw0t/wtGOVp/oiNhF3B0Bh6y2vRzKrcSoyXAQREGGm4fJdZVYZLGTfI4lFLTjebEgf4O7T9feUwJAw== +"@abp/moment@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.1.0.tgz#5755e4e10a7302e2832b1a1ce571f20b27600303" + integrity sha512-faHV7vmPEjFUJTRNTTlmnpx0VZuyvQt4O98WBLAjPdcqpLfWazdS9Ro405St5liIkgvmAXWsrwVmZb0VKTLcNA== dependencies: moment "^2.30.1" -"@abp/select2@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.1.0-rc.2.tgz#40c5418d007fc36817eecbe6388d767e4e7ca887" - integrity sha512-Pq0wlpL01sWRLUg5um3JtBXIqi3mmbwPwvgxP8hFbQngAt9JXAK8geNRiTMrIZgtW/ycXtM1v6I4zuWOLOeAGg== +"@abp/select2@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.1.0.tgz#8b15954e462e65329b8eb481226170df6d55d36a" + integrity sha512-7+1GirZe4i/2/LR4jZgWhiN6lFHhClLtUmrdCjh7FeeuBvy5GGA417DybDihna/GzlcOVI4GHnn2fjEwcFqJiw== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" select2 "^4.0.13" -"@abp/sweetalert2@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.1.0-rc.2.tgz#d35858c69e10c6726b02cdfcea88dfc32385963f" - integrity sha512-s9VPRToohN45uzHcKCF5Mcj8FVjsXcXUb0U3tuaT/Y+u4adHB3fBxYiXJFM0sVsCJ81dFktxwka40Wm8Taz/zA== +"@abp/sweetalert2@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.1.0.tgz#6997cb7909671f9deddaea53f17ed054aab27cd3" + integrity sha512-vlkH+DkuQBvOqnDPqTtyZ5mHb+GfIR/QJBXI7yrS62ML+ZNqkg0vXftCrm4aAR2kPmvgYsbUOJcKJAmgydcOEQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" sweetalert2 "^11.23.0" -"@abp/timeago@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.1.0-rc.2.tgz#98d630cc3843eee64dbcc34fb8ca5afbab034718" - integrity sha512-vJmk+otyXXJE2s2J8iYpLVaFuNAYnIUSOitmi7umYnL+k/UE2KQhBXU7FR0/OBY9mAZYd+shaiGIU1LMSaJ+Xg== +"@abp/timeago@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.1.0.tgz#45c1e8b1451e31910e330053981a871787fe02f1" + integrity sha512-3RVMlBbOepa4WBTLthRmf2VddkNwsjE+FNnaSUaMQ2ZQaXnghnZc4xZ3f3oKraGcWMgqpz1IfrWWV1POKRsEXw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" timeago "^1.6.7" -"@abp/utils@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.1.0-rc.2.tgz#86a980c6536b3b5ce185d406723b28be421864ac" - integrity sha512-Oz863VNA8fraQ81vTvqM0IqwiaseLwfFU5QNn6iOGOfn5wQrEkPwtZ0jMI+DGNtJgPzoKiq+iKc3K+SiuVgldg== +"@abp/utils@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.1.0.tgz#ef7f6bf16abb34b77fa57c156b264154827bc0af" + integrity sha512-UDgbvDMbcQklNu+SlQPhkIcIfZoWsQjCCzihanLBiHc474BCOlcTsO6K/EatV9LwqG3zY0mYd0ExAWjH44G0rQ== dependencies: just-compare "^2.3.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json index 52a1fc6c21..e544c427a0 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock index a2b6e13b29..1910c85cf1 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock @@ -2,185 +2,185 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.1.0-rc.2.tgz#599f5c47a417d1230fc17c0446a0229f920f7246" - integrity sha512-8F4nEK+VtgRRf8n+66HMbtCEaOMCW/OdbSEWRl9ahMNoj860oPIJ8P8Qn/2+LjtkPMdDAfCdEzyDzCd3igaFaA== +"@abp/aspnetcore.mvc.ui.theme.basic@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.1.0.tgz#94f68982ce8b67b6ac827f824aed3faad50e56e9" + integrity sha512-wqbEANW8CRZ+/7qGNprC828yNN17TsYtFxywL0B+EA2UfUtcTpzR/3ompZd/XcDm3N2NmS1n5Ao3WEn2NJlHgA== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~10.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.shared" "~10.1.0" -"@abp/aspnetcore.mvc.ui.theme.shared@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.1.0-rc.2.tgz#e5056e4e159f5815e3cffecab5c46f3d7d4f79d7" - integrity sha512-bo56XzQZPYL/3ckWTTTSSUsSFSFJobvfE29cz13NIrZ/tBtWyQCAJn92wYHuY+6IezYUWb4ga3PkFeHRzR142A== +"@abp/aspnetcore.mvc.ui.theme.shared@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.1.0.tgz#b89c5d38fdeceda9e421f9357842838be36dce49" + integrity sha512-9QyZ7lYr17thTKxq9WN/KVCxNyYurY5Ph9y3vFBkA3u+uOZcaxdw0T417vy0hJvAB7RGlkpLRTmZL7q5P9FzJA== dependencies: - "@abp/aspnetcore.mvc.ui" "~10.1.0-rc.2" - "@abp/bootstrap" "~10.1.0-rc.2" - "@abp/bootstrap-datepicker" "~10.1.0-rc.2" - "@abp/bootstrap-daterangepicker" "~10.1.0-rc.2" - "@abp/datatables.net-bs5" "~10.1.0-rc.2" - "@abp/font-awesome" "~10.1.0-rc.2" - "@abp/jquery-form" "~10.1.0-rc.2" - "@abp/jquery-validation-unobtrusive" "~10.1.0-rc.2" - "@abp/lodash" "~10.1.0-rc.2" - "@abp/luxon" "~10.1.0-rc.2" - "@abp/malihu-custom-scrollbar-plugin" "~10.1.0-rc.2" - "@abp/moment" "~10.1.0-rc.2" - "@abp/select2" "~10.1.0-rc.2" - "@abp/sweetalert2" "~10.1.0-rc.2" - "@abp/timeago" "~10.1.0-rc.2" - -"@abp/aspnetcore.mvc.ui@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.1.0-rc.2.tgz#e25d3575d40bfcb3f809bd2d355671181ee5ff40" - integrity sha512-MOF86bVbi7N/nIla+361nsBrN4tiSka8xzpWcgqlLcCAl9ILG4rugbtafBAjN81taPma2peZM7egaOR4SDkTMw== + "@abp/aspnetcore.mvc.ui" "~10.1.0" + "@abp/bootstrap" "~10.1.0" + "@abp/bootstrap-datepicker" "~10.1.0" + "@abp/bootstrap-daterangepicker" "~10.1.0" + "@abp/datatables.net-bs5" "~10.1.0" + "@abp/font-awesome" "~10.1.0" + "@abp/jquery-form" "~10.1.0" + "@abp/jquery-validation-unobtrusive" "~10.1.0" + "@abp/lodash" "~10.1.0" + "@abp/luxon" "~10.1.0" + "@abp/malihu-custom-scrollbar-plugin" "~10.1.0" + "@abp/moment" "~10.1.0" + "@abp/select2" "~10.1.0" + "@abp/sweetalert2" "~10.1.0" + "@abp/timeago" "~10.1.0" + +"@abp/aspnetcore.mvc.ui@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.1.0.tgz#79d76232aacb9c8e1762d903f75007d0418bf5a8" + integrity sha512-brVfaSUicZuSuwtizrEcMvtRjFsoAHr9i56HjJZb7bmElr+q5STiul3stRumly4IfoLkYqdy85hMk+B3G0bJDg== dependencies: ansi-colors "^4.1.3" -"@abp/bootstrap-datepicker@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.1.0-rc.2.tgz#be80c6104ba53e18935fbf62ca2c1890f4b2fde4" - integrity sha512-BNcDYUSbZaLah4SfXm0efoqFTsOViVm6370k9L7vix/OGpIWwklJsr8y78lvdM5ANgNCfl0LPSq+seLJFc/OLA== +"@abp/bootstrap-datepicker@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.1.0.tgz#68270ed8cf8e0c23a77331ef2ba6ef2d1da3cefc" + integrity sha512-ahKKHlluo4U1Z238mBNzpL0YaErTPENLQDVLNZB1BnZcUTqz1j7WJHGZoy4j3CXZKt7mnFCRe1+vJMCcwP+DYA== dependencies: bootstrap-datepicker "^1.10.1" -"@abp/bootstrap-daterangepicker@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.1.0-rc.2.tgz#f189f7d070ebd97d9cfdcb99571cab2d6a198ab5" - integrity sha512-bV8J0MuiAFVLkr48JsB6aZU6aPoqw+Gyhq1szQ74bEwNQlRBPuF92WVA5FACaUBj8dMUzR9HDDAYQuxUzpKYKA== +"@abp/bootstrap-daterangepicker@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.1.0.tgz#69f7775eafe7c038c2684d3e990384c8f2966cff" + integrity sha512-mFMaH7GqPn7W5zzIMOOTl4f0at9Vx8da4ewvPU/IvngrTeezMRPC1tofHmiWDhHfZpzF5J9DDMCGul9Q4nOl5A== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.1.0-rc.2.tgz#2300800a29ea09b91f5ed2e6177e5921fe7d2a0f" - integrity sha512-K+tDI9vz/Y9B/yu0i3AVpm4v3Odi44Q/yH5hAprL7f4pGxEOiqAFB/qzHAxG+7Oa7wjv5tPLv+Cz4DavBQjd8Q== +"@abp/bootstrap@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.1.0.tgz#816436ab547fc46d4c00b1facbdd80e3f4f78af1" + integrity sha512-ioqQDOvjXIUWncmLJuTcLPTnlJ3xGxyKXC9veSTJWFd+5pZswK7/QIlAuTvIIujs/7Z13GLunUIMMjny7WFBMw== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" bootstrap "^5.3.8" -"@abp/core@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.1.0-rc.2.tgz#403687aff5a30788f7b7ca660abdfd85d89438aa" - integrity sha512-euuG2Hna/DT6/R1dGOjgp3vcehYtF+CcOkRj31oquYKaM5YWk4OaZ314DSpnjgs/xo8DuVc4eKFQwIxD9RK41w== +"@abp/core@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.1.0.tgz#7cb21012deee5510a0774d982f85627d47b368f4" + integrity sha512-/N0K2NVdk5/OM+Q5JDnpC+0CD0mS4wpDhLO1SIQbMXSTFbplhfPw2SFm7+MvPA9pVx2L8TYAzXmS7CtAJxKvCg== dependencies: - "@abp/utils" "~10.1.0-rc.2" + "@abp/utils" "~10.1.0" -"@abp/datatables.net-bs5@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.1.0-rc.2.tgz#a60650d1802b40751d30f8f6c56beb23fd66481b" - integrity sha512-IWwexNqbMpET54Fvm9LoPTJYf+4CoBbjFOvz3sL6CgO2feV5R5fKigjVU8zXKNh2W+RG8L6zEarfVxrr114TsA== +"@abp/datatables.net-bs5@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.1.0.tgz#ea2a60c22bdcc80882662b9f55f198793f6ea556" + integrity sha512-dPe3bVW3Hfnm/X9Bw5k7TuEIsYYwFk1faC8kIxf2Spk+4Z9TdYFS2zGaHBYStE9iRtKmneNYMykG2O88mX3quA== dependencies: - "@abp/datatables.net" "~10.1.0-rc.2" + "@abp/datatables.net" "~10.1.0" datatables.net-bs5 "^2.3.4" -"@abp/datatables.net@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.1.0-rc.2.tgz#9147f68bc6dbc4eb40a9ddf65c7859e788cdcac2" - integrity sha512-a9DJpwg14S4nVOiC4ipw0CQwEYWB602e2gCJiH7W1mxopbQb135RxwhtdTnW//eIONcxC9IrEuvcBEAUVt2B7Q== +"@abp/datatables.net@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.1.0.tgz#7fe641883e6d1417c86a030481777a75c9a5a555" + integrity sha512-p9S/ZaJ4OXpihTOWIxsSQ0s3G4S+ScQLD+Q+w0NrWbUa7HTKg9tdqSh6VDhyW9KZ/iiLUO5jNzsAFXyUjjDQuw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" datatables.net "^2.3.4" -"@abp/font-awesome@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.1.0-rc.2.tgz#364466cfe67e41e0c4d16b57d3923d10f66369f1" - integrity sha512-F1Jy8xoFV2aA+VN+NH1gtrG96/j9w7Picc+KLoCoIyNnJr/xJur11XkJyu5ln8KF4V7p/DY7QaQodWV/btOs8g== +"@abp/font-awesome@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.1.0.tgz#79c5b7eb9a85467b0078b9f9bf201493fc3de358" + integrity sha512-dm4VRtZnvm5p8mYQys9KWLkQ+JdwPahQSan2DV1s5Rq4P96hk8p8VshZu7pI3iE0MS+rSZnXYvetZrqCdt1mOQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" "@fortawesome/fontawesome-free" "^7.0.1" -"@abp/jquery-form@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.1.0-rc.2.tgz#3857717d07569c22d4bbbe459238abeb816d606a" - integrity sha512-2D5WHVnfK9bhRces1tgPwOEoc7KCYKYiKHBOcqct+LTA7zoRjJv/PM8/JhFVl+grVIw1aSwO4tU3YfZ22Vxipg== +"@abp/jquery-form@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.1.0.tgz#7c19605eb103519fea332d0f153cac185b7f2ebb" + integrity sha512-ddlapZqFVwpXU3uDi/RnQ6uSpseMxPAKE+/LgLF+SVyPzazNFognxPT3ztzqTk84P/gFleNgNjAfUlKrfyIfGw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.1.0-rc.2.tgz#efd7b69a078a20c0bf405408dbdf52a7bf770b3b" - integrity sha512-tZ0MWgzBqp+SNfMxM0z2cGB21NiTHuVJyyQaXKE/ptuD5pc0uRkcqw/J2kWfiqsoVgChz27IB6h8/jqDafS4qg== +"@abp/jquery-validation-unobtrusive@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.1.0.tgz#13aa462c4347d3459541a9a9ea19a60458805328" + integrity sha512-94smwn/W3d+gkX2UKH+/OiB7poKDP1ZK0DqWiiH4BGGmpRk9j3B+eJxPbL86dwNG4XT8upuX3ZOrUb6Fy2SA3A== dependencies: - "@abp/jquery-validation" "~10.1.0-rc.2" + "@abp/jquery-validation" "~10.1.0" jquery-validation-unobtrusive "^4.0.0" -"@abp/jquery-validation@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.1.0-rc.2.tgz#d39537a7356c51f9db2e66f6740cf6df86bd0442" - integrity sha512-LOkS0NKk4pLtLjPU0CCbwROyUg6EtJN8Z/it7QuKK1CIRfYYcAStgNnNm5geZP7CqECIkoiFfgWjI+L5Z9/Tfg== +"@abp/jquery-validation@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.1.0.tgz#5389785f5ff359ecd6291889420d6c2f84e633aa" + integrity sha512-/X5smp0xpNqCM+BuLI9eEyMPQ0uF42hmEfBvCIfWWBhfp7uFfq7sS706QcGfXYqFdpprRYoUJGKDfSaHxPaJUA== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" jquery-validation "^1.21.0" -"@abp/jquery@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.1.0-rc.2.tgz#101a55f70d510978c8c05f5857d0e9d4965263f7" - integrity sha512-bQV1uFWGtwRYjNOsqJ8FM2004idX2Jj7YVL19YF1/PjyPUSMX+s8/IvJizBjyY5hPAiWBBhmV9g+IFWzxlDQoQ== +"@abp/jquery@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.1.0.tgz#d8812a7d410ad959a1ed27696beb9b7885142684" + integrity sha512-cVF2hOP6GGp0N3VMBOFjEHuHFgXbDH8x0d7Agw4DN2ydFU8wYuj3m9u0HCc0aoBG6Zls90tMpTfM0RqDNFgCKA== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" jquery "~3.7.1" -"@abp/lodash@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.1.0-rc.2.tgz#d08c03f8d3d0fbaa3e71e603cbe5fb7f176933ef" - integrity sha512-KCnD1p2y52ZI+2ifpiFIUAiDPsKehnOD8HV5qKeObO6UCP97okif8IP+sQDmNQb8O33y/NKTyx/HcpwBbe/NYQ== +"@abp/lodash@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.1.0.tgz#fdebe764d1142abfd3ecdeef56aa33746e31815b" + integrity sha512-r4WwpqLFFQi721edd8XF5wueAdqEvx75dmRlEuhZoIBA6RQ0yYjTRMNWjTOlIEzFDGj7XrisV5CSUQ9BhhuS+Q== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" lodash "^4.17.21" -"@abp/luxon@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.1.0-rc.2.tgz#ef8d2b323bac054fc9610e241e1b1763d229e065" - integrity sha512-qYFl6XO3g9mZiu0dtIczI7LRuYWwc+RkpbDzSmruXcRks3KA+ZZco2vhHNnlwtXcINl/TXtbW7Wc0MX+8IB1Kw== +"@abp/luxon@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.1.0.tgz#c80cdb1a85e9cc824946dc0009df0daba384a4ca" + integrity sha512-slwiGSrevvWZrBhuy9sw7UP6akk2Ln9eAY3nxxo8xzE7C7uezcNk12dbKN4psdSAVpbDwuqC3GGrkmcFL+6sBQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" luxon "^3.7.2" -"@abp/malihu-custom-scrollbar-plugin@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.1.0-rc.2.tgz#dfaf666442c7c122f7da72c83b9adf194d5b6ec8" - integrity sha512-PudMHmNQgZ6JZeaVt1ZoXLqO0UZXJzUYiBah2LDkC4EMLjnMJFINHBoEVVa4ooXH0yjFv+zsbN0vWZYJ8TBJIA== +"@abp/malihu-custom-scrollbar-plugin@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.1.0.tgz#d257e83b7cc1af89a708e365eef7af0136ccebcf" + integrity sha512-+h8hoYUkjcYBdm/M3b8c3CeE5WNU8K6kQ5MwQXNaaGLCvwEmZHy0A6+U8yxtKv2eRRhAkAqOkQyWYRWA5w1XzQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.1.0-rc.2.tgz#610a1592d13984aea51abbd13df8c5995a089149" - integrity sha512-ep8PnAXARw0t/wtGOVp/oiNhF3B0Bh6y2vRzKrcSoyXAQREGGm4fJdZVYZLGTfI4lFLTjebEgf4O7T9feUwJAw== +"@abp/moment@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.1.0.tgz#5755e4e10a7302e2832b1a1ce571f20b27600303" + integrity sha512-faHV7vmPEjFUJTRNTTlmnpx0VZuyvQt4O98WBLAjPdcqpLfWazdS9Ro405St5liIkgvmAXWsrwVmZb0VKTLcNA== dependencies: moment "^2.30.1" -"@abp/select2@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.1.0-rc.2.tgz#40c5418d007fc36817eecbe6388d767e4e7ca887" - integrity sha512-Pq0wlpL01sWRLUg5um3JtBXIqi3mmbwPwvgxP8hFbQngAt9JXAK8geNRiTMrIZgtW/ycXtM1v6I4zuWOLOeAGg== +"@abp/select2@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.1.0.tgz#8b15954e462e65329b8eb481226170df6d55d36a" + integrity sha512-7+1GirZe4i/2/LR4jZgWhiN6lFHhClLtUmrdCjh7FeeuBvy5GGA417DybDihna/GzlcOVI4GHnn2fjEwcFqJiw== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" select2 "^4.0.13" -"@abp/sweetalert2@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.1.0-rc.2.tgz#d35858c69e10c6726b02cdfcea88dfc32385963f" - integrity sha512-s9VPRToohN45uzHcKCF5Mcj8FVjsXcXUb0U3tuaT/Y+u4adHB3fBxYiXJFM0sVsCJ81dFktxwka40Wm8Taz/zA== +"@abp/sweetalert2@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.1.0.tgz#6997cb7909671f9deddaea53f17ed054aab27cd3" + integrity sha512-vlkH+DkuQBvOqnDPqTtyZ5mHb+GfIR/QJBXI7yrS62ML+ZNqkg0vXftCrm4aAR2kPmvgYsbUOJcKJAmgydcOEQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" sweetalert2 "^11.23.0" -"@abp/timeago@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.1.0-rc.2.tgz#98d630cc3843eee64dbcc34fb8ca5afbab034718" - integrity sha512-vJmk+otyXXJE2s2J8iYpLVaFuNAYnIUSOitmi7umYnL+k/UE2KQhBXU7FR0/OBY9mAZYd+shaiGIU1LMSaJ+Xg== +"@abp/timeago@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.1.0.tgz#45c1e8b1451e31910e330053981a871787fe02f1" + integrity sha512-3RVMlBbOepa4WBTLthRmf2VddkNwsjE+FNnaSUaMQ2ZQaXnghnZc4xZ3f3oKraGcWMgqpz1IfrWWV1POKRsEXw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" timeago "^1.6.7" -"@abp/utils@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.1.0-rc.2.tgz#86a980c6536b3b5ce185d406723b28be421864ac" - integrity sha512-Oz863VNA8fraQ81vTvqM0IqwiaseLwfFU5QNn6iOGOfn5wQrEkPwtZ0jMI+DGNtJgPzoKiq+iKc3K+SiuVgldg== +"@abp/utils@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.1.0.tgz#ef7f6bf16abb34b77fa57c156b264154827bc0af" + integrity sha512-UDgbvDMbcQklNu+SlQPhkIcIfZoWsQjCCzihanLBiHc474BCOlcTsO6K/EatV9LwqG3zY0mYd0ExAWjH44G0rQ== dependencies: just-compare "^2.3.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json index 882508c4e3..a73a3b9523 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0-rc.2", - "@abp/cms-kit": "10.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0", + "@abp/cms-kit": "10.1.0" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock index 97b79e0912..e4a8c88818 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock @@ -2,293 +2,293 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.1.0-rc.2.tgz#599f5c47a417d1230fc17c0446a0229f920f7246" - integrity sha512-8F4nEK+VtgRRf8n+66HMbtCEaOMCW/OdbSEWRl9ahMNoj860oPIJ8P8Qn/2+LjtkPMdDAfCdEzyDzCd3igaFaA== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~10.1.0-rc.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.1.0-rc.2.tgz#e5056e4e159f5815e3cffecab5c46f3d7d4f79d7" - integrity sha512-bo56XzQZPYL/3ckWTTTSSUsSFSFJobvfE29cz13NIrZ/tBtWyQCAJn92wYHuY+6IezYUWb4ga3PkFeHRzR142A== - dependencies: - "@abp/aspnetcore.mvc.ui" "~10.1.0-rc.2" - "@abp/bootstrap" "~10.1.0-rc.2" - "@abp/bootstrap-datepicker" "~10.1.0-rc.2" - "@abp/bootstrap-daterangepicker" "~10.1.0-rc.2" - "@abp/datatables.net-bs5" "~10.1.0-rc.2" - "@abp/font-awesome" "~10.1.0-rc.2" - "@abp/jquery-form" "~10.1.0-rc.2" - "@abp/jquery-validation-unobtrusive" "~10.1.0-rc.2" - "@abp/lodash" "~10.1.0-rc.2" - "@abp/luxon" "~10.1.0-rc.2" - "@abp/malihu-custom-scrollbar-plugin" "~10.1.0-rc.2" - "@abp/moment" "~10.1.0-rc.2" - "@abp/select2" "~10.1.0-rc.2" - "@abp/sweetalert2" "~10.1.0-rc.2" - "@abp/timeago" "~10.1.0-rc.2" - -"@abp/aspnetcore.mvc.ui@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.1.0-rc.2.tgz#e25d3575d40bfcb3f809bd2d355671181ee5ff40" - integrity sha512-MOF86bVbi7N/nIla+361nsBrN4tiSka8xzpWcgqlLcCAl9ILG4rugbtafBAjN81taPma2peZM7egaOR4SDkTMw== +"@abp/aspnetcore.mvc.ui.theme.basic@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.1.0.tgz#94f68982ce8b67b6ac827f824aed3faad50e56e9" + integrity sha512-wqbEANW8CRZ+/7qGNprC828yNN17TsYtFxywL0B+EA2UfUtcTpzR/3ompZd/XcDm3N2NmS1n5Ao3WEn2NJlHgA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~10.1.0" + +"@abp/aspnetcore.mvc.ui.theme.shared@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.1.0.tgz#b89c5d38fdeceda9e421f9357842838be36dce49" + integrity sha512-9QyZ7lYr17thTKxq9WN/KVCxNyYurY5Ph9y3vFBkA3u+uOZcaxdw0T417vy0hJvAB7RGlkpLRTmZL7q5P9FzJA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~10.1.0" + "@abp/bootstrap" "~10.1.0" + "@abp/bootstrap-datepicker" "~10.1.0" + "@abp/bootstrap-daterangepicker" "~10.1.0" + "@abp/datatables.net-bs5" "~10.1.0" + "@abp/font-awesome" "~10.1.0" + "@abp/jquery-form" "~10.1.0" + "@abp/jquery-validation-unobtrusive" "~10.1.0" + "@abp/lodash" "~10.1.0" + "@abp/luxon" "~10.1.0" + "@abp/malihu-custom-scrollbar-plugin" "~10.1.0" + "@abp/moment" "~10.1.0" + "@abp/select2" "~10.1.0" + "@abp/sweetalert2" "~10.1.0" + "@abp/timeago" "~10.1.0" + +"@abp/aspnetcore.mvc.ui@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.1.0.tgz#79d76232aacb9c8e1762d903f75007d0418bf5a8" + integrity sha512-brVfaSUicZuSuwtizrEcMvtRjFsoAHr9i56HjJZb7bmElr+q5STiul3stRumly4IfoLkYqdy85hMk+B3G0bJDg== dependencies: ansi-colors "^4.1.3" -"@abp/bootstrap-datepicker@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.1.0-rc.2.tgz#be80c6104ba53e18935fbf62ca2c1890f4b2fde4" - integrity sha512-BNcDYUSbZaLah4SfXm0efoqFTsOViVm6370k9L7vix/OGpIWwklJsr8y78lvdM5ANgNCfl0LPSq+seLJFc/OLA== +"@abp/bootstrap-datepicker@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.1.0.tgz#68270ed8cf8e0c23a77331ef2ba6ef2d1da3cefc" + integrity sha512-ahKKHlluo4U1Z238mBNzpL0YaErTPENLQDVLNZB1BnZcUTqz1j7WJHGZoy4j3CXZKt7mnFCRe1+vJMCcwP+DYA== dependencies: bootstrap-datepicker "^1.10.1" -"@abp/bootstrap-daterangepicker@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.1.0-rc.2.tgz#f189f7d070ebd97d9cfdcb99571cab2d6a198ab5" - integrity sha512-bV8J0MuiAFVLkr48JsB6aZU6aPoqw+Gyhq1szQ74bEwNQlRBPuF92WVA5FACaUBj8dMUzR9HDDAYQuxUzpKYKA== +"@abp/bootstrap-daterangepicker@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.1.0.tgz#69f7775eafe7c038c2684d3e990384c8f2966cff" + integrity sha512-mFMaH7GqPn7W5zzIMOOTl4f0at9Vx8da4ewvPU/IvngrTeezMRPC1tofHmiWDhHfZpzF5J9DDMCGul9Q4nOl5A== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.1.0-rc.2.tgz#2300800a29ea09b91f5ed2e6177e5921fe7d2a0f" - integrity sha512-K+tDI9vz/Y9B/yu0i3AVpm4v3Odi44Q/yH5hAprL7f4pGxEOiqAFB/qzHAxG+7Oa7wjv5tPLv+Cz4DavBQjd8Q== +"@abp/bootstrap@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.1.0.tgz#816436ab547fc46d4c00b1facbdd80e3f4f78af1" + integrity sha512-ioqQDOvjXIUWncmLJuTcLPTnlJ3xGxyKXC9veSTJWFd+5pZswK7/QIlAuTvIIujs/7Z13GLunUIMMjny7WFBMw== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" bootstrap "^5.3.8" -"@abp/clipboard@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-10.1.0-rc.2.tgz#e99dbf190e3684e99c8e909bf38201c70e267502" - integrity sha512-kRS9pWc1jRgr4D4/EV9zdAy3rhhGBrcqk2as5+6Ih49npsEJY/cF5mYH7mj/ZYy8SHqtae/CR7bZsR+uCDKYrQ== +"@abp/clipboard@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-10.1.0.tgz#a59b14370b99fd7df447250b293fd7ac3f8c1a51" + integrity sha512-OulNwy9vhASO8TJ+m0ql6/iXNflE59oGUNAW+qzcaxaazre1mVPahPMBoLSVuOAGtAjLZAN4SWCOC5r3tLt9pA== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" clipboard "^2.0.11" -"@abp/cms-kit.admin@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-10.1.0-rc.2.tgz#554d15856007e80cc2994d57612d08e3d6747e3e" - integrity sha512-mi9m4Nr51wyq/EN8DRMT/QlSqgIwD7WKDDSO80Tylr46r5A7wiGbgNIyy+hnHCR9IbORpTRv8VjMTtkjF7CRPA== +"@abp/cms-kit.admin@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-10.1.0.tgz#4dda82b946ad9b94ffdeb12f399ec3294dbf5dc2" + integrity sha512-edWNeHnwPb9ZlV+EIcASAOXk/gJxekDEC5X2R6Mx5m9zq2oq4yoJj5/ZBlvekxnm6CRgXhUn3RYX4+h9qExTzQ== dependencies: - "@abp/codemirror" "~10.1.0-rc.2" - "@abp/jstree" "~10.1.0-rc.2" - "@abp/markdown-it" "~10.1.0-rc.2" - "@abp/slugify" "~10.1.0-rc.2" - "@abp/tui-editor" "~10.1.0-rc.2" - "@abp/uppy" "~10.1.0-rc.2" + "@abp/codemirror" "~10.1.0" + "@abp/jstree" "~10.1.0" + "@abp/markdown-it" "~10.1.0" + "@abp/slugify" "~10.1.0" + "@abp/tui-editor" "~10.1.0" + "@abp/uppy" "~10.1.0" -"@abp/cms-kit.public@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-10.1.0-rc.2.tgz#1e25575fa7dde2661970942c868250f749ffcf7e" - integrity sha512-BbEL17D0k44+P1pBfmrRwhwukXqbggprl8DWBofBkPut1HUmo1iaD4NrMEG5NZC03L8LRDVNm3hx2zI1voF9Sg== +"@abp/cms-kit.public@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-10.1.0.tgz#ad84ccfe4508a64c62e628392f9c317e49a6bec4" + integrity sha512-6bLdv75EaRS1R08tHITXmO805u84EHG32IczgcWKzewaloUeYJear1Gucezt0SpVOzAHW9fkHzC9LAnQM+8nVQ== dependencies: - "@abp/highlight.js" "~10.1.0-rc.2" - "@abp/star-rating-svg" "~10.1.0-rc.2" + "@abp/highlight.js" "~10.1.0" + "@abp/star-rating-svg" "~10.1.0" -"@abp/cms-kit@10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-10.1.0-rc.2.tgz#18d0818a07a530fccb23fa082db24e439854e94a" - integrity sha512-cwraU613er9EybLoU9wXiqfFFBjSyk/DnbZkAviavOLg+QRTFdDoJEVTPpNn6WCXc1oS5/LPuu/744MrGixYyw== +"@abp/cms-kit@10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-10.1.0.tgz#3af788dd38de56bbdf10ca6a7bd6d0a15da098a8" + integrity sha512-qzJ5EJCR8/OnlyTRqkaDZjuxi7Vzm65zDIWQ6mvGp6c5a3UuIN40DOU9glT9QC4MyA5+/1vMBUJK+ad5G0eKHA== dependencies: - "@abp/cms-kit.admin" "~10.1.0-rc.2" - "@abp/cms-kit.public" "~10.1.0-rc.2" + "@abp/cms-kit.admin" "~10.1.0" + "@abp/cms-kit.public" "~10.1.0" -"@abp/codemirror@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-10.1.0-rc.2.tgz#8a55a66c8be83995045bc2724ca02c29771283a3" - integrity sha512-8jlMySyFTNnDJvQLqZgj7S0EZ0oGWoplDFDE6zEP7NBK8INzrw7D7lc93XZ8/G7lRh0xeM1OcziUHZEX/QhXNg== +"@abp/codemirror@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-10.1.0.tgz#3fdc99c1e19af844b4737b49ec8deda7db346148" + integrity sha512-zkFLXyqGV6aksiFbkVQQFceRt7YirLB/LtY6njn+eMMlXMLHsQxX8G3p5xVSUj+Mr+HWcZ4sHDwIebiV29dvLg== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" codemirror "^5.65.1" -"@abp/core@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.1.0-rc.2.tgz#403687aff5a30788f7b7ca660abdfd85d89438aa" - integrity sha512-euuG2Hna/DT6/R1dGOjgp3vcehYtF+CcOkRj31oquYKaM5YWk4OaZ314DSpnjgs/xo8DuVc4eKFQwIxD9RK41w== +"@abp/core@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.1.0.tgz#7cb21012deee5510a0774d982f85627d47b368f4" + integrity sha512-/N0K2NVdk5/OM+Q5JDnpC+0CD0mS4wpDhLO1SIQbMXSTFbplhfPw2SFm7+MvPA9pVx2L8TYAzXmS7CtAJxKvCg== dependencies: - "@abp/utils" "~10.1.0-rc.2" + "@abp/utils" "~10.1.0" -"@abp/datatables.net-bs5@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.1.0-rc.2.tgz#a60650d1802b40751d30f8f6c56beb23fd66481b" - integrity sha512-IWwexNqbMpET54Fvm9LoPTJYf+4CoBbjFOvz3sL6CgO2feV5R5fKigjVU8zXKNh2W+RG8L6zEarfVxrr114TsA== +"@abp/datatables.net-bs5@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.1.0.tgz#ea2a60c22bdcc80882662b9f55f198793f6ea556" + integrity sha512-dPe3bVW3Hfnm/X9Bw5k7TuEIsYYwFk1faC8kIxf2Spk+4Z9TdYFS2zGaHBYStE9iRtKmneNYMykG2O88mX3quA== dependencies: - "@abp/datatables.net" "~10.1.0-rc.2" + "@abp/datatables.net" "~10.1.0" datatables.net-bs5 "^2.3.4" -"@abp/datatables.net@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.1.0-rc.2.tgz#9147f68bc6dbc4eb40a9ddf65c7859e788cdcac2" - integrity sha512-a9DJpwg14S4nVOiC4ipw0CQwEYWB602e2gCJiH7W1mxopbQb135RxwhtdTnW//eIONcxC9IrEuvcBEAUVt2B7Q== +"@abp/datatables.net@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.1.0.tgz#7fe641883e6d1417c86a030481777a75c9a5a555" + integrity sha512-p9S/ZaJ4OXpihTOWIxsSQ0s3G4S+ScQLD+Q+w0NrWbUa7HTKg9tdqSh6VDhyW9KZ/iiLUO5jNzsAFXyUjjDQuw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" datatables.net "^2.3.4" -"@abp/font-awesome@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.1.0-rc.2.tgz#364466cfe67e41e0c4d16b57d3923d10f66369f1" - integrity sha512-F1Jy8xoFV2aA+VN+NH1gtrG96/j9w7Picc+KLoCoIyNnJr/xJur11XkJyu5ln8KF4V7p/DY7QaQodWV/btOs8g== +"@abp/font-awesome@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.1.0.tgz#79c5b7eb9a85467b0078b9f9bf201493fc3de358" + integrity sha512-dm4VRtZnvm5p8mYQys9KWLkQ+JdwPahQSan2DV1s5Rq4P96hk8p8VshZu7pI3iE0MS+rSZnXYvetZrqCdt1mOQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" "@fortawesome/fontawesome-free" "^7.0.1" -"@abp/highlight.js@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-10.1.0-rc.2.tgz#6ad0e1ef9e49f0f90eba9d899fd72b6c30a4f9f0" - integrity sha512-jAX4p+i3secAaI3waXoMr7yoH6G1nWvcjR5UVin168H7I4UySxbF799T89v5tK8gtfWgaTjEydFZRypSQU/dHg== +"@abp/highlight.js@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-10.1.0.tgz#b0a798ccdd71b437710978d1ced794c178de6b7c" + integrity sha512-kyDjTkLwkDEBY0jqpPf5KmZWmzJQPsPto4TidX9GG7U8e+biFK4MF/gtPUjjFs9POTQ585AKfk0U/xDjhr42qg== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" "@highlightjs/cdn-assets" "~11.11.1" -"@abp/jquery-form@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.1.0-rc.2.tgz#3857717d07569c22d4bbbe459238abeb816d606a" - integrity sha512-2D5WHVnfK9bhRces1tgPwOEoc7KCYKYiKHBOcqct+LTA7zoRjJv/PM8/JhFVl+grVIw1aSwO4tU3YfZ22Vxipg== +"@abp/jquery-form@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.1.0.tgz#7c19605eb103519fea332d0f153cac185b7f2ebb" + integrity sha512-ddlapZqFVwpXU3uDi/RnQ6uSpseMxPAKE+/LgLF+SVyPzazNFognxPT3ztzqTk84P/gFleNgNjAfUlKrfyIfGw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.1.0-rc.2.tgz#efd7b69a078a20c0bf405408dbdf52a7bf770b3b" - integrity sha512-tZ0MWgzBqp+SNfMxM0z2cGB21NiTHuVJyyQaXKE/ptuD5pc0uRkcqw/J2kWfiqsoVgChz27IB6h8/jqDafS4qg== +"@abp/jquery-validation-unobtrusive@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.1.0.tgz#13aa462c4347d3459541a9a9ea19a60458805328" + integrity sha512-94smwn/W3d+gkX2UKH+/OiB7poKDP1ZK0DqWiiH4BGGmpRk9j3B+eJxPbL86dwNG4XT8upuX3ZOrUb6Fy2SA3A== dependencies: - "@abp/jquery-validation" "~10.1.0-rc.2" + "@abp/jquery-validation" "~10.1.0" jquery-validation-unobtrusive "^4.0.0" -"@abp/jquery-validation@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.1.0-rc.2.tgz#d39537a7356c51f9db2e66f6740cf6df86bd0442" - integrity sha512-LOkS0NKk4pLtLjPU0CCbwROyUg6EtJN8Z/it7QuKK1CIRfYYcAStgNnNm5geZP7CqECIkoiFfgWjI+L5Z9/Tfg== +"@abp/jquery-validation@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.1.0.tgz#5389785f5ff359ecd6291889420d6c2f84e633aa" + integrity sha512-/X5smp0xpNqCM+BuLI9eEyMPQ0uF42hmEfBvCIfWWBhfp7uFfq7sS706QcGfXYqFdpprRYoUJGKDfSaHxPaJUA== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" jquery-validation "^1.21.0" -"@abp/jquery@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.1.0-rc.2.tgz#101a55f70d510978c8c05f5857d0e9d4965263f7" - integrity sha512-bQV1uFWGtwRYjNOsqJ8FM2004idX2Jj7YVL19YF1/PjyPUSMX+s8/IvJizBjyY5hPAiWBBhmV9g+IFWzxlDQoQ== +"@abp/jquery@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.1.0.tgz#d8812a7d410ad959a1ed27696beb9b7885142684" + integrity sha512-cVF2hOP6GGp0N3VMBOFjEHuHFgXbDH8x0d7Agw4DN2ydFU8wYuj3m9u0HCc0aoBG6Zls90tMpTfM0RqDNFgCKA== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" jquery "~3.7.1" -"@abp/jstree@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-10.1.0-rc.2.tgz#0b145af388ca527b107464ff706c5f901344a094" - integrity sha512-RmKRKVuQBhemapF4wmNVOZfDxBSjqKoSRL/Y0Sbyqx86Qg/HYpFZD1zQgaH6NFwUOpwB4wVJRBHV5r7i4LxxyQ== +"@abp/jstree@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-10.1.0.tgz#479c59a97f5a1dda4f035207dde5023005b6f8b4" + integrity sha512-4gu433xPpxTysA/oe11dbRG1/3Oa76ABThlD4UPA40Ep7k/I6PzHbQGRhUrzm2ygvAboTiApFXW1gj4uk3oq/w== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" jstree "^3.3.17" -"@abp/lodash@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.1.0-rc.2.tgz#d08c03f8d3d0fbaa3e71e603cbe5fb7f176933ef" - integrity sha512-KCnD1p2y52ZI+2ifpiFIUAiDPsKehnOD8HV5qKeObO6UCP97okif8IP+sQDmNQb8O33y/NKTyx/HcpwBbe/NYQ== +"@abp/lodash@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.1.0.tgz#fdebe764d1142abfd3ecdeef56aa33746e31815b" + integrity sha512-r4WwpqLFFQi721edd8XF5wueAdqEvx75dmRlEuhZoIBA6RQ0yYjTRMNWjTOlIEzFDGj7XrisV5CSUQ9BhhuS+Q== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" lodash "^4.17.21" -"@abp/luxon@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.1.0-rc.2.tgz#ef8d2b323bac054fc9610e241e1b1763d229e065" - integrity sha512-qYFl6XO3g9mZiu0dtIczI7LRuYWwc+RkpbDzSmruXcRks3KA+ZZco2vhHNnlwtXcINl/TXtbW7Wc0MX+8IB1Kw== +"@abp/luxon@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.1.0.tgz#c80cdb1a85e9cc824946dc0009df0daba384a4ca" + integrity sha512-slwiGSrevvWZrBhuy9sw7UP6akk2Ln9eAY3nxxo8xzE7C7uezcNk12dbKN4psdSAVpbDwuqC3GGrkmcFL+6sBQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" luxon "^3.7.2" -"@abp/malihu-custom-scrollbar-plugin@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.1.0-rc.2.tgz#dfaf666442c7c122f7da72c83b9adf194d5b6ec8" - integrity sha512-PudMHmNQgZ6JZeaVt1ZoXLqO0UZXJzUYiBah2LDkC4EMLjnMJFINHBoEVVa4ooXH0yjFv+zsbN0vWZYJ8TBJIA== +"@abp/malihu-custom-scrollbar-plugin@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.1.0.tgz#d257e83b7cc1af89a708e365eef7af0136ccebcf" + integrity sha512-+h8hoYUkjcYBdm/M3b8c3CeE5WNU8K6kQ5MwQXNaaGLCvwEmZHy0A6+U8yxtKv2eRRhAkAqOkQyWYRWA5w1XzQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/markdown-it@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/markdown-it/-/markdown-it-10.1.0-rc.2.tgz#43865464fb44f470baf30296712a5f007ff9730d" - integrity sha512-R45uA/EfMEZSkWchdpE/epOPsjswuQDB+IyBdwil2kKe3Bfv3yIh8+GSU5hfhiArXmRbhcmNGdeTylXWhrInbw== +"@abp/markdown-it@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/markdown-it/-/markdown-it-10.1.0.tgz#a768c084091dda85d78a9269de31fdbb54431c62" + integrity sha512-vjcTEuC367p2prqJ8/jVni4zZN/Bb+UU5K1JHbgEub3Z9MGNmJvZli95vdiROTm/Pq2pw1BFOERquDb7qolybg== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" markdown-it "^14.1.0" -"@abp/moment@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.1.0-rc.2.tgz#610a1592d13984aea51abbd13df8c5995a089149" - integrity sha512-ep8PnAXARw0t/wtGOVp/oiNhF3B0Bh6y2vRzKrcSoyXAQREGGm4fJdZVYZLGTfI4lFLTjebEgf4O7T9feUwJAw== +"@abp/moment@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.1.0.tgz#5755e4e10a7302e2832b1a1ce571f20b27600303" + integrity sha512-faHV7vmPEjFUJTRNTTlmnpx0VZuyvQt4O98WBLAjPdcqpLfWazdS9Ro405St5liIkgvmAXWsrwVmZb0VKTLcNA== dependencies: moment "^2.30.1" -"@abp/prismjs@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-10.1.0-rc.2.tgz#8565bab503a16fc349f4b0fa2609ad412ff838be" - integrity sha512-SmZWMyJ3cJW+qj4CWJ7y2kD6PMx2zfZMA5X5jPunsytG4Eht4AVyIR38Y4QSpO62zZgkHyZlSTFOozBfhrlv9A== +"@abp/prismjs@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-10.1.0.tgz#632e06b47a9ac11d0131d06a270b97292266df47" + integrity sha512-iqXB3bgrlXDyfuFr23R2JtfN0Ij3ai81KkWM3oc3QikKaCwAHtiU0ZvshRlL9y3YfwjlNpYYFLE4en2xx1xThQ== dependencies: - "@abp/clipboard" "~10.1.0-rc.2" - "@abp/core" "~10.1.0-rc.2" + "@abp/clipboard" "~10.1.0" + "@abp/core" "~10.1.0" prismjs "^1.30.0" -"@abp/select2@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.1.0-rc.2.tgz#40c5418d007fc36817eecbe6388d767e4e7ca887" - integrity sha512-Pq0wlpL01sWRLUg5um3JtBXIqi3mmbwPwvgxP8hFbQngAt9JXAK8geNRiTMrIZgtW/ycXtM1v6I4zuWOLOeAGg== +"@abp/select2@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.1.0.tgz#8b15954e462e65329b8eb481226170df6d55d36a" + integrity sha512-7+1GirZe4i/2/LR4jZgWhiN6lFHhClLtUmrdCjh7FeeuBvy5GGA417DybDihna/GzlcOVI4GHnn2fjEwcFqJiw== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" select2 "^4.0.13" -"@abp/slugify@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-10.1.0-rc.2.tgz#42389b8471f4aacd340bebe664994b778eb335ab" - integrity sha512-jhLEqxPpitTfwJgHW21urQnvP3NU+/hXZXzmnT6ZPBw7pVpbN2m1hDOm+JC+zKkLaa3WQ23rE9ewwrnJaoQ67w== +"@abp/slugify@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-10.1.0.tgz#779cacb32f389acb9563ae562aaf29d1049a02cf" + integrity sha512-W7F6jimH1iuWc1zzn9nZlylimFtW6lGMuj0KEzkmhxkthapqm1VDaY43HaV6wCvZGEQG7scAQbzY3VvJ8WA/tw== dependencies: slugify "^1.6.6" -"@abp/star-rating-svg@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-10.1.0-rc.2.tgz#d1754352cc3af1f42577de19e18350b289685e68" - integrity sha512-3Io7LMSnjQtc1b5CP1nZ8ucvXfq262PGMTHhwgM30xnvO9HJbtnppCmwVTbhZBQigKQFnySUKmccQbGjoqnN4A== +"@abp/star-rating-svg@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-10.1.0.tgz#f8a2cc268adf31979dbd8bb4900613be74f7abf7" + integrity sha512-AmHKEbVZNZALhRaFHaGweBcp/lyBLTr8Br5hemGRcFm9tyYtnkPrhY7a/By59gjttOYAFHjqa+scs5HP7unCfg== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" star-rating-svg "^3.5.0" -"@abp/sweetalert2@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.1.0-rc.2.tgz#d35858c69e10c6726b02cdfcea88dfc32385963f" - integrity sha512-s9VPRToohN45uzHcKCF5Mcj8FVjsXcXUb0U3tuaT/Y+u4adHB3fBxYiXJFM0sVsCJ81dFktxwka40Wm8Taz/zA== +"@abp/sweetalert2@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.1.0.tgz#6997cb7909671f9deddaea53f17ed054aab27cd3" + integrity sha512-vlkH+DkuQBvOqnDPqTtyZ5mHb+GfIR/QJBXI7yrS62ML+ZNqkg0vXftCrm4aAR2kPmvgYsbUOJcKJAmgydcOEQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" sweetalert2 "^11.23.0" -"@abp/timeago@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.1.0-rc.2.tgz#98d630cc3843eee64dbcc34fb8ca5afbab034718" - integrity sha512-vJmk+otyXXJE2s2J8iYpLVaFuNAYnIUSOitmi7umYnL+k/UE2KQhBXU7FR0/OBY9mAZYd+shaiGIU1LMSaJ+Xg== +"@abp/timeago@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.1.0.tgz#45c1e8b1451e31910e330053981a871787fe02f1" + integrity sha512-3RVMlBbOepa4WBTLthRmf2VddkNwsjE+FNnaSUaMQ2ZQaXnghnZc4xZ3f3oKraGcWMgqpz1IfrWWV1POKRsEXw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" timeago "^1.6.7" -"@abp/tui-editor@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-10.1.0-rc.2.tgz#ebbd5bad1ee180a0c6e6a9cfd894499614a71e96" - integrity sha512-k5V+5ZE+HZebfyXLzddRQDGri3HP7wSjDXEbSMLTgxZTem7IzksyLWLAN/woKRzWX92BJXcsmR8T1rhuMhohhA== +"@abp/tui-editor@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-10.1.0.tgz#3f0556f918a239da9c048bf96f7c6703cff1f796" + integrity sha512-cIpNiIvxkUUzk9TnyhP3wBcsrCcgTFOlqhRWowyq9Kt7iVqoKb6vkCflxKt1oxkLZVBI7qOJGx2o5KmSYFcWiQ== dependencies: - "@abp/jquery" "~10.1.0-rc.2" - "@abp/prismjs" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" + "@abp/prismjs" "~10.1.0" -"@abp/uppy@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-10.1.0-rc.2.tgz#1b9ca53eda178e8ea5d14573da15b9c141a89fc0" - integrity sha512-QHgTiVaZKZrnNigyE1F7OR3Tdtjdq6tjm164HWAPJSJOUbcv6v498Q7DWS2dIZMU2e/226HflS2NwwNV87s3XA== +"@abp/uppy@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-10.1.0.tgz#8a78ee9c95432be60aa076d84fc7d801df89ae3f" + integrity sha512-9ySUpG/TBMQDDA7G15tkQl25XRqTjI0diUzETmk7mgnv2MonEJHmBQ8GlGuSBVyvx2Ie7Oq5D8P2uHjrwsA76w== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" uppy "^5.1.2" -"@abp/utils@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.1.0-rc.2.tgz#86a980c6536b3b5ce185d406723b28be421864ac" - integrity sha512-Oz863VNA8fraQ81vTvqM0IqwiaseLwfFU5QNn6iOGOfn5wQrEkPwtZ0jMI+DGNtJgPzoKiq+iKc3K+SiuVgldg== +"@abp/utils@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.1.0.tgz#ef7f6bf16abb34b77fa57c156b264154827bc0af" + integrity sha512-UDgbvDMbcQklNu+SlQPhkIcIfZoWsQjCCzihanLBiHc474BCOlcTsO6K/EatV9LwqG3zY0mYd0ExAWjH44G0rQ== dependencies: just-compare "^2.3.0" diff --git a/modules/docs/app/VoloDocs.Web/package.json b/modules/docs/app/VoloDocs.Web/package.json index 0a0a8f4726..d021405fe4 100644 --- a/modules/docs/app/VoloDocs.Web/package.json +++ b/modules/docs/app/VoloDocs.Web/package.json @@ -3,7 +3,7 @@ "name": "volo.docstestapp", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0-rc.2", - "@abp/docs": "~10.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0", + "@abp/docs": "~10.1.0" } } diff --git a/modules/docs/app/VoloDocs.Web/yarn.lock b/modules/docs/app/VoloDocs.Web/yarn.lock index e99b91ff81..888fc2dd90 100644 --- a/modules/docs/app/VoloDocs.Web/yarn.lock +++ b/modules/docs/app/VoloDocs.Web/yarn.lock @@ -2,229 +2,229 @@ # yarn lockfile v1 -"@abp/anchor-js@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-10.1.0-rc.2.tgz#5ed35c420ec53f9e305e9de943ebb005677d7617" - integrity sha512-D8rH9p8gGbNc6FpW24CFFW9JZD7tUiJkM3Lx31RsygwvmlolutN4jpzV5L9h9IvbrxJCT2jSqK1s686z8SHb3w== +"@abp/anchor-js@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-10.1.0.tgz#c0032fde0d2cd94824bba8042eb4fe3dbbd3ff0c" + integrity sha512-mVDGemNe2uiwgjGR5YgGQBy11zTNu9dm1W/PEGXbW1rQ3Ba5OAJknhdrcoCBnsfvYnSL4XLoJKKI+ZqqWDHSxw== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" anchor-js "^5.0.0" -"@abp/aspnetcore.mvc.ui.theme.basic@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.1.0-rc.2.tgz#599f5c47a417d1230fc17c0446a0229f920f7246" - integrity sha512-8F4nEK+VtgRRf8n+66HMbtCEaOMCW/OdbSEWRl9ahMNoj860oPIJ8P8Qn/2+LjtkPMdDAfCdEzyDzCd3igaFaA== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~10.1.0-rc.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.1.0-rc.2.tgz#e5056e4e159f5815e3cffecab5c46f3d7d4f79d7" - integrity sha512-bo56XzQZPYL/3ckWTTTSSUsSFSFJobvfE29cz13NIrZ/tBtWyQCAJn92wYHuY+6IezYUWb4ga3PkFeHRzR142A== - dependencies: - "@abp/aspnetcore.mvc.ui" "~10.1.0-rc.2" - "@abp/bootstrap" "~10.1.0-rc.2" - "@abp/bootstrap-datepicker" "~10.1.0-rc.2" - "@abp/bootstrap-daterangepicker" "~10.1.0-rc.2" - "@abp/datatables.net-bs5" "~10.1.0-rc.2" - "@abp/font-awesome" "~10.1.0-rc.2" - "@abp/jquery-form" "~10.1.0-rc.2" - "@abp/jquery-validation-unobtrusive" "~10.1.0-rc.2" - "@abp/lodash" "~10.1.0-rc.2" - "@abp/luxon" "~10.1.0-rc.2" - "@abp/malihu-custom-scrollbar-plugin" "~10.1.0-rc.2" - "@abp/moment" "~10.1.0-rc.2" - "@abp/select2" "~10.1.0-rc.2" - "@abp/sweetalert2" "~10.1.0-rc.2" - "@abp/timeago" "~10.1.0-rc.2" - -"@abp/aspnetcore.mvc.ui@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.1.0-rc.2.tgz#e25d3575d40bfcb3f809bd2d355671181ee5ff40" - integrity sha512-MOF86bVbi7N/nIla+361nsBrN4tiSka8xzpWcgqlLcCAl9ILG4rugbtafBAjN81taPma2peZM7egaOR4SDkTMw== +"@abp/aspnetcore.mvc.ui.theme.basic@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.1.0.tgz#94f68982ce8b67b6ac827f824aed3faad50e56e9" + integrity sha512-wqbEANW8CRZ+/7qGNprC828yNN17TsYtFxywL0B+EA2UfUtcTpzR/3ompZd/XcDm3N2NmS1n5Ao3WEn2NJlHgA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~10.1.0" + +"@abp/aspnetcore.mvc.ui.theme.shared@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.1.0.tgz#b89c5d38fdeceda9e421f9357842838be36dce49" + integrity sha512-9QyZ7lYr17thTKxq9WN/KVCxNyYurY5Ph9y3vFBkA3u+uOZcaxdw0T417vy0hJvAB7RGlkpLRTmZL7q5P9FzJA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~10.1.0" + "@abp/bootstrap" "~10.1.0" + "@abp/bootstrap-datepicker" "~10.1.0" + "@abp/bootstrap-daterangepicker" "~10.1.0" + "@abp/datatables.net-bs5" "~10.1.0" + "@abp/font-awesome" "~10.1.0" + "@abp/jquery-form" "~10.1.0" + "@abp/jquery-validation-unobtrusive" "~10.1.0" + "@abp/lodash" "~10.1.0" + "@abp/luxon" "~10.1.0" + "@abp/malihu-custom-scrollbar-plugin" "~10.1.0" + "@abp/moment" "~10.1.0" + "@abp/select2" "~10.1.0" + "@abp/sweetalert2" "~10.1.0" + "@abp/timeago" "~10.1.0" + +"@abp/aspnetcore.mvc.ui@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.1.0.tgz#79d76232aacb9c8e1762d903f75007d0418bf5a8" + integrity sha512-brVfaSUicZuSuwtizrEcMvtRjFsoAHr9i56HjJZb7bmElr+q5STiul3stRumly4IfoLkYqdy85hMk+B3G0bJDg== dependencies: ansi-colors "^4.1.3" -"@abp/bootstrap-datepicker@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.1.0-rc.2.tgz#be80c6104ba53e18935fbf62ca2c1890f4b2fde4" - integrity sha512-BNcDYUSbZaLah4SfXm0efoqFTsOViVm6370k9L7vix/OGpIWwklJsr8y78lvdM5ANgNCfl0LPSq+seLJFc/OLA== +"@abp/bootstrap-datepicker@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.1.0.tgz#68270ed8cf8e0c23a77331ef2ba6ef2d1da3cefc" + integrity sha512-ahKKHlluo4U1Z238mBNzpL0YaErTPENLQDVLNZB1BnZcUTqz1j7WJHGZoy4j3CXZKt7mnFCRe1+vJMCcwP+DYA== dependencies: bootstrap-datepicker "^1.10.1" -"@abp/bootstrap-daterangepicker@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.1.0-rc.2.tgz#f189f7d070ebd97d9cfdcb99571cab2d6a198ab5" - integrity sha512-bV8J0MuiAFVLkr48JsB6aZU6aPoqw+Gyhq1szQ74bEwNQlRBPuF92WVA5FACaUBj8dMUzR9HDDAYQuxUzpKYKA== +"@abp/bootstrap-daterangepicker@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.1.0.tgz#69f7775eafe7c038c2684d3e990384c8f2966cff" + integrity sha512-mFMaH7GqPn7W5zzIMOOTl4f0at9Vx8da4ewvPU/IvngrTeezMRPC1tofHmiWDhHfZpzF5J9DDMCGul9Q4nOl5A== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.1.0-rc.2.tgz#2300800a29ea09b91f5ed2e6177e5921fe7d2a0f" - integrity sha512-K+tDI9vz/Y9B/yu0i3AVpm4v3Odi44Q/yH5hAprL7f4pGxEOiqAFB/qzHAxG+7Oa7wjv5tPLv+Cz4DavBQjd8Q== +"@abp/bootstrap@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.1.0.tgz#816436ab547fc46d4c00b1facbdd80e3f4f78af1" + integrity sha512-ioqQDOvjXIUWncmLJuTcLPTnlJ3xGxyKXC9veSTJWFd+5pZswK7/QIlAuTvIIujs/7Z13GLunUIMMjny7WFBMw== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" bootstrap "^5.3.8" -"@abp/clipboard@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-10.1.0-rc.2.tgz#e99dbf190e3684e99c8e909bf38201c70e267502" - integrity sha512-kRS9pWc1jRgr4D4/EV9zdAy3rhhGBrcqk2as5+6Ih49npsEJY/cF5mYH7mj/ZYy8SHqtae/CR7bZsR+uCDKYrQ== +"@abp/clipboard@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-10.1.0.tgz#a59b14370b99fd7df447250b293fd7ac3f8c1a51" + integrity sha512-OulNwy9vhASO8TJ+m0ql6/iXNflE59oGUNAW+qzcaxaazre1mVPahPMBoLSVuOAGtAjLZAN4SWCOC5r3tLt9pA== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" clipboard "^2.0.11" -"@abp/core@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.1.0-rc.2.tgz#403687aff5a30788f7b7ca660abdfd85d89438aa" - integrity sha512-euuG2Hna/DT6/R1dGOjgp3vcehYtF+CcOkRj31oquYKaM5YWk4OaZ314DSpnjgs/xo8DuVc4eKFQwIxD9RK41w== +"@abp/core@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.1.0.tgz#7cb21012deee5510a0774d982f85627d47b368f4" + integrity sha512-/N0K2NVdk5/OM+Q5JDnpC+0CD0mS4wpDhLO1SIQbMXSTFbplhfPw2SFm7+MvPA9pVx2L8TYAzXmS7CtAJxKvCg== dependencies: - "@abp/utils" "~10.1.0-rc.2" + "@abp/utils" "~10.1.0" -"@abp/datatables.net-bs5@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.1.0-rc.2.tgz#a60650d1802b40751d30f8f6c56beb23fd66481b" - integrity sha512-IWwexNqbMpET54Fvm9LoPTJYf+4CoBbjFOvz3sL6CgO2feV5R5fKigjVU8zXKNh2W+RG8L6zEarfVxrr114TsA== +"@abp/datatables.net-bs5@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.1.0.tgz#ea2a60c22bdcc80882662b9f55f198793f6ea556" + integrity sha512-dPe3bVW3Hfnm/X9Bw5k7TuEIsYYwFk1faC8kIxf2Spk+4Z9TdYFS2zGaHBYStE9iRtKmneNYMykG2O88mX3quA== dependencies: - "@abp/datatables.net" "~10.1.0-rc.2" + "@abp/datatables.net" "~10.1.0" datatables.net-bs5 "^2.3.4" -"@abp/datatables.net@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.1.0-rc.2.tgz#9147f68bc6dbc4eb40a9ddf65c7859e788cdcac2" - integrity sha512-a9DJpwg14S4nVOiC4ipw0CQwEYWB602e2gCJiH7W1mxopbQb135RxwhtdTnW//eIONcxC9IrEuvcBEAUVt2B7Q== +"@abp/datatables.net@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.1.0.tgz#7fe641883e6d1417c86a030481777a75c9a5a555" + integrity sha512-p9S/ZaJ4OXpihTOWIxsSQ0s3G4S+ScQLD+Q+w0NrWbUa7HTKg9tdqSh6VDhyW9KZ/iiLUO5jNzsAFXyUjjDQuw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" datatables.net "^2.3.4" -"@abp/docs@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-10.1.0-rc.2.tgz#ac8c84cdc91c3ac6511ff39f9d8729f0673a1d30" - integrity sha512-oTJX12kZb8CIXQRdjsZx8VYSOgKTA6ei+5CPU4dPVZZiaYBzQ3MNsMlRrrRywwuWCTJedtThy9XOcUwB7LTqCg== +"@abp/docs@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-10.1.0.tgz#6235c4ae843871b4679067e9f8d72ac595aa6bab" + integrity sha512-kZxdYAVC8uMK54QHEm7tIK9akd1AMnWpj9p7l9/9QpfMzm2Hg/nXxAzC8FVS8C6MyfwVbX9M3eqhI7lY4bw/Jg== dependencies: - "@abp/anchor-js" "~10.1.0-rc.2" - "@abp/clipboard" "~10.1.0-rc.2" - "@abp/malihu-custom-scrollbar-plugin" "~10.1.0-rc.2" - "@abp/popper.js" "~10.1.0-rc.2" - "@abp/prismjs" "~10.1.0-rc.2" + "@abp/anchor-js" "~10.1.0" + "@abp/clipboard" "~10.1.0" + "@abp/malihu-custom-scrollbar-plugin" "~10.1.0" + "@abp/popper.js" "~10.1.0" + "@abp/prismjs" "~10.1.0" -"@abp/font-awesome@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.1.0-rc.2.tgz#364466cfe67e41e0c4d16b57d3923d10f66369f1" - integrity sha512-F1Jy8xoFV2aA+VN+NH1gtrG96/j9w7Picc+KLoCoIyNnJr/xJur11XkJyu5ln8KF4V7p/DY7QaQodWV/btOs8g== +"@abp/font-awesome@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.1.0.tgz#79c5b7eb9a85467b0078b9f9bf201493fc3de358" + integrity sha512-dm4VRtZnvm5p8mYQys9KWLkQ+JdwPahQSan2DV1s5Rq4P96hk8p8VshZu7pI3iE0MS+rSZnXYvetZrqCdt1mOQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" "@fortawesome/fontawesome-free" "^7.0.1" -"@abp/jquery-form@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.1.0-rc.2.tgz#3857717d07569c22d4bbbe459238abeb816d606a" - integrity sha512-2D5WHVnfK9bhRces1tgPwOEoc7KCYKYiKHBOcqct+LTA7zoRjJv/PM8/JhFVl+grVIw1aSwO4tU3YfZ22Vxipg== +"@abp/jquery-form@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.1.0.tgz#7c19605eb103519fea332d0f153cac185b7f2ebb" + integrity sha512-ddlapZqFVwpXU3uDi/RnQ6uSpseMxPAKE+/LgLF+SVyPzazNFognxPT3ztzqTk84P/gFleNgNjAfUlKrfyIfGw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.1.0-rc.2.tgz#efd7b69a078a20c0bf405408dbdf52a7bf770b3b" - integrity sha512-tZ0MWgzBqp+SNfMxM0z2cGB21NiTHuVJyyQaXKE/ptuD5pc0uRkcqw/J2kWfiqsoVgChz27IB6h8/jqDafS4qg== +"@abp/jquery-validation-unobtrusive@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.1.0.tgz#13aa462c4347d3459541a9a9ea19a60458805328" + integrity sha512-94smwn/W3d+gkX2UKH+/OiB7poKDP1ZK0DqWiiH4BGGmpRk9j3B+eJxPbL86dwNG4XT8upuX3ZOrUb6Fy2SA3A== dependencies: - "@abp/jquery-validation" "~10.1.0-rc.2" + "@abp/jquery-validation" "~10.1.0" jquery-validation-unobtrusive "^4.0.0" -"@abp/jquery-validation@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.1.0-rc.2.tgz#d39537a7356c51f9db2e66f6740cf6df86bd0442" - integrity sha512-LOkS0NKk4pLtLjPU0CCbwROyUg6EtJN8Z/it7QuKK1CIRfYYcAStgNnNm5geZP7CqECIkoiFfgWjI+L5Z9/Tfg== +"@abp/jquery-validation@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.1.0.tgz#5389785f5ff359ecd6291889420d6c2f84e633aa" + integrity sha512-/X5smp0xpNqCM+BuLI9eEyMPQ0uF42hmEfBvCIfWWBhfp7uFfq7sS706QcGfXYqFdpprRYoUJGKDfSaHxPaJUA== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" jquery-validation "^1.21.0" -"@abp/jquery@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.1.0-rc.2.tgz#101a55f70d510978c8c05f5857d0e9d4965263f7" - integrity sha512-bQV1uFWGtwRYjNOsqJ8FM2004idX2Jj7YVL19YF1/PjyPUSMX+s8/IvJizBjyY5hPAiWBBhmV9g+IFWzxlDQoQ== +"@abp/jquery@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.1.0.tgz#d8812a7d410ad959a1ed27696beb9b7885142684" + integrity sha512-cVF2hOP6GGp0N3VMBOFjEHuHFgXbDH8x0d7Agw4DN2ydFU8wYuj3m9u0HCc0aoBG6Zls90tMpTfM0RqDNFgCKA== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" jquery "~3.7.1" -"@abp/lodash@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.1.0-rc.2.tgz#d08c03f8d3d0fbaa3e71e603cbe5fb7f176933ef" - integrity sha512-KCnD1p2y52ZI+2ifpiFIUAiDPsKehnOD8HV5qKeObO6UCP97okif8IP+sQDmNQb8O33y/NKTyx/HcpwBbe/NYQ== +"@abp/lodash@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.1.0.tgz#fdebe764d1142abfd3ecdeef56aa33746e31815b" + integrity sha512-r4WwpqLFFQi721edd8XF5wueAdqEvx75dmRlEuhZoIBA6RQ0yYjTRMNWjTOlIEzFDGj7XrisV5CSUQ9BhhuS+Q== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" lodash "^4.17.21" -"@abp/luxon@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.1.0-rc.2.tgz#ef8d2b323bac054fc9610e241e1b1763d229e065" - integrity sha512-qYFl6XO3g9mZiu0dtIczI7LRuYWwc+RkpbDzSmruXcRks3KA+ZZco2vhHNnlwtXcINl/TXtbW7Wc0MX+8IB1Kw== +"@abp/luxon@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.1.0.tgz#c80cdb1a85e9cc824946dc0009df0daba384a4ca" + integrity sha512-slwiGSrevvWZrBhuy9sw7UP6akk2Ln9eAY3nxxo8xzE7C7uezcNk12dbKN4psdSAVpbDwuqC3GGrkmcFL+6sBQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" luxon "^3.7.2" -"@abp/malihu-custom-scrollbar-plugin@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.1.0-rc.2.tgz#dfaf666442c7c122f7da72c83b9adf194d5b6ec8" - integrity sha512-PudMHmNQgZ6JZeaVt1ZoXLqO0UZXJzUYiBah2LDkC4EMLjnMJFINHBoEVVa4ooXH0yjFv+zsbN0vWZYJ8TBJIA== +"@abp/malihu-custom-scrollbar-plugin@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.1.0.tgz#d257e83b7cc1af89a708e365eef7af0136ccebcf" + integrity sha512-+h8hoYUkjcYBdm/M3b8c3CeE5WNU8K6kQ5MwQXNaaGLCvwEmZHy0A6+U8yxtKv2eRRhAkAqOkQyWYRWA5w1XzQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.1.0-rc.2.tgz#610a1592d13984aea51abbd13df8c5995a089149" - integrity sha512-ep8PnAXARw0t/wtGOVp/oiNhF3B0Bh6y2vRzKrcSoyXAQREGGm4fJdZVYZLGTfI4lFLTjebEgf4O7T9feUwJAw== +"@abp/moment@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.1.0.tgz#5755e4e10a7302e2832b1a1ce571f20b27600303" + integrity sha512-faHV7vmPEjFUJTRNTTlmnpx0VZuyvQt4O98WBLAjPdcqpLfWazdS9Ro405St5liIkgvmAXWsrwVmZb0VKTLcNA== dependencies: moment "^2.30.1" -"@abp/popper.js@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-10.1.0-rc.2.tgz#09a23add65422b2a34a70dc074bdd8e0ec57d2a2" - integrity sha512-z+YqO0KBr8Nf376sV031lti/bPr2SzuxWgDlNmxrebrF544hgsXC+BXsWhzXSDznEZucN1sIkeoNWEiuAjxctA== +"@abp/popper.js@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-10.1.0.tgz#dac1a4ef2860059681d5b317af923ff38bfbcb3a" + integrity sha512-/u6rcCQzR1OMmaRyCjJVw1YRBXTAzySL3X2SJ4/OMnW3IYUSTode1IwZyf1OIKQPJ9IGg99RS5MVG/3JVV/trA== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" "@popperjs/core" "^2.11.8" -"@abp/prismjs@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-10.1.0-rc.2.tgz#8565bab503a16fc349f4b0fa2609ad412ff838be" - integrity sha512-SmZWMyJ3cJW+qj4CWJ7y2kD6PMx2zfZMA5X5jPunsytG4Eht4AVyIR38Y4QSpO62zZgkHyZlSTFOozBfhrlv9A== +"@abp/prismjs@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-10.1.0.tgz#632e06b47a9ac11d0131d06a270b97292266df47" + integrity sha512-iqXB3bgrlXDyfuFr23R2JtfN0Ij3ai81KkWM3oc3QikKaCwAHtiU0ZvshRlL9y3YfwjlNpYYFLE4en2xx1xThQ== dependencies: - "@abp/clipboard" "~10.1.0-rc.2" - "@abp/core" "~10.1.0-rc.2" + "@abp/clipboard" "~10.1.0" + "@abp/core" "~10.1.0" prismjs "^1.30.0" -"@abp/select2@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.1.0-rc.2.tgz#40c5418d007fc36817eecbe6388d767e4e7ca887" - integrity sha512-Pq0wlpL01sWRLUg5um3JtBXIqi3mmbwPwvgxP8hFbQngAt9JXAK8geNRiTMrIZgtW/ycXtM1v6I4zuWOLOeAGg== +"@abp/select2@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.1.0.tgz#8b15954e462e65329b8eb481226170df6d55d36a" + integrity sha512-7+1GirZe4i/2/LR4jZgWhiN6lFHhClLtUmrdCjh7FeeuBvy5GGA417DybDihna/GzlcOVI4GHnn2fjEwcFqJiw== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" select2 "^4.0.13" -"@abp/sweetalert2@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.1.0-rc.2.tgz#d35858c69e10c6726b02cdfcea88dfc32385963f" - integrity sha512-s9VPRToohN45uzHcKCF5Mcj8FVjsXcXUb0U3tuaT/Y+u4adHB3fBxYiXJFM0sVsCJ81dFktxwka40Wm8Taz/zA== +"@abp/sweetalert2@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.1.0.tgz#6997cb7909671f9deddaea53f17ed054aab27cd3" + integrity sha512-vlkH+DkuQBvOqnDPqTtyZ5mHb+GfIR/QJBXI7yrS62ML+ZNqkg0vXftCrm4aAR2kPmvgYsbUOJcKJAmgydcOEQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" sweetalert2 "^11.23.0" -"@abp/timeago@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.1.0-rc.2.tgz#98d630cc3843eee64dbcc34fb8ca5afbab034718" - integrity sha512-vJmk+otyXXJE2s2J8iYpLVaFuNAYnIUSOitmi7umYnL+k/UE2KQhBXU7FR0/OBY9mAZYd+shaiGIU1LMSaJ+Xg== +"@abp/timeago@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.1.0.tgz#45c1e8b1451e31910e330053981a871787fe02f1" + integrity sha512-3RVMlBbOepa4WBTLthRmf2VddkNwsjE+FNnaSUaMQ2ZQaXnghnZc4xZ3f3oKraGcWMgqpz1IfrWWV1POKRsEXw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" timeago "^1.6.7" -"@abp/utils@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.1.0-rc.2.tgz#86a980c6536b3b5ce185d406723b28be421864ac" - integrity sha512-Oz863VNA8fraQ81vTvqM0IqwiaseLwfFU5QNn6iOGOfn5wQrEkPwtZ0jMI+DGNtJgPzoKiq+iKc3K+SiuVgldg== +"@abp/utils@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.1.0.tgz#ef7f6bf16abb34b77fa57c156b264154827bc0af" + integrity sha512-UDgbvDMbcQklNu+SlQPhkIcIfZoWsQjCCzihanLBiHc474BCOlcTsO6K/EatV9LwqG3zY0mYd0ExAWjH44G0rQ== dependencies: just-compare "^2.3.0" diff --git a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpIdentityAspNetCoreModule.cs b/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpIdentityAspNetCoreModule.cs index 67b5d0bfa7..e06797ae54 100644 --- a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpIdentityAspNetCoreModule.cs +++ b/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpIdentityAspNetCoreModule.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; @@ -47,6 +48,8 @@ public class AbpIdentityAspNetCoreModule : AbpModule public override void PostConfigureServices(ServiceConfigurationContext context) { + // Replace the default UserValidator with AbpIdentityUserValidator + context.Services.RemoveAll(x => x.ServiceType == typeof(IUserValidator) && x.ImplementationType == typeof(UserValidator)); context.Services.AddAbpOptions() .Configure((securityStampValidatorOptions, serviceProvider) => { diff --git a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpSignInManager.cs b/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpSignInManager.cs index 09f3e4bf24..ef375c8b6f 100644 --- a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpSignInManager.cs +++ b/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpSignInManager.cs @@ -46,6 +46,7 @@ public class AbpSignInManager : SignInManager bool isPersistent, bool lockoutOnFailure) { + IdentityUser user; foreach (var externalLoginProviderInfo in AbpOptions.ExternalLoginProviders.Values) { var externalLoginProvider = (IExternalLoginProvider)Context.RequestServices @@ -53,7 +54,7 @@ public class AbpSignInManager : SignInManager if (await externalLoginProvider.TryAuthenticateAsync(userName, password)) { - var user = await UserManager.FindByNameAsync(userName); + user = await FindByNameAsync(userName); if (user == null) { if (externalLoginProvider is IExternalLoginProviderWithPassword externalLoginProviderWithPassword) @@ -81,7 +82,44 @@ public class AbpSignInManager : SignInManager } } - return await base.PasswordSignInAsync(userName, password, isPersistent, lockoutOnFailure); + user = await FindByNameAsync(userName); + if (user == null) + { + return SignInResult.Failed; + } + + return await PasswordSignInAsync(user, password, isPersistent, lockoutOnFailure); + } + + public override async Task ExternalLoginSignInAsync(string loginProvider, string providerKey, bool isPersistent, bool bypassTwoFactor) + { + var user = await FindByLoginAsync(loginProvider, providerKey); + if (user == null) + { + return SignInResult.Failed; + } + + var error = await PreSignInCheck(user); + if (error != null) + { + return error; + } + return await SignInOrTwoFactorAsync(user, isPersistent, loginProvider, bypassTwoFactor); + } + + public virtual async Task FindByEmaiAsync(string email) + { + return await _identityUserManager.FindSharedUserByEmailAsync(email); + } + + public virtual async Task FindByNameAsync(string userName) + { + return await _identityUserManager.FindSharedUserByNameAsync(userName); + } + + public virtual async Task FindByLoginAsync(string loginProvider, string providerKey) + { + return await _identityUserManager.FindSharedUserByLoginAsync(loginProvider, providerKey); } /// diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor index 456292fa5c..9c4c22a3a0 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor @@ -41,7 +41,7 @@ { -
+ @L["NewRole"] @@ -67,7 +67,7 @@ - +
@@ -78,7 +78,7 @@ { -
+ @L["Edit"] @@ -105,7 +105,7 @@ - +
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor index 803ed76819..f146ab644f 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor @@ -48,7 +48,7 @@ { -
+ @L["NewUser"] @@ -157,7 +157,7 @@ - +
@@ -169,7 +169,7 @@ { -
+ @L["Edit"] @@ -289,7 +289,7 @@ - +
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityUserPasswordChangedEto.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityUserPasswordChangedEto.cs new file mode 100644 index 0000000000..13e4def1d3 --- /dev/null +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityUserPasswordChangedEto.cs @@ -0,0 +1,14 @@ +using System; +using Volo.Abp.MultiTenancy; + +namespace Volo.Abp.Identity; + +[Serializable] +public class IdentityUserPasswordChangedEto : IMultiTenant +{ + public Guid Id { get; set; } + + public Guid? TenantId { get; set; } + + public string Email { get; set; } +} diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityUserValidator.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityUserValidator.cs index 05c733c0c0..cfceb47b3f 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityUserValidator.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityUserValidator.cs @@ -1,18 +1,35 @@ +using System; using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Identity; -using Microsoft.Extensions.Localization; -using Volo.Abp.Identity.Localization; +using Microsoft.Extensions.Options; +using Volo.Abp.Data; +using Volo.Abp.DistributedLocking; +using Volo.Abp.MultiTenancy; namespace Volo.Abp.Identity { public class AbpIdentityUserValidator : IUserValidator { - protected IStringLocalizer Localizer { get; } + protected IOptions MultiTenancyOptions { get; } + protected IAbpDistributedLock DistributedLock { get; } + protected ICurrentTenant CurrentTenant { get; } + protected IDataFilter TenantFilter { get; } + protected IIdentityUserRepository UserRepository { get; } - public AbpIdentityUserValidator(IStringLocalizer localizer) + public AbpIdentityUserValidator( + IOptions multiTenancyOptions, + IAbpDistributedLock distributedLock, + ICurrentTenant currentTenant, + IDataFilter tenantFilter, + IIdentityUserRepository userRepository) { - Localizer = localizer; + MultiTenancyOptions = multiTenancyOptions; + DistributedLock = distributedLock; + CurrentTenant = currentTenant; + TenantFilter = tenantFilter; + UserRepository = userRepository; } public virtual async Task ValidateAsync(UserManager manager, IdentityUser user) @@ -20,8 +37,22 @@ namespace Volo.Abp.Identity Check.NotNull(manager, nameof(manager)); Check.NotNull(user, nameof(user)); + var defaultUserValidator = new UserValidator(manager.ErrorDescriber); + return MultiTenancyOptions.Value.UserSharingStrategy == TenantUserSharingStrategy.Isolated + ? await ValidateIsolatedUserAsync(manager, user, defaultUserValidator) + : await ValidateSharedUserAsync(manager, user, defaultUserValidator); + } + + protected virtual async Task ValidateIsolatedUserAsync(UserManager manager, IdentityUser user, UserValidator defaultValidator) + { var errors = new List(); + var defaultValidationResult = await defaultValidator.ValidateAsync(manager, user); + if (!defaultValidationResult.Succeeded) + { + return defaultValidationResult; + } + var userName = await manager.GetUserNameAsync(user); if (userName == null) { @@ -52,5 +83,84 @@ namespace Volo.Abp.Identity return errors.Count > 0 ? IdentityResult.Failed(errors.ToArray()) : IdentityResult.Success; } + + protected virtual async Task ValidateSharedUserAsync(UserManager manager, IdentityUser user, UserValidator defaultValidator) + { + var errors = new List(); + + using (CurrentTenant.Change(user.TenantId)) + { + var defaultValidationResult = await defaultValidator.ValidateAsync(manager, user); + if (!defaultValidationResult.Succeeded) + { + return defaultValidationResult; + } + } + + await using var handle = await DistributedLock.TryAcquireAsync(nameof(AbpIdentityUserValidator), TimeSpan.FromMinutes(1)); + if (handle == null) + { + throw new AbpException("Could not acquire distributed lock for validating user uniqueness for shared user sharing strategy!"); + } + + using (CurrentTenant.Change(null)) + { + using (TenantFilter.Disable()) + { + IdentityUser owner; + using (CurrentTenant.Change(user.TenantId)) + { + owner = await manager.FindByIdAsync(user.Id.ToString()); + } + + var normalizedUserName = manager.NormalizeName(user.UserName); + var normalizedEmail = manager.NormalizeEmail(user.Email); + + var users = (await UserRepository.GetUsersByNormalizedUserNamesAsync([normalizedUserName!, normalizedEmail!], true)).Where(x => x.Id != user.Id).ToList(); + var usersByUserName = users.Where(x => x.NormalizedUserName == normalizedUserName).ToList(); + if (owner != null) + { + usersByUserName.RemoveAll(x => x.NormalizedUserName == user.NormalizedUserName); + } + if (usersByUserName.Any()) + { + errors.Add(manager.ErrorDescriber.DuplicateUserName(user.UserName!)); + } + + var usersByEmail = users.Where(x => x.NormalizedUserName == normalizedEmail).ToList(); + if (owner != null) + { + usersByEmail.RemoveAll(x => x.NormalizedEmail == user.NormalizedEmail); + } + if (usersByEmail.Any()) + { + errors.Add(manager.ErrorDescriber.InvalidEmail(user.Email!)); + } + + users = await UserRepository.GetUsersByNormalizedEmailsAsync([normalizedEmail!, normalizedUserName!], true); + usersByEmail = users.Where(x => x.NormalizedEmail == normalizedEmail).ToList(); + if (owner != null) + { + usersByEmail.RemoveAll(x => x.NormalizedEmail == user.NormalizedEmail); + } + if (usersByEmail.Any()) + { + errors.Add(manager.ErrorDescriber.DuplicateEmail(user.Email!)); + } + + usersByUserName = users.Where(x => x.NormalizedEmail == normalizedUserName).ToList(); + if (owner != null) + { + usersByUserName.RemoveAll(x => x.NormalizedUserName == user.NormalizedUserName); + } + if (usersByUserName.Any()) + { + errors.Add(manager.ErrorDescriber.InvalidUserName(user.UserName!)); + } + } + } + + return errors.Count > 0 ? IdentityResult.Failed(errors.ToArray()) : IdentityResult.Success; + } } } diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityUserRepository.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityUserRepository.cs index 33ec2eab95..cc88d3d792 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityUserRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityUserRepository.cs @@ -165,4 +165,55 @@ public interface IIdentityUserRepository : IBasicRepository byte[] credentialId, bool includeDetails = true, CancellationToken cancellationToken = default); + + Task> GetUsersByNormalizedUserNameAsync( + [NotNull] string normalizedUserName, + bool includeDetails = false, + CancellationToken cancellationToken = default + ); + + Task> GetUsersByNormalizedUserNamesAsync( + [NotNull] string[] normalizedUserNames, + bool includeDetails = false, + CancellationToken cancellationToken = default + ); + + Task> GetUsersByNormalizedEmailAsync( + [NotNull] string normalizedEmail, + bool includeDetails = false, + CancellationToken cancellationToken = default + ); + + Task> GetUsersByNormalizedEmailsAsync( + [NotNull] string[] normalizedEmails, + bool includeDetails = false, + CancellationToken cancellationToken = default + ); + + Task> GetUsersByLoginAsync( + [NotNull] string loginProvider, + [NotNull] string providerKey, + bool includeDetails = false, + CancellationToken cancellationToken = default + ); + + Task> GetUsersByPasskeyIdAsync( + [NotNull] byte[] credentialId, + bool includeDetails = false, + CancellationToken cancellationToken = default + ); + + Task FindByNormalizedUserNameAsync( + Guid? tenantId, + [NotNull] string normalizedUserName, + bool includeDetails = true, + CancellationToken cancellationToken = default + ); + + Task FindByNormalizedEmailAsync( + Guid? tenantId, + [NotNull] string normalizedEmail, + bool includeDetails = true, + CancellationToken cancellationToken = default + ); } diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs index 3f4a91117c..214bce39fc 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs @@ -132,6 +132,11 @@ public class IdentityUser : FullAuditedAggregateRoot, IUser, IHasEntityVer /// public virtual DateTimeOffset? LastSignInTime { get; protected set; } + /// + /// Gets or sets a flag indicating whether this user is leaved from tenant. + /// + public virtual bool Leaved { get; protected set; } + //TODO: Can we make collections readonly collection, which will provide encapsulation. But... can work for all ORMs? /// @@ -435,6 +440,43 @@ public class IdentityUser : FullAuditedAggregateRoot, IUser, IHasEntityVer Passkeys.RemoveAll(x => x.CredentialId.SequenceEqual(credentialId)); } + /// + /// This method set the UserName and normalizedUserName without any validation. + /// Do not use it directly. Use UserManager to change the user name. + /// + public virtual void SetUserNameWithoutValidation(string userName, string normalizedUserName) + { + UserName = userName; + NormalizedUserName = normalizedUserName; + } + + /// + /// This method set the Email and NormalizedEmail without any validation. + /// Do not use it directly. Use UserManager to change the email. + /// + /// + /// + public virtual void SetEmailWithoutValidation(string email, string normalizedEmail) + { + Email = email; + NormalizedEmail = normalizedEmail; + } + + /// + /// This method set the PasswordHash without any validation. + /// Do not use it directly. Use UserManager to change the password. + /// + /// + public virtual void SetPasswordHashWithoutValidation(string passwordHash) + { + PasswordHash = passwordHash; + } + + public virtual void SetLeaved(bool leaved) + { + Leaved = leaved; + } + public override string ToString() { return $"{base.ToString()}, UserName = {UserName}"; diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs index 41da1e5c22..c2f72366fb 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs @@ -8,11 +8,13 @@ using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Volo.Abp.Caching; +using Volo.Abp.Data; using Volo.Abp.Domain.Entities; using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Services; using Volo.Abp.EventBus.Distributed; using Volo.Abp.Identity.Settings; +using Volo.Abp.MultiTenancy; using Volo.Abp.Security.Claims; using Volo.Abp.Settings; using Volo.Abp.Threading; @@ -31,6 +33,9 @@ public class IdentityUserManager : UserManager, IDomainService protected IIdentityLinkUserRepository IdentityLinkUserRepository { get; } protected IDistributedCache DynamicClaimCache { get; } protected override CancellationToken CancellationToken => CancellationTokenProvider.Token; + protected IOptions MultiTenancyOptions { get; } + protected ICurrentTenant CurrentTenant { get; } + protected IDataFilter DataFilter { get; } public IdentityUserManager( IdentityUserStore store, @@ -49,7 +54,10 @@ public class IdentityUserManager : UserManager, IDomainService ISettingProvider settingProvider, IDistributedEventBus distributedEventBus, IIdentityLinkUserRepository identityLinkUserRepository, - IDistributedCache dynamicClaimCache) + IDistributedCache dynamicClaimCache, + IOptions multiTenancyOptions, + ICurrentTenant currentTenant, + IDataFilter dataFilter) : base( store, optionsAccessor, @@ -68,6 +76,9 @@ public class IdentityUserManager : UserManager, IDomainService UserRepository = userRepository; IdentityLinkUserRepository = identityLinkUserRepository; DynamicClaimCache = dynamicClaimCache; + MultiTenancyOptions = multiTenancyOptions; + CurrentTenant = currentTenant; + DataFilter = dataFilter; CancellationTokenProvider = cancellationTokenProvider; } @@ -116,7 +127,7 @@ public class IdentityUserManager : UserManager, IDomainService /// A representing whether validation was successful. public virtual async Task CallValidateUserAsync(IdentityUser user) { - return await base.ValidateUserAsync(user); + return await ValidateUserAsync(user); } /// @@ -129,7 +140,20 @@ public class IdentityUserManager : UserManager, IDomainService /// A representing whether validation was successful. public virtual async Task CallValidatePasswordAsync(IdentityUser user, string password) { - return await base.ValidatePasswordAsync(user, password); + return await ValidatePasswordAsync(user, password); + } + + /// + /// This is to call the protection method UpdatePasswordHash + /// Updates a user's password hash. + /// + /// The user. + /// The new password. + /// Whether to validate the password. + /// Whether the password has was successfully updated. + public virtual async Task CallUpdatePasswordHash(IdentityUser user, string newPassword, bool validatePassword) + { + return await UpdatePasswordHash(user, newPassword, validatePassword); } public virtual async Task GetByIdAsync(Guid id) @@ -396,6 +420,22 @@ public class IdentityUserManager : UserManager, IDomainService return result; } + public override async Task ChangePasswordAsync(IdentityUser user, string currentPassword, string newPassword) + { + var result = await base.ChangePasswordAsync(user, currentPassword, newPassword); + + result.CheckErrors(); + + await DistributedEventBus.PublishAsync(new IdentityUserPasswordChangedEto + { + Id = user.Id, + TenantId = user.TenantId, + Email = user.Email, + }); + + return result; + } + public virtual async Task UpdateRoleAsync(Guid sourceRoleId, Guid? targetRoleId) { var sourceRole = await RoleRepository.GetAsync(sourceRoleId, cancellationToken: CancellationToken); @@ -555,4 +595,127 @@ public class IdentityUserManager : UserManager, IDomainService Logger.LogError($"Could not get a valid user name for the given email address: {email}, allowed characters: {Options.User.AllowedUserNameCharacters}, tried {maxTryCount} times."); throw new AbpIdentityResultException(IdentityResult.Failed(ErrorDescriber.InvalidUserName(userName))); } + + public virtual async Task FindSharedUserByEmailAsync(string email) + { + if (MultiTenancyOptions.Value.UserSharingStrategy == TenantUserSharingStrategy.Isolated) + { + return await base.FindByEmailAsync(email); + } + + using (CurrentTenant.Change(null)) + { + using (DataFilter.Disable()) + { + var normalizedEmail = NormalizeEmail(email); + var hostusers = await UserRepository.GetUsersByNormalizedEmailAsync(normalizedEmail, cancellationToken: CancellationToken); + //host user first + var hostUser = hostusers.FirstOrDefault(x => x.TenantId == null) ?? hostusers.FirstOrDefault(x => x.TenantId != Guid.Empty) ?? hostusers.FirstOrDefault(); + if (hostUser == null) + { + return null; + } + + using (DataFilter.Enable()) + { + using (CurrentTenant.Change(hostUser.TenantId)) + { + return await base.FindByEmailAsync(email); + } + } + } + } + } + + public virtual async Task FindSharedUserByNameAsync(string userName) + { + if (MultiTenancyOptions.Value.UserSharingStrategy == TenantUserSharingStrategy.Isolated) + { + return await base.FindByNameAsync(userName); + } + + using (CurrentTenant.Change(null)) + { + using (DataFilter.Disable()) + { + var normalizeduserName = NormalizeName(userName); + var hostusers = await UserRepository.GetUsersByNormalizedUserNameAsync(normalizeduserName, cancellationToken: CancellationToken); + //host user first + var hostUser = hostusers.FirstOrDefault(x => x.TenantId == null) ?? hostusers.FirstOrDefault(x => x.TenantId != Guid.Empty) ?? hostusers.FirstOrDefault(); + if (hostUser == null) + { + return null; + } + + using (DataFilter.Enable()) + { + using (CurrentTenant.Change(hostUser.TenantId)) + { + return await base.FindByNameAsync(userName); + } + } + } + } + } + + public virtual async Task FindSharedUserByLoginAsync(string loginProvider, string providerKey) + { + if (MultiTenancyOptions.Value.UserSharingStrategy == TenantUserSharingStrategy.Isolated) + { + return await base.FindByLoginAsync(loginProvider, providerKey); + } + + using (CurrentTenant.Change(null)) + { + using (DataFilter.Disable()) + { + var hostusers = await UserRepository.GetUsersByLoginAsync(loginProvider, providerKey, cancellationToken: CancellationToken); + //host user first + var hostUser = hostusers.FirstOrDefault(x => x.TenantId == null) ?? hostusers.FirstOrDefault(x => x.TenantId != Guid.Empty) ?? hostusers.FirstOrDefault(); + if (hostUser == null) + { + return null; + } + + using (DataFilter.Enable()) + { + using (CurrentTenant.Change(hostUser.TenantId)) + { + return await base.FindByLoginAsync(loginProvider, providerKey); + } + } + } + } + } + + public virtual async Task FindSharedUserByPasskeyIdAsync(byte[] credentialId) + { + if (MultiTenancyOptions.Value.UserSharingStrategy == TenantUserSharingStrategy.Isolated) + { + return await base.FindByPasskeyIdAsync(credentialId); + } + + using (CurrentTenant.Change(null)) + { + using (DataFilter.Disable()) + { + var hostusers = await UserRepository.GetUsersByPasskeyIdAsync(credentialId, cancellationToken: CancellationToken); + //host user first + var hostUser = hostusers.FirstOrDefault(x => x.TenantId == null) ?? hostusers.FirstOrDefault(x => x.TenantId != Guid.Empty) ?? hostusers.FirstOrDefault(); + if (hostUser == null) + { + return null; + } + + using (DataFilter.Enable()) + { + using (CurrentTenant.Change(hostUser.TenantId)) + { + return await base.FindByPasskeyIdAsync(credentialId); + } + } + } + } + } + } diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs index 68c05738db..cd6fa072a1 100644 --- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs @@ -455,6 +455,84 @@ public class EfCoreIdentityUserRepository : EfCoreRepository> GetUsersByNormalizedUserNameAsync(string normalizedUserName, bool includeDetails = false, CancellationToken cancellationToken = default) + { + return await (await GetDbSetAsync()) + .IncludeDetails(includeDetails) + .OrderBy(x => x.Id) + .Where(u => u.NormalizedUserName == normalizedUserName) + .ToListAsync(GetCancellationToken(cancellationToken)); + } + + public virtual async Task> GetUsersByNormalizedUserNamesAsync(string[] normalizedUserNames, bool includeDetails = false, CancellationToken cancellationToken = default) + { + return await (await GetDbSetAsync()) + .IncludeDetails(includeDetails) + .OrderBy(x => x.Id) + .Where(u => normalizedUserNames.Contains(u.NormalizedUserName)) + .Distinct() + .ToListAsync(GetCancellationToken(cancellationToken)); + } + + public virtual async Task> GetUsersByNormalizedEmailAsync(string normalizedEmail, bool includeDetails = false, CancellationToken cancellationToken = default) + { + return await (await GetDbSetAsync()) + .IncludeDetails(includeDetails) + .OrderBy(x => x.Id) + .Where(u => u.NormalizedEmail == normalizedEmail) + .ToListAsync(GetCancellationToken(cancellationToken)); + } + + public virtual async Task> GetUsersByNormalizedEmailsAsync(string[] normalizedEmails, bool includeDetails = false, CancellationToken cancellationToken = default) + { + return await (await GetDbSetAsync()) + .IncludeDetails(includeDetails) + .OrderBy(x => x.Id) + .Where(u => normalizedEmails.Contains(u.NormalizedEmail)) + .Distinct() + .ToListAsync(GetCancellationToken(cancellationToken)); + } + + public virtual async Task> GetUsersByLoginAsync(string loginProvider, string providerKey, bool includeDetails = false, CancellationToken cancellationToken = default) + { + return await (await GetDbSetAsync()) + .IncludeDetails(includeDetails) + .OrderBy(x => x.Id) + .Where(u => u.Logins.Any(login => login.LoginProvider == loginProvider && login.ProviderKey == providerKey)) + .ToListAsync(GetCancellationToken(cancellationToken)); + } + + public virtual async Task> GetUsersByPasskeyIdAsync(byte[] credentialId, bool includeDetails = false, CancellationToken cancellationToken = default) + { + return await (await GetDbSetAsync()) + .IncludeDetails(includeDetails) + .Where(u => u.Passkeys.Any(x => x.CredentialId.SequenceEqual(credentialId))) + .OrderBy(x => x.Id) + .ToListAsync(GetCancellationToken(cancellationToken)); + } + + public virtual async Task FindByNormalizedUserNameAsync(Guid? tenantId, string normalizedUserName, bool includeDetails = true, CancellationToken cancellationToken = default) + { + return await (await GetDbSetAsync()) + .IncludeDetails(includeDetails) + .OrderBy(x => x.Id) + .FirstOrDefaultAsync( + u => u.TenantId == tenantId && u.NormalizedUserName == normalizedUserName, + GetCancellationToken(cancellationToken) + ); + } + + public virtual async Task FindByNormalizedEmailAsync(Guid? tenantId, string normalizedEmail, bool includeDetails = true, CancellationToken cancellationToken = default) + { + return await (await GetDbSetAsync()) + .IncludeDetails(includeDetails) + .OrderBy(x => x.Id) + .FirstOrDefaultAsync( + u => u.TenantId == tenantId && u.NormalizedEmail == normalizedEmail, + GetCancellationToken(cancellationToken) + ); + } + protected virtual async Task> GetFilteredQueryableAsync( string filter = null, Guid? roleId = null, diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContextModelBuilderExtensions.cs b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContextModelBuilderExtensions.cs index 2b302e4cf8..429863c5ae 100644 --- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContextModelBuilderExtensions.cs +++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContextModelBuilderExtensions.cs @@ -33,7 +33,8 @@ public static class IdentityDbContextModelBuilderExtensions .HasColumnName(nameof(IdentityUser.TwoFactorEnabled)); b.Property(u => u.LockoutEnabled).HasDefaultValue(false) .HasColumnName(nameof(IdentityUser.LockoutEnabled)); - + b.Property(u => u.Leaved).HasDefaultValue(false) + .HasColumnName(nameof(IdentityUser.Leaved)); b.Property(u => u.IsExternal).IsRequired().HasDefaultValue(false) .HasColumnName(nameof(IdentityUser.IsExternal)); diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs index 2a8654cd3b..9209946d7f 100644 --- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs @@ -451,6 +451,75 @@ public class MongoIdentityUserRepository : MongoDbRepository> GetUsersByNormalizedUserNameAsync(string normalizedUserName, bool includeDetails = false, CancellationToken cancellationToken = default) + { + return await (await GetQueryableAsync(cancellationToken)) + .OrderBy(x => x.Id) + .Where(u => u.NormalizedUserName == normalizedUserName) + .ToListAsync(cancellationToken: cancellationToken); + } + + public virtual async Task> GetUsersByNormalizedUserNamesAsync(string[] normalizedUserNames, bool includeDetails = false, CancellationToken cancellationToken = default) + { + return await (await GetQueryableAsync(cancellationToken)) + .OrderBy(x => x.Id) + .Where(u => normalizedUserNames.Contains(u.NormalizedUserName)) + .Distinct() + .ToListAsync(cancellationToken: cancellationToken); + } + + public virtual async Task> GetUsersByNormalizedEmailAsync(string normalizedEmail, bool includeDetails = false, CancellationToken cancellationToken = default) + { + return await (await GetQueryableAsync(cancellationToken)) + .OrderBy(x => x.Id) + .Where(u => u.NormalizedEmail == normalizedEmail) + .ToListAsync(cancellationToken: cancellationToken); + } + + public virtual async Task> GetUsersByNormalizedEmailsAsync(string[] normalizedEmails, bool includeDetails = false, CancellationToken cancellationToken = default) + { + return await (await GetQueryableAsync(cancellationToken)) + .OrderBy(x => x.Id) + .Where(u => normalizedEmails.Contains(u.NormalizedEmail)) + .Distinct() + .ToListAsync(cancellationToken: cancellationToken); + } + + public virtual async Task> GetUsersByLoginAsync(string loginProvider, string providerKey, bool includeDetails = false, CancellationToken cancellationToken = default) + { + return await (await GetQueryableAsync(cancellationToken)) + .OrderBy(x => x.Id) + .Where(u => u.Logins.Any(login => login.LoginProvider == loginProvider && login.ProviderKey == providerKey)) + .ToListAsync(cancellationToken: cancellationToken); + } + + public virtual async Task> GetUsersByPasskeyIdAsync(byte[] credentialId, bool includeDetails = false, CancellationToken cancellationToken = default) + { + return await (await GetQueryableAsync(cancellationToken)) + .OrderBy(x => x.Id) + .Where(u => u.Passkeys.Any(x => x.CredentialId == credentialId)) + .ToListAsync(cancellationToken: cancellationToken); + } + + public virtual async Task FindByNormalizedUserNameAsync(Guid? tenantId, string normalizedUserName, bool includeDetails = true, CancellationToken cancellationToken = default) + { + return await (await GetQueryableAsync(cancellationToken)) + .OrderBy(x => x.Id) + .FirstOrDefaultAsync( + u => u.TenantId == tenantId && u.NormalizedUserName == normalizedUserName, + GetCancellationToken(cancellationToken) + ); + } + + public virtual async Task FindByNormalizedEmailAsync(Guid? tenantId, string normalizedEmail, bool includeDetails = true, CancellationToken cancellationToken = default) + { + return await (await GetQueryableAsync(cancellationToken)) + .OrderBy(x => x.Id).FirstOrDefaultAsync( + u => u.TenantId == tenantId && u.NormalizedEmail == normalizedEmail, + GetCancellationToken(cancellationToken) + ); + } + protected virtual async Task> GetFilteredQueryableAsync( string filter = null, Guid? roleId = null, diff --git a/modules/identity/test/Volo.Abp.Identity.AspNetCore.Tests/Volo/Abp/Identity/AspNetCore/AbpIdentityUserValidator_Tests.cs b/modules/identity/test/Volo.Abp.Identity.AspNetCore.Tests/Volo/Abp/Identity/AspNetCore/AbpIdentityUserValidator_Tests.cs index 6b656fbec4..752bc3496a 100644 --- a/modules/identity/test/Volo.Abp.Identity.AspNetCore.Tests/Volo/Abp/Identity/AspNetCore/AbpIdentityUserValidator_Tests.cs +++ b/modules/identity/test/Volo.Abp.Identity.AspNetCore.Tests/Volo/Abp/Identity/AspNetCore/AbpIdentityUserValidator_Tests.cs @@ -1,9 +1,12 @@ using System; using System.Linq; using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Localization; using Shouldly; using Volo.Abp.Identity.Localization; +using Volo.Abp.MultiTenancy; using Xunit; namespace Volo.Abp.Identity.AspNetCore; @@ -60,3 +63,131 @@ public class AbpIdentityUserValidator_Tests : AbpIdentityAspNetCoreTestBase identityResult.Errors.First().Description.ShouldBe(Localizer["Volo.Abp.Identity:InvalidEmail", "user1@volosoft.com"]); } } + +public class AbpIdentityUserValidator_SharedUser_Compatible_Tests : AbpIdentityUserValidator_Tests +{ + protected override void ConfigureServices(HostBuilderContext context, IServiceCollection services) + { + services.Configure(options => + { + options.IsEnabled = true; + options.UserSharingStrategy = TenantUserSharingStrategy.Shared; + }); + } +} + +public class AbpIdentityUserValidator_SharedUser_Tests : AbpIdentityAspNetCoreTestBase +{ + private readonly IdentityUserManager _identityUserManager; + private readonly ICurrentTenant _currentTenant; + + public AbpIdentityUserValidator_SharedUser_Tests() + { + _identityUserManager = GetRequiredService(); + _currentTenant = GetRequiredService(); + } + + protected override void ConfigureServices(HostBuilderContext context, IServiceCollection services) + { + services.Configure(options => + { + options.IsEnabled = true; + options.UserSharingStrategy = TenantUserSharingStrategy.Shared; + }); + } + + [Fact] + public async Task Should_Reject_Duplicate_UserName_Across_Tenants() + { + var tenant1Id = Guid.NewGuid(); + var tenant2Id = Guid.NewGuid(); + + using (_currentTenant.Change(tenant1Id)) + { + var user1 = new IdentityUser(Guid.NewGuid(), "shared-user", "shared-user-1@volosoft.com"); + (await _identityUserManager.CreateAsync(user1)).Succeeded.ShouldBeTrue(); + } + + using (_currentTenant.Change(tenant2Id)) + { + var user2 = new IdentityUser(Guid.NewGuid(), "shared-user", "shared-user-2@volosoft.com"); + var result = await _identityUserManager.CreateAsync(user2); + + result.Succeeded.ShouldBeFalse(); + result.Errors.Count().ShouldBe(1); + result.Errors.First().Code.ShouldBe("DuplicateUserName"); + } + } + + [Fact] + public async Task Should_Reject_Duplicate_Email_Across_Tenants() + { + var tenant1Id = Guid.NewGuid(); + var tenant2Id = Guid.NewGuid(); + const string sharedEmail = "shared-email@volosoft.com"; + + using (_currentTenant.Change(tenant1Id)) + { + var user1 = new IdentityUser(Guid.NewGuid(), "shared-email-user-1", sharedEmail); + (await _identityUserManager.CreateAsync(user1)).Succeeded.ShouldBeTrue(); + } + + using (_currentTenant.Change(tenant2Id)) + { + var user2 = new IdentityUser(Guid.NewGuid(), "shared-email-user-2", sharedEmail); + var result = await _identityUserManager.CreateAsync(user2); + + result.Succeeded.ShouldBeFalse(); + result.Errors.Count().ShouldBe(1); + result.Errors.First().Code.ShouldBe("DuplicateEmail"); + } + } + + [Fact] + public async Task Should_Reject_UserName_That_Matches_Another_Users_Email_Across_Tenants() + { + var tenant1Id = Guid.NewGuid(); + var tenant2Id = Guid.NewGuid(); + const string sharedValue = "conflict@volosoft.com"; + + using (_currentTenant.Change(tenant1Id)) + { + var user1 = new IdentityUser(Guid.NewGuid(), "unique-user", sharedValue); + (await _identityUserManager.CreateAsync(user1)).Succeeded.ShouldBeTrue(); + } + + using (_currentTenant.Change(tenant2Id)) + { + var user2 = new IdentityUser(Guid.NewGuid(), sharedValue, "another@volosoft.com"); + var result = await _identityUserManager.CreateAsync(user2); + + result.Succeeded.ShouldBeFalse(); + result.Errors.Count().ShouldBe(1); + result.Errors.First().Code.ShouldBe("InvalidUserName"); + } + } + + [Fact] + public async Task Should_Reject_Email_That_Matches_Another_Users_UserName_Across_Tenants() + { + var tenant1Id = Guid.NewGuid(); + var tenant2Id = Guid.NewGuid(); + const string sharedValue = "conflict-user"; + + using (_currentTenant.Change(tenant1Id)) + { + var user1 = new IdentityUser(Guid.NewGuid(), sharedValue, "conflict-user-1@volosoft.com"); + (await _identityUserManager.CreateAsync(user1)).Succeeded.ShouldBeTrue(); + } + + using (_currentTenant.Change(tenant2Id)) + { + var user2 = new IdentityUser(Guid.NewGuid(), "another-user", sharedValue); + var result = await _identityUserManager.CreateAsync(user2); + + result.Succeeded.ShouldBeFalse(); + result.Errors.Count().ShouldBe(1); + result.Errors.First().Code.ShouldBe("InvalidEmail"); + } + } +} diff --git a/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/AbpIdentityErrorDescriber_Tests.cs b/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/AbpIdentityErrorDescriber_Tests.cs index a7f68ec0b2..18da5ae9ce 100644 --- a/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/AbpIdentityErrorDescriber_Tests.cs +++ b/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/AbpIdentityErrorDescriber_Tests.cs @@ -200,9 +200,12 @@ public class AbpIdentityErrorDescriber_Tests : AbpIdentityDomainTestBase var mismatchUser = new IdentityUser(Guid.NewGuid(), "mismatch_user_en", "mismatch_user_en@abp.io"); (await userManager.CreateAsync(mismatchUser, "Abp123!")).Succeeded.ShouldBeTrue(); - var mismatchResult = await userManager.ChangePasswordAsync(mismatchUser, "WrongOld123!", "NewAbp123!"); - mismatchResult.Succeeded.ShouldBeFalse(); - mismatchResult.Errors.ShouldContain(e => e.Description == "Incorrect password."); + var identityException = await Assert.ThrowsAsync(async () => + { + await userManager.ChangePasswordAsync(mismatchUser, "WrongOld123!", "NewAbp123!"); + }); + identityException.IdentityResult.Succeeded.ShouldBeFalse(); + identityException.IdentityResult.Errors.ShouldContain(e => e.Description == "Incorrect password."); var recoveryUser = new IdentityUser(Guid.NewGuid(), "recovery_user_en", "recovery_user_en@abp.io"); ObjectHelper.TrySetProperty(recoveryUser, x => x.TwoFactorEnabled, () => true); @@ -321,9 +324,12 @@ public class AbpIdentityErrorDescriber_Tests : AbpIdentityDomainTestBase var mismatchUser = new IdentityUser(Guid.NewGuid(), "mismatch_user_tr", "mismatch_user_tr@abp.io"); (await userManager.CreateAsync(mismatchUser, "Abp123!")).Succeeded.ShouldBeTrue(); - var mismatchResult = await userManager.ChangePasswordAsync(mismatchUser, "WrongOld123!", "NewAbp123!"); - mismatchResult.Succeeded.ShouldBeFalse(); - mismatchResult.Errors.ShouldContain(e => e.Description == "Hatalı şifre."); + var identityException = await Assert.ThrowsAsync(async () => + { + await userManager.ChangePasswordAsync(mismatchUser, "WrongOld123!", "NewAbp123!"); + }); + identityException.IdentityResult.Succeeded.ShouldBeFalse(); + identityException.IdentityResult.Errors.ShouldContain(e => e.Description == "Hatalı şifre."); var recoveryUser = new IdentityUser(Guid.NewGuid(), "recovery_user_tr", "recovery_user_tr@abp.io"); ObjectHelper.TrySetProperty(recoveryUser, x => x.TwoFactorEnabled, () => true); @@ -441,9 +447,12 @@ public class AbpIdentityErrorDescriber_Tests : AbpIdentityDomainTestBase var mismatchUser = new IdentityUser(Guid.NewGuid(), "mismatch_user_zh", "mismatch_user_zh@abp.io"); (await userManager.CreateAsync(mismatchUser, "Abp123!")).Succeeded.ShouldBeTrue(); - var mismatchResult = await userManager.ChangePasswordAsync(mismatchUser, "WrongOld123!", "NewAbp123!"); - mismatchResult.Succeeded.ShouldBeFalse(); - mismatchResult.Errors.ShouldContain(e => e.Description == "密码错误。"); + var identityException = await Assert.ThrowsAsync(async () => + { + await userManager.ChangePasswordAsync(mismatchUser, "WrongOld123!", "NewAbp123!"); + }); + identityException.IdentityResult.Succeeded.ShouldBeFalse(); + identityException.IdentityResult.Errors.ShouldContain(e => e.Description == "密码错误。"); var recoveryUser = new IdentityUser(Guid.NewGuid(), "recovery_user_zh", "recovery_user_zh@abp.io"); ObjectHelper.TrySetProperty(recoveryUser, x => x.TwoFactorEnabled, () => true); diff --git a/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityUserManager_Tests.cs b/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityUserManager_Tests.cs index da26de3e3d..48da394a05 100644 --- a/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityUserManager_Tests.cs +++ b/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityUserManager_Tests.cs @@ -490,3 +490,148 @@ public class IdentityUserManager_Tests : AbpIdentityDomainTestBase TestSettingValueProvider.AddSetting(IdentitySettingNames.Password.ForceUsersToPeriodicallyChangePassword, true.ToString()); } } + +public class SharedTenantUserSharingStrategy_IdentityUserManager_Tests : AbpIdentityDomainTestBase +{ + private readonly IdentityUserManager _identityUserManager; + private readonly IIdentityUserRepository _identityUserRepository; + private readonly ICurrentTenant _currentTenant; + private readonly IUnitOfWorkManager _unitOfWorkManager; + + public SharedTenantUserSharingStrategy_IdentityUserManager_Tests() + { + _identityUserManager = GetRequiredService(); + _identityUserRepository = GetRequiredService(); + _currentTenant = GetRequiredService(); + _unitOfWorkManager = GetRequiredService(); + } + + protected override void AfterAddApplication(IServiceCollection services) + { + services.Configure(options => + { + options.IsEnabled = true; + options.UserSharingStrategy = TenantUserSharingStrategy.Shared; + }); + } + + [Fact] + public async Task FindSharedUserByEmailAsync_Should_Return_Host_User() + { + var tenantId = Guid.NewGuid(); + var email = "shared-email@abp.io"; + + using (var uow = _unitOfWorkManager.Begin()) + { + await CreateUserAsync(null, "shared-host-email", email); + await CreateUserAsync(tenantId, "shared-tenant-email", email); + await uow.CompleteAsync(); + } + + using (_currentTenant.Change(tenantId)) + { + var user = await _identityUserManager.FindSharedUserByEmailAsync(email); + + user.ShouldNotBeNull(); + user.TenantId.ShouldBeNull(); + user.UserName.ShouldBe("shared-host-email"); + } + } + + [Fact] + public async Task FindSharedUserByNameAsync_Should_Return_Host_User() + { + var tenantId = Guid.NewGuid(); + var userName = "shared-user-name"; + + using (var uow = _unitOfWorkManager.Begin()) + { + await CreateUserAsync(null, userName, "shared-host-name@abp.io"); + await CreateUserAsync(tenantId, userName, "shared-tenant-name@abp.io"); + await uow.CompleteAsync(); + } + + using (_currentTenant.Change(tenantId)) + { + var user = await _identityUserManager.FindSharedUserByNameAsync(userName); + + user.ShouldNotBeNull(); + user.TenantId.ShouldBeNull(); + user.UserName.ShouldBe(userName); + } + } + + [Fact] + public async Task FindSharedUserByLoginAsync_Should_Return_Host_User() + { + var tenantId = Guid.NewGuid(); + const string loginProvider = "github"; + const string providerKey = "shared-login"; + + using (var uow = _unitOfWorkManager.Begin()) + { + await CreateUserAsync(null, "shared-host-login", "shared-host-login@abp.io", user => + { + user.AddLogin(new UserLoginInfo(loginProvider, providerKey, "Shared Login")); + }); + + await CreateUserAsync(tenantId, "shared-tenant-login", "shared-tenant-login@abp.io", user => + { + user.AddLogin(new UserLoginInfo(loginProvider, providerKey, "Shared Login")); + }); + + await uow.CompleteAsync(); + } + + using (_currentTenant.Change(tenantId)) + { + var user = await _identityUserManager.FindSharedUserByLoginAsync(loginProvider, providerKey); + + user.ShouldNotBeNull(); + user.TenantId.ShouldBeNull(); + user.UserName.ShouldBe("shared-host-login"); + } + } + + [Fact] + public async Task FindSharedUserByPasskeyIdAsync_Should_Return_Host_User() + { + var tenantId = Guid.NewGuid(); + var credentialId = new byte[] { 10, 20, 30, 40, 50, 60 }; + + using (var uow = _unitOfWorkManager.Begin()) + { + await CreateUserAsync(null, "shared-host-passkey", "shared-host-passkey@abp.io", user => + { + user.AddPasskey(credentialId, new IdentityPasskeyData()); + }); + await uow.CompleteAsync(); + } + + using (_currentTenant.Change(tenantId)) + { + var user = await _identityUserManager.FindSharedUserByPasskeyIdAsync(credentialId); + + user.ShouldNotBeNull(); + user.TenantId.ShouldBeNull(); + user.UserName.ShouldBe("shared-host-passkey"); + } + } + + private async Task CreateUserAsync( + Guid? tenantId, + string userName, + string email, + Action? configureUser = null) + { + var user = new IdentityUser(Guid.NewGuid(), userName, email, tenantId); + configureUser?.Invoke(user); + + using (_currentTenant.Change(tenantId)) + { + await _identityUserRepository.InsertAsync(user); + } + + return user; + } +} diff --git a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityUserRepository_Tests.cs b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityUserRepository_Tests.cs index 59a5c790f8..ebcc594515 100644 --- a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityUserRepository_Tests.cs +++ b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityUserRepository_Tests.cs @@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.DependencyInjection; using Shouldly; using Volo.Abp.Modularity; +using Volo.Abp.MultiTenancy; using Xunit; namespace Volo.Abp.Identity; @@ -19,6 +20,7 @@ public abstract class IdentityUserRepository_Tests : AbpIdentity protected IOrganizationUnitRepository OrganizationUnitRepository { get; } protected OrganizationUnitManager OrganizationUnitManager { get; } protected IdentityTestData TestData { get; } + protected ICurrentTenant CurrentTenant { get; } protected IdentityUserRepository_Tests() { @@ -28,6 +30,7 @@ public abstract class IdentityUserRepository_Tests : AbpIdentity OrganizationUnitRepository = GetRequiredService(); OrganizationUnitManager = GetRequiredService();; TestData = ServiceProvider.GetRequiredService(); + CurrentTenant = GetRequiredService(); } [Fact] @@ -317,4 +320,140 @@ public abstract class IdentityUserRepository_Tests : AbpIdentity (await UserRepository.FindByPasskeyIdAsync((byte[])[1, 2, 3])).ShouldBeNull(); } + + [Fact] + public async Task GetUsersByNormalizedUserNameAsync() + { + var users = await UserRepository.GetUsersByNormalizedUserNameAsync( + LookupNormalizer.NormalizeName("john.nash") + ); + + users.ShouldContain(u => u.Id == TestData.UserJohnId); + + users = await UserRepository.GetUsersByNormalizedUserNameAsync( + LookupNormalizer.NormalizeName("undefined-user") + ); + users.Count.ShouldBe(0); + } + + [Fact] + public async Task GetUsersByNormalizedUserNamesAsync() + { + var users = await UserRepository.GetUsersByNormalizedUserNamesAsync(new[] + { + LookupNormalizer.NormalizeName("john.nash"), + LookupNormalizer.NormalizeName("neo"), + LookupNormalizer.NormalizeName("undefined-user") + }); + + users.Count.ShouldBe(2); + users.ShouldContain(u => u.Id == TestData.UserJohnId); + users.ShouldContain(u => u.Id == TestData.UserNeoId); + } + + [Fact] + public async Task GetUsersByNormalizedEmailAsync() + { + var users = await UserRepository.GetUsersByNormalizedEmailAsync( + LookupNormalizer.NormalizeEmail("john.nash@abp.io") + ); + + users.ShouldContain(u => u.Id == TestData.UserJohnId); + + users = await UserRepository.GetUsersByNormalizedEmailAsync( + LookupNormalizer.NormalizeEmail("undefined-user@abp.io") + ); + users.Count.ShouldBe(0); + } + + [Fact] + public async Task GetUsersByNormalizedEmailsAsync() + { + var users = await UserRepository.GetUsersByNormalizedEmailsAsync(new[] + { + LookupNormalizer.NormalizeEmail("john.nash@abp.io"), + LookupNormalizer.NormalizeEmail("neo@abp.io"), + LookupNormalizer.NormalizeEmail("undefined-user@abp.io") + }); + + users.Count.ShouldBe(2); + users.ShouldContain(u => u.Id == TestData.UserJohnId); + users.ShouldContain(u => u.Id == TestData.UserNeoId); + } + + [Fact] + public async Task GetUsersByLoginAsync() + { + var users = await UserRepository.GetUsersByLoginAsync("github", "john"); + users.Count.ShouldBe(1); + users.ShouldContain(u => u.Id == TestData.UserJohnId); + + users = await UserRepository.GetUsersByLoginAsync("github", "undefined-user"); + users.Count.ShouldBe(0); + } + + [Fact] + public async Task GetUsersByPasskeyIdAsync() + { + var users = await UserRepository.GetUsersByPasskeyIdAsync(TestData.PasskeyCredentialId1); + users.Count.ShouldBe(1); + users.ShouldContain(u => u.Id == TestData.UserJohnId); + + users = await UserRepository.GetUsersByPasskeyIdAsync(TestData.PasskeyCredentialId3); + users.Count.ShouldBe(1); + users.ShouldContain(u => u.Id == TestData.UserNeoId); + + users = await UserRepository.GetUsersByPasskeyIdAsync((byte[])[1, 2, 3]); + users.Count.ShouldBe(0); + } + + [Fact] + public async Task FindByNormalizedUserNameAsync_With_TenantId() + { + var tenantId = Guid.NewGuid(); + var tenantUser = new IdentityUser(Guid.NewGuid(), "tenant.user", "tenant.user@abp.io", tenantId); + + await UserRepository.InsertAsync(tenantUser, autoSave: true); + + using (CurrentTenant.Change(tenantId)) + { + var user = await UserRepository.FindByNormalizedUserNameAsync( + tenantId, + LookupNormalizer.NormalizeName("tenant.user") + ); + + user.ShouldNotBeNull(); + user.Id.ShouldBe(tenantUser.Id); + } + + (await UserRepository.FindByNormalizedUserNameAsync( + tenantId, + LookupNormalizer.NormalizeName("tenant.user") + )).ShouldBeNull(); + } + + [Fact] + public async Task FindByNormalizedEmailAsync_With_TenantId() + { + var tenantId = Guid.NewGuid(); + var tenantUser = new IdentityUser(Guid.NewGuid(), "tenant.email", "tenant.email@abp.io", tenantId); + + await UserRepository.InsertAsync(tenantUser, autoSave: true); + + using (CurrentTenant.Change(tenantId)) + { + var user = await UserRepository.FindByNormalizedEmailAsync( + tenantId, + LookupNormalizer.NormalizeEmail("tenant.email@abp.io") + ); + + user.ShouldNotBeNull(); + user.Id.ShouldBe(tenantUser.Id); + } + + (await UserRepository.FindByNormalizedEmailAsync( + tenantId, + LookupNormalizer.NormalizeEmail("tenant.email@abp.io") + )).ShouldBeNull(); + } } diff --git a/modules/openiddict/app/OpenIddict.Demo.Server/package.json b/modules/openiddict/app/OpenIddict.Demo.Server/package.json index 52a1fc6c21..e544c427a0 100644 --- a/modules/openiddict/app/OpenIddict.Demo.Server/package.json +++ b/modules/openiddict/app/OpenIddict.Demo.Server/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0" } } diff --git a/modules/openiddict/app/angular/package.json b/modules/openiddict/app/angular/package.json index 0eccde558f..b36953bf65 100644 --- a/modules/openiddict/app/angular/package.json +++ b/modules/openiddict/app/angular/package.json @@ -12,15 +12,15 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~10.1.0-rc.2", - "@abp/ng.components": "~10.1.0-rc.2", - "@abp/ng.core": "~10.1.0-rc.2", - "@abp/ng.oauth": "~10.1.0-rc.2", - "@abp/ng.identity": "~10.1.0-rc.2", - "@abp/ng.setting-management": "~10.1.0-rc.2", - "@abp/ng.tenant-management": "~10.1.0-rc.2", - "@abp/ng.theme.shared": "~10.1.0-rc.2", - "@abp/ng.theme.lepton-x": "~5.1.0-rc.2", + "@abp/ng.account": "~10.1.0", + "@abp/ng.components": "~10.1.0", + "@abp/ng.core": "~10.1.0", + "@abp/ng.oauth": "~10.1.0", + "@abp/ng.identity": "~10.1.0", + "@abp/ng.setting-management": "~10.1.0", + "@abp/ng.tenant-management": "~10.1.0", + "@abp/ng.theme.shared": "~10.1.0", + "@abp/ng.theme.lepton-x": "~5.1.0", "@angular/animations": "^15.0.1", "@angular/common": "^15.0.1", "@angular/compiler": "^15.0.1", @@ -36,7 +36,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~10.1.0-rc.2", + "@abp/ng.schematics": "~10.1.0", "@angular-devkit/build-angular": "^15.0.1", "@angular-eslint/builder": "~15.1.0", "@angular-eslint/eslint-plugin": "~15.1.0", diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs index 09c5867102..356e334f91 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs @@ -60,8 +60,8 @@ public partial class PermissionManagementModal NormalizePermissionGroup(); - GrantAll = _groups.SelectMany(x => x.Permissions).All(p => p.IsGranted); - GrantAny = !GrantAll && _groups.SelectMany(x => x.Permissions).Any(p => p.IsGranted); + GrantAll = _allGroups.SelectMany(x => x.Permissions).All(p => p.IsGranted); + GrantAny = !GrantAll && _allGroups.SelectMany(x => x.Permissions).Any(p => p.IsGranted); await InvokeAsync(_modal.Show); } @@ -188,8 +188,8 @@ public partial class PermissionManagementModal } } - GrantAll = _groups.SelectMany(x => x.Permissions).All(p => p.IsGranted); - GrantAny = !GrantAll && _groups.SelectMany(x => x.Permissions).Any(p => p.IsGranted); + GrantAll = _allGroups.SelectMany(x => x.Permissions).All(p => p.IsGranted); + GrantAny = !GrantAll && _allGroups.SelectMany(x => x.Permissions).Any(p => p.IsGranted); await InvokeAsync(StateHasChanged); } @@ -211,8 +211,8 @@ public partial class PermissionManagementModal } } - GrantAll = _groups.SelectMany(x => x.Permissions).All(p => p.IsGranted); - GrantAny = !GrantAll && _groups.SelectMany(x => x.Permissions).Any(p => p.IsGranted); + GrantAll = _allGroups.SelectMany(x => x.Permissions).All(p => p.IsGranted); + GrantAny = !GrantAll && _allGroups.SelectMany(x => x.Permissions).Any(p => p.IsGranted); await InvokeAsync(StateHasChanged); } @@ -334,8 +334,8 @@ public partial class PermissionManagementModal _permissionGroupSearchText = value; _groups = _permissionGroupSearchText.IsNullOrWhiteSpace() ? _allGroups.ToList() : _allGroups.Where(x => x.DisplayName.Contains(_permissionGroupSearchText, StringComparison.OrdinalIgnoreCase) || x.Permissions.Any(permission => permission.DisplayName.Contains(_permissionGroupSearchText, StringComparison.OrdinalIgnoreCase))).ToList(); - GrantAll = _groups.SelectMany(x => x.Permissions).All(p => p.IsGranted); - GrantAny = !GrantAll && _groups.SelectMany(x => x.Permissions).Any(p => p.IsGranted); + GrantAll = _allGroups.SelectMany(x => x.Permissions).All(p => p.IsGranted); + GrantAny = !GrantAll && _allGroups.SelectMany(x => x.Permissions).Any(p => p.IsGranted); NormalizePermissionGroup(false); diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainModule.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainModule.cs index 3029625ffb..aa77063dd7 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainModule.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainModule.cs @@ -31,8 +31,6 @@ public class AbpPermissionManagementDomainModule : AbpModule public override void ConfigureServices(ServiceConfigurationContext context) { - context.Services.Replace(ServiceDescriptor.Singleton()); - if (context.Services.IsDataMigrationEnvironment()) { Configure(options => diff --git a/modules/permission-management/test/Volo.Abp.PermissionManagement.TestBase/Volo/Abp/PermissionManagement/AbpPermissionManagementTestBaseModule.cs b/modules/permission-management/test/Volo.Abp.PermissionManagement.TestBase/Volo/Abp/PermissionManagement/AbpPermissionManagementTestBaseModule.cs index 88c6ea1d69..bf6eca7bc2 100644 --- a/modules/permission-management/test/Volo.Abp.PermissionManagement.TestBase/Volo/Abp/PermissionManagement/AbpPermissionManagementTestBaseModule.cs +++ b/modules/permission-management/test/Volo.Abp.PermissionManagement.TestBase/Volo/Abp/PermissionManagement/AbpPermissionManagementTestBaseModule.cs @@ -1,6 +1,8 @@ using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; using Volo.Abp.Authorization.Permissions; using Volo.Abp.Autofac; +using Volo.Abp.DistributedLocking; using Volo.Abp.Modularity; using Volo.Abp.Threading; @@ -15,6 +17,8 @@ public class AbpPermissionManagementTestBaseModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { + context.Services.Replace(ServiceDescriptor.Singleton()); + context.Services.Configure(options => { options.ManagementProviders.Add(); diff --git a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json index 3a8321fed9..fa6daf88f1 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json @@ -3,6 +3,6 @@ "name": "demo-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0" } } diff --git a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock index a2b6e13b29..1910c85cf1 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock @@ -2,185 +2,185 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.1.0-rc.2.tgz#599f5c47a417d1230fc17c0446a0229f920f7246" - integrity sha512-8F4nEK+VtgRRf8n+66HMbtCEaOMCW/OdbSEWRl9ahMNoj860oPIJ8P8Qn/2+LjtkPMdDAfCdEzyDzCd3igaFaA== +"@abp/aspnetcore.mvc.ui.theme.basic@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.1.0.tgz#94f68982ce8b67b6ac827f824aed3faad50e56e9" + integrity sha512-wqbEANW8CRZ+/7qGNprC828yNN17TsYtFxywL0B+EA2UfUtcTpzR/3ompZd/XcDm3N2NmS1n5Ao3WEn2NJlHgA== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~10.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.shared" "~10.1.0" -"@abp/aspnetcore.mvc.ui.theme.shared@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.1.0-rc.2.tgz#e5056e4e159f5815e3cffecab5c46f3d7d4f79d7" - integrity sha512-bo56XzQZPYL/3ckWTTTSSUsSFSFJobvfE29cz13NIrZ/tBtWyQCAJn92wYHuY+6IezYUWb4ga3PkFeHRzR142A== +"@abp/aspnetcore.mvc.ui.theme.shared@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.1.0.tgz#b89c5d38fdeceda9e421f9357842838be36dce49" + integrity sha512-9QyZ7lYr17thTKxq9WN/KVCxNyYurY5Ph9y3vFBkA3u+uOZcaxdw0T417vy0hJvAB7RGlkpLRTmZL7q5P9FzJA== dependencies: - "@abp/aspnetcore.mvc.ui" "~10.1.0-rc.2" - "@abp/bootstrap" "~10.1.0-rc.2" - "@abp/bootstrap-datepicker" "~10.1.0-rc.2" - "@abp/bootstrap-daterangepicker" "~10.1.0-rc.2" - "@abp/datatables.net-bs5" "~10.1.0-rc.2" - "@abp/font-awesome" "~10.1.0-rc.2" - "@abp/jquery-form" "~10.1.0-rc.2" - "@abp/jquery-validation-unobtrusive" "~10.1.0-rc.2" - "@abp/lodash" "~10.1.0-rc.2" - "@abp/luxon" "~10.1.0-rc.2" - "@abp/malihu-custom-scrollbar-plugin" "~10.1.0-rc.2" - "@abp/moment" "~10.1.0-rc.2" - "@abp/select2" "~10.1.0-rc.2" - "@abp/sweetalert2" "~10.1.0-rc.2" - "@abp/timeago" "~10.1.0-rc.2" - -"@abp/aspnetcore.mvc.ui@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.1.0-rc.2.tgz#e25d3575d40bfcb3f809bd2d355671181ee5ff40" - integrity sha512-MOF86bVbi7N/nIla+361nsBrN4tiSka8xzpWcgqlLcCAl9ILG4rugbtafBAjN81taPma2peZM7egaOR4SDkTMw== + "@abp/aspnetcore.mvc.ui" "~10.1.0" + "@abp/bootstrap" "~10.1.0" + "@abp/bootstrap-datepicker" "~10.1.0" + "@abp/bootstrap-daterangepicker" "~10.1.0" + "@abp/datatables.net-bs5" "~10.1.0" + "@abp/font-awesome" "~10.1.0" + "@abp/jquery-form" "~10.1.0" + "@abp/jquery-validation-unobtrusive" "~10.1.0" + "@abp/lodash" "~10.1.0" + "@abp/luxon" "~10.1.0" + "@abp/malihu-custom-scrollbar-plugin" "~10.1.0" + "@abp/moment" "~10.1.0" + "@abp/select2" "~10.1.0" + "@abp/sweetalert2" "~10.1.0" + "@abp/timeago" "~10.1.0" + +"@abp/aspnetcore.mvc.ui@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.1.0.tgz#79d76232aacb9c8e1762d903f75007d0418bf5a8" + integrity sha512-brVfaSUicZuSuwtizrEcMvtRjFsoAHr9i56HjJZb7bmElr+q5STiul3stRumly4IfoLkYqdy85hMk+B3G0bJDg== dependencies: ansi-colors "^4.1.3" -"@abp/bootstrap-datepicker@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.1.0-rc.2.tgz#be80c6104ba53e18935fbf62ca2c1890f4b2fde4" - integrity sha512-BNcDYUSbZaLah4SfXm0efoqFTsOViVm6370k9L7vix/OGpIWwklJsr8y78lvdM5ANgNCfl0LPSq+seLJFc/OLA== +"@abp/bootstrap-datepicker@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.1.0.tgz#68270ed8cf8e0c23a77331ef2ba6ef2d1da3cefc" + integrity sha512-ahKKHlluo4U1Z238mBNzpL0YaErTPENLQDVLNZB1BnZcUTqz1j7WJHGZoy4j3CXZKt7mnFCRe1+vJMCcwP+DYA== dependencies: bootstrap-datepicker "^1.10.1" -"@abp/bootstrap-daterangepicker@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.1.0-rc.2.tgz#f189f7d070ebd97d9cfdcb99571cab2d6a198ab5" - integrity sha512-bV8J0MuiAFVLkr48JsB6aZU6aPoqw+Gyhq1szQ74bEwNQlRBPuF92WVA5FACaUBj8dMUzR9HDDAYQuxUzpKYKA== +"@abp/bootstrap-daterangepicker@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.1.0.tgz#69f7775eafe7c038c2684d3e990384c8f2966cff" + integrity sha512-mFMaH7GqPn7W5zzIMOOTl4f0at9Vx8da4ewvPU/IvngrTeezMRPC1tofHmiWDhHfZpzF5J9DDMCGul9Q4nOl5A== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.1.0-rc.2.tgz#2300800a29ea09b91f5ed2e6177e5921fe7d2a0f" - integrity sha512-K+tDI9vz/Y9B/yu0i3AVpm4v3Odi44Q/yH5hAprL7f4pGxEOiqAFB/qzHAxG+7Oa7wjv5tPLv+Cz4DavBQjd8Q== +"@abp/bootstrap@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-10.1.0.tgz#816436ab547fc46d4c00b1facbdd80e3f4f78af1" + integrity sha512-ioqQDOvjXIUWncmLJuTcLPTnlJ3xGxyKXC9veSTJWFd+5pZswK7/QIlAuTvIIujs/7Z13GLunUIMMjny7WFBMw== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" bootstrap "^5.3.8" -"@abp/core@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.1.0-rc.2.tgz#403687aff5a30788f7b7ca660abdfd85d89438aa" - integrity sha512-euuG2Hna/DT6/R1dGOjgp3vcehYtF+CcOkRj31oquYKaM5YWk4OaZ314DSpnjgs/xo8DuVc4eKFQwIxD9RK41w== +"@abp/core@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-10.1.0.tgz#7cb21012deee5510a0774d982f85627d47b368f4" + integrity sha512-/N0K2NVdk5/OM+Q5JDnpC+0CD0mS4wpDhLO1SIQbMXSTFbplhfPw2SFm7+MvPA9pVx2L8TYAzXmS7CtAJxKvCg== dependencies: - "@abp/utils" "~10.1.0-rc.2" + "@abp/utils" "~10.1.0" -"@abp/datatables.net-bs5@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.1.0-rc.2.tgz#a60650d1802b40751d30f8f6c56beb23fd66481b" - integrity sha512-IWwexNqbMpET54Fvm9LoPTJYf+4CoBbjFOvz3sL6CgO2feV5R5fKigjVU8zXKNh2W+RG8L6zEarfVxrr114TsA== +"@abp/datatables.net-bs5@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-10.1.0.tgz#ea2a60c22bdcc80882662b9f55f198793f6ea556" + integrity sha512-dPe3bVW3Hfnm/X9Bw5k7TuEIsYYwFk1faC8kIxf2Spk+4Z9TdYFS2zGaHBYStE9iRtKmneNYMykG2O88mX3quA== dependencies: - "@abp/datatables.net" "~10.1.0-rc.2" + "@abp/datatables.net" "~10.1.0" datatables.net-bs5 "^2.3.4" -"@abp/datatables.net@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.1.0-rc.2.tgz#9147f68bc6dbc4eb40a9ddf65c7859e788cdcac2" - integrity sha512-a9DJpwg14S4nVOiC4ipw0CQwEYWB602e2gCJiH7W1mxopbQb135RxwhtdTnW//eIONcxC9IrEuvcBEAUVt2B7Q== +"@abp/datatables.net@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-10.1.0.tgz#7fe641883e6d1417c86a030481777a75c9a5a555" + integrity sha512-p9S/ZaJ4OXpihTOWIxsSQ0s3G4S+ScQLD+Q+w0NrWbUa7HTKg9tdqSh6VDhyW9KZ/iiLUO5jNzsAFXyUjjDQuw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" datatables.net "^2.3.4" -"@abp/font-awesome@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.1.0-rc.2.tgz#364466cfe67e41e0c4d16b57d3923d10f66369f1" - integrity sha512-F1Jy8xoFV2aA+VN+NH1gtrG96/j9w7Picc+KLoCoIyNnJr/xJur11XkJyu5ln8KF4V7p/DY7QaQodWV/btOs8g== +"@abp/font-awesome@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-10.1.0.tgz#79c5b7eb9a85467b0078b9f9bf201493fc3de358" + integrity sha512-dm4VRtZnvm5p8mYQys9KWLkQ+JdwPahQSan2DV1s5Rq4P96hk8p8VshZu7pI3iE0MS+rSZnXYvetZrqCdt1mOQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" "@fortawesome/fontawesome-free" "^7.0.1" -"@abp/jquery-form@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.1.0-rc.2.tgz#3857717d07569c22d4bbbe459238abeb816d606a" - integrity sha512-2D5WHVnfK9bhRces1tgPwOEoc7KCYKYiKHBOcqct+LTA7zoRjJv/PM8/JhFVl+grVIw1aSwO4tU3YfZ22Vxipg== +"@abp/jquery-form@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-10.1.0.tgz#7c19605eb103519fea332d0f153cac185b7f2ebb" + integrity sha512-ddlapZqFVwpXU3uDi/RnQ6uSpseMxPAKE+/LgLF+SVyPzazNFognxPT3ztzqTk84P/gFleNgNjAfUlKrfyIfGw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.1.0-rc.2.tgz#efd7b69a078a20c0bf405408dbdf52a7bf770b3b" - integrity sha512-tZ0MWgzBqp+SNfMxM0z2cGB21NiTHuVJyyQaXKE/ptuD5pc0uRkcqw/J2kWfiqsoVgChz27IB6h8/jqDafS4qg== +"@abp/jquery-validation-unobtrusive@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.1.0.tgz#13aa462c4347d3459541a9a9ea19a60458805328" + integrity sha512-94smwn/W3d+gkX2UKH+/OiB7poKDP1ZK0DqWiiH4BGGmpRk9j3B+eJxPbL86dwNG4XT8upuX3ZOrUb6Fy2SA3A== dependencies: - "@abp/jquery-validation" "~10.1.0-rc.2" + "@abp/jquery-validation" "~10.1.0" jquery-validation-unobtrusive "^4.0.0" -"@abp/jquery-validation@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.1.0-rc.2.tgz#d39537a7356c51f9db2e66f6740cf6df86bd0442" - integrity sha512-LOkS0NKk4pLtLjPU0CCbwROyUg6EtJN8Z/it7QuKK1CIRfYYcAStgNnNm5geZP7CqECIkoiFfgWjI+L5Z9/Tfg== +"@abp/jquery-validation@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-10.1.0.tgz#5389785f5ff359ecd6291889420d6c2f84e633aa" + integrity sha512-/X5smp0xpNqCM+BuLI9eEyMPQ0uF42hmEfBvCIfWWBhfp7uFfq7sS706QcGfXYqFdpprRYoUJGKDfSaHxPaJUA== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" jquery-validation "^1.21.0" -"@abp/jquery@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.1.0-rc.2.tgz#101a55f70d510978c8c05f5857d0e9d4965263f7" - integrity sha512-bQV1uFWGtwRYjNOsqJ8FM2004idX2Jj7YVL19YF1/PjyPUSMX+s8/IvJizBjyY5hPAiWBBhmV9g+IFWzxlDQoQ== +"@abp/jquery@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-10.1.0.tgz#d8812a7d410ad959a1ed27696beb9b7885142684" + integrity sha512-cVF2hOP6GGp0N3VMBOFjEHuHFgXbDH8x0d7Agw4DN2ydFU8wYuj3m9u0HCc0aoBG6Zls90tMpTfM0RqDNFgCKA== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" jquery "~3.7.1" -"@abp/lodash@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.1.0-rc.2.tgz#d08c03f8d3d0fbaa3e71e603cbe5fb7f176933ef" - integrity sha512-KCnD1p2y52ZI+2ifpiFIUAiDPsKehnOD8HV5qKeObO6UCP97okif8IP+sQDmNQb8O33y/NKTyx/HcpwBbe/NYQ== +"@abp/lodash@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-10.1.0.tgz#fdebe764d1142abfd3ecdeef56aa33746e31815b" + integrity sha512-r4WwpqLFFQi721edd8XF5wueAdqEvx75dmRlEuhZoIBA6RQ0yYjTRMNWjTOlIEzFDGj7XrisV5CSUQ9BhhuS+Q== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" lodash "^4.17.21" -"@abp/luxon@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.1.0-rc.2.tgz#ef8d2b323bac054fc9610e241e1b1763d229e065" - integrity sha512-qYFl6XO3g9mZiu0dtIczI7LRuYWwc+RkpbDzSmruXcRks3KA+ZZco2vhHNnlwtXcINl/TXtbW7Wc0MX+8IB1Kw== +"@abp/luxon@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-10.1.0.tgz#c80cdb1a85e9cc824946dc0009df0daba384a4ca" + integrity sha512-slwiGSrevvWZrBhuy9sw7UP6akk2Ln9eAY3nxxo8xzE7C7uezcNk12dbKN4psdSAVpbDwuqC3GGrkmcFL+6sBQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" luxon "^3.7.2" -"@abp/malihu-custom-scrollbar-plugin@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.1.0-rc.2.tgz#dfaf666442c7c122f7da72c83b9adf194d5b6ec8" - integrity sha512-PudMHmNQgZ6JZeaVt1ZoXLqO0UZXJzUYiBah2LDkC4EMLjnMJFINHBoEVVa4ooXH0yjFv+zsbN0vWZYJ8TBJIA== +"@abp/malihu-custom-scrollbar-plugin@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.1.0.tgz#d257e83b7cc1af89a708e365eef7af0136ccebcf" + integrity sha512-+h8hoYUkjcYBdm/M3b8c3CeE5WNU8K6kQ5MwQXNaaGLCvwEmZHy0A6+U8yxtKv2eRRhAkAqOkQyWYRWA5w1XzQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.1.0-rc.2.tgz#610a1592d13984aea51abbd13df8c5995a089149" - integrity sha512-ep8PnAXARw0t/wtGOVp/oiNhF3B0Bh6y2vRzKrcSoyXAQREGGm4fJdZVYZLGTfI4lFLTjebEgf4O7T9feUwJAw== +"@abp/moment@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/moment/-/moment-10.1.0.tgz#5755e4e10a7302e2832b1a1ce571f20b27600303" + integrity sha512-faHV7vmPEjFUJTRNTTlmnpx0VZuyvQt4O98WBLAjPdcqpLfWazdS9Ro405St5liIkgvmAXWsrwVmZb0VKTLcNA== dependencies: moment "^2.30.1" -"@abp/select2@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.1.0-rc.2.tgz#40c5418d007fc36817eecbe6388d767e4e7ca887" - integrity sha512-Pq0wlpL01sWRLUg5um3JtBXIqi3mmbwPwvgxP8hFbQngAt9JXAK8geNRiTMrIZgtW/ycXtM1v6I4zuWOLOeAGg== +"@abp/select2@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-10.1.0.tgz#8b15954e462e65329b8eb481226170df6d55d36a" + integrity sha512-7+1GirZe4i/2/LR4jZgWhiN6lFHhClLtUmrdCjh7FeeuBvy5GGA417DybDihna/GzlcOVI4GHnn2fjEwcFqJiw== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" select2 "^4.0.13" -"@abp/sweetalert2@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.1.0-rc.2.tgz#d35858c69e10c6726b02cdfcea88dfc32385963f" - integrity sha512-s9VPRToohN45uzHcKCF5Mcj8FVjsXcXUb0U3tuaT/Y+u4adHB3fBxYiXJFM0sVsCJ81dFktxwka40Wm8Taz/zA== +"@abp/sweetalert2@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-10.1.0.tgz#6997cb7909671f9deddaea53f17ed054aab27cd3" + integrity sha512-vlkH+DkuQBvOqnDPqTtyZ5mHb+GfIR/QJBXI7yrS62ML+ZNqkg0vXftCrm4aAR2kPmvgYsbUOJcKJAmgydcOEQ== dependencies: - "@abp/core" "~10.1.0-rc.2" + "@abp/core" "~10.1.0" sweetalert2 "^11.23.0" -"@abp/timeago@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.1.0-rc.2.tgz#98d630cc3843eee64dbcc34fb8ca5afbab034718" - integrity sha512-vJmk+otyXXJE2s2J8iYpLVaFuNAYnIUSOitmi7umYnL+k/UE2KQhBXU7FR0/OBY9mAZYd+shaiGIU1LMSaJ+Xg== +"@abp/timeago@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-10.1.0.tgz#45c1e8b1451e31910e330053981a871787fe02f1" + integrity sha512-3RVMlBbOepa4WBTLthRmf2VddkNwsjE+FNnaSUaMQ2ZQaXnghnZc4xZ3f3oKraGcWMgqpz1IfrWWV1POKRsEXw== dependencies: - "@abp/jquery" "~10.1.0-rc.2" + "@abp/jquery" "~10.1.0" timeago "^1.6.7" -"@abp/utils@~10.1.0-rc.2": - version "10.1.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.1.0-rc.2.tgz#86a980c6536b3b5ce185d406723b28be421864ac" - integrity sha512-Oz863VNA8fraQ81vTvqM0IqwiaseLwfFU5QNn6iOGOfn5wQrEkPwtZ0jMI+DGNtJgPzoKiq+iKc3K+SiuVgldg== +"@abp/utils@~10.1.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-10.1.0.tgz#ef7f6bf16abb34b77fa57c156b264154827bc0af" + integrity sha512-UDgbvDMbcQklNu+SlQPhkIcIfZoWsQjCCzihanLBiHc474BCOlcTsO6K/EatV9LwqG3zY0mYd0ExAWjH44G0rQ== dependencies: just-compare "^2.3.0" diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor index 66b0f96604..ad3e6cf559 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor @@ -107,7 +107,7 @@ { -
+ @L["SendTestEmail"] @@ -158,7 +158,7 @@ - + @L["Send"]
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ar.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ar.json index 44077ac44f..38464ed8c0 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ar.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ar.json @@ -35,7 +35,7 @@ "Feature:SettingManagementGroup": "إدارة الإعداد", "Feature:SettingManagementEnable": "تمكين إدارة الإعداد", "Feature:SettingManagementEnableDescription": "تفعيل إعداد نظام الإدارة في التطبيق.", - "Feature:AllowChangingEmailSettings": "السماح لتغيير إعدادات البريد الإلكتروني.", + "Feature:AllowChangingEmailSettings": "السماح لتغيير إعدادات البريد الإلكتروني", "Feature:AllowChangingEmailSettingsDescription": "السماح لتغيير إعدادات البريد الإلكتروني.", "SmtpPasswordPlaceholder": "أدخل قيمة لتحديث كلمة المرور" } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/cs.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/cs.json index 94a6e1f6ea..34a9f6dd2c 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/cs.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/cs.json @@ -35,7 +35,7 @@ "Feature:SettingManagementGroup": "Správa nastavení", "Feature:SettingManagementEnable": "Povolit správu nastavení", "Feature:SettingManagementEnableDescription": "Povolit systém správy nastavení v aplikaci.", - "Feature:AllowChangingEmailSettings": "Povolit změnu nastavení e-mailu.", + "Feature:AllowChangingEmailSettings": "Povolit změnu nastavení e-mailu", "Feature:AllowChangingEmailSettingsDescription": "Povolit změnu nastavení e-mailu.", "SmtpPasswordPlaceholder": "Zadejte hodnotu pro aktualizaci hesla" } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de-DE.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de-DE.json index a63b7201f2..a2b2c9ab95 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de-DE.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de-DE.json @@ -35,7 +35,7 @@ "Feature:SettingManagementGroup": "Einstellungsverwaltung", "Feature:SettingManagementEnable": "Einstellungsverwaltung aktivieren", "Feature:SettingManagementEnableDescription": "Aktivieren Sie das Einstellungsverwaltungssystem in der Anwendung.", - "Feature:AllowChangingEmailSettings": "Änderung der E-Mail-Einstellungen zulassen.", + "Feature:AllowChangingEmailSettings": "Änderung der E-Mail-Einstellungen zulassen", "Feature:AllowChangingEmailSettingsDescription": "Änderung der E-Mail-Einstellungen zulassen.", "SmtpPasswordPlaceholder": "Geben Sie einen Wert ein, um das Passwort zu aktualisieren" } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de.json index e78aa19fca..fabd73852f 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de.json @@ -36,7 +36,7 @@ "Feature:SettingManagementGroup": "Einstellungsmanagement", "Feature:SettingManagementEnable": "Aktivieren Sie die Einstellungsverwaltung", "Feature:SettingManagementEnableDescription": "Aktivieren Sie das Einstellungsverwaltungssystem in der Anwendung.", - "Feature:AllowChangingEmailSettings": "Erlauben Sie das Ändern der E-Mail-Einstellungen.", + "Feature:AllowChangingEmailSettings": "Erlauben Sie das Ändern der E-Mail-Einstellungen", "Feature:AllowChangingEmailSettingsDescription": "Erlauben Sie das Ändern der E-Mail-Einstellungen.", "SmtpPasswordPlaceholder": "Geben Sie einen Wert ein, um das Passwort zu aktualisieren" } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/el.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/el.json index 424e38e8de..118b1664fe 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/el.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/el.json @@ -31,7 +31,7 @@ "Feature:SettingManagementGroup": "Διαχείριση ρυθμίσεων", "Feature:SettingManagementEnable": "Ενεργοποίηση διαχείρισης ρυθμίσεων", "Feature:SettingManagementEnableDescription": "Ενεργοποίηση συστήματος διαχείρισης ρυθμίσεων στην εφαρμογή.", - "Feature:AllowChangingEmailSettings": "Επιτρέψτε την αλλαγή των ρυθμίσεων email.", + "Feature:AllowChangingEmailSettings": "Επιτρέψτε την αλλαγή των ρυθμίσεων email", "Feature:AllowChangingEmailSettingsDescription": "Επιτρέψτε την αλλαγή των ρυθμίσεων email.", "SmtpPasswordPlaceholder": "Εισαγάγετε μια τιμή για ενημέρωση κωδικού πρόσβασης" } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/en.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/en.json index 832163574b..cffd6f27cd 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/en.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/en.json @@ -35,7 +35,7 @@ "Feature:SettingManagementGroup": "Setting management", "Feature:SettingManagementEnable": "Enable setting management", "Feature:SettingManagementEnableDescription": "Enable setting management system in the application.", - "Feature:AllowChangingEmailSettings": "Allow changing email settings.", + "Feature:AllowChangingEmailSettings": "Allow changing email settings", "Feature:AllowChangingEmailSettingsDescription": "Allow changing email settings.", "SmtpPasswordPlaceholder": "Enter a value to update password" } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/es.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/es.json index 91cc71d532..f158ec3b0d 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/es.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/es.json @@ -35,7 +35,7 @@ "Feature:SettingManagementGroup": "Gestión de la configuración", "Feature:SettingManagementEnable": "Habilitar la gestión de la configuración", "Feature:SettingManagementEnableDescription": "Habilite el sistema de gestión de la configuración en la aplicación.", - "Feature:AllowChangingEmailSettings": "Permitir cambiar la configuración de correo electrónico.", + "Feature:AllowChangingEmailSettings": "Permitir cambiar la configuración de correo electrónico", "Feature:AllowChangingEmailSettingsDescription": "Permitir cambiar la configuración de correo electrónico.", "SmtpPasswordPlaceholder": "Ingrese un valor para actualizar la contraseña" } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/fi.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/fi.json index 8e7efcb8c6..a2062743fd 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/fi.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/fi.json @@ -35,7 +35,7 @@ "Feature:SettingManagementGroup": "Asetusten hallinta", "Feature:SettingManagementEnable": "Ota asetusten hallinta käyttöön", "Feature:SettingManagementEnableDescription": "Ota asetustenhallintajärjestelmä käyttöön sovelluksessa.", - "Feature:AllowChangingEmailSettings": "Salli sähköpostiasetusten muuttaminen.", + "Feature:AllowChangingEmailSettings": "Salli sähköpostiasetusten muuttaminen", "Feature:AllowChangingEmailSettingsDescription": "Salli sähköpostiasetusten muuttaminen.", "SmtpPasswordPlaceholder": "Syötä arvo päivittääksesi salasana" } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/fr.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/fr.json index 1844cc3fbb..957ff62a19 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/fr.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/fr.json @@ -35,7 +35,7 @@ "Feature:SettingManagementGroup": "Gestion des paramètres", "Feature:SettingManagementEnable": "Activer la gestion des paramètres", "Feature:SettingManagementEnableDescription": "Activer le système de gestion des paramètres dans l'application.", - "Feature:AllowChangingEmailSettings": "Autoriser la modification des paramètres de messagerie.", + "Feature:AllowChangingEmailSettings": "Autoriser la modification des paramètres de messagerie", "Feature:AllowChangingEmailSettingsDescription": "Autoriser la modification des paramètres de messagerie.", "SmtpPasswordPlaceholder": "Entrez une valeur pour mettre à jour le mot de passe" } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/hr.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/hr.json index c0979707a4..1e68c9ad7e 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/hr.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/hr.json @@ -36,7 +36,7 @@ "Feature:SettingManagementGroup": "Upravljanje postavkama", "Feature:SettingManagementEnable": "Omogući upravljanje postavkama", "Feature:SettingManagementEnableDescription": "Omogućite sustav upravljanja postavkama u aplikaciji.", - "Feature:AllowChangingEmailSettings": "Dopusti promjenu postavki e-pošte.", + "Feature:AllowChangingEmailSettings": "Dopusti promjenu postavki e-pošte", "Feature:AllowChangingEmailSettingsDescription": "Dopusti promjenu postavki e-pošte.", "SmtpPasswordPlaceholder": "Unesite vrijednost za ažuriranje lozinke" } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/hu.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/hu.json index efe7876d8d..43b8a53593 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/hu.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/hu.json @@ -35,7 +35,7 @@ "Feature:SettingManagementGroup": "Beállításkezelés", "Feature:SettingManagementEnable": "Beállításkezelés engedélyezése", "Feature:SettingManagementEnableDescription": "A beállításkezelő rendszer engedélyezése az alkalmazásban.", - "Feature:AllowChangingEmailSettings": "Az e-mail beállítások módosításának engedélyezése.", + "Feature:AllowChangingEmailSettings": "Az e-mail beállítások módosításának engedélyezése", "Feature:AllowChangingEmailSettingsDescription": "Az e-mail beállítások módosításának engedélyezése.", "SmtpPasswordPlaceholder": "Adjon meg egy értéket a jelszó frissítéséhez" } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/is.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/is.json index 73c3c736a9..69a437b66e 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/is.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/is.json @@ -35,7 +35,7 @@ "Feature:SettingManagementGroup": "Stillingar", "Feature:SettingManagementEnable": "Virkja stillingar", "Feature:SettingManagementEnableDescription": "Virkja stillingar í forritinu.", - "Feature:AllowChangingEmailSettings": "Leyfa að breyta stillingum tölvupósts.", + "Feature:AllowChangingEmailSettings": "Leyfa að breyta stillingum tölvupósts", "Feature:AllowChangingEmailSettingsDescription": "Leyfa að breyta stillingum tölvupósts.", "SmtpPasswordPlaceholder": "Sláðu inn gildi til að uppfæra lykilorð" } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/it.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/it.json index cc6669e7c8..01f80cecfb 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/it.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/it.json @@ -35,7 +35,7 @@ "Feature:SettingManagementGroup": "Gestione Impostazioni", "Feature:SettingManagementEnable": "Abilita gestione impostazioni", "Feature:SettingManagementEnableDescription": "Abilita sistema gestione impostazioni nell'applicazione", - "Feature:AllowChangingEmailSettings": "Consenti di modificare le loro impostazioni e-mail.", + "Feature:AllowChangingEmailSettings": "Consenti di modificare le loro impostazioni e-mail", "Feature:AllowChangingEmailSettingsDescription": "Consenti di modificare le loro impostazioni e-mail.", "SmtpPasswordPlaceholder": "Inserisci un valore per aggiornare la password" } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/nl.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/nl.json index f6d86ab9ba..57a87f550b 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/nl.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/nl.json @@ -35,7 +35,7 @@ "Feature:SettingManagementGroup": "Instellingsbeheer", "Feature:SettingManagementEnable": "Instellingenbeheer inschakelen", "Feature:SettingManagementEnableDescription": "Schakel het instellingsbeheersysteem in de toepassing in.", - "Feature:AllowChangingEmailSettings": "Toestaan om e-mailinstellingen te wijzigen.", + "Feature:AllowChangingEmailSettings": "Toestaan om e-mailinstellingen te wijzigen", "Feature:AllowChangingEmailSettingsDescription": "Toestaan om e-mailinstellingen te wijzigen.", "SmtpPasswordPlaceholder": "Voer een waarde in om het wachtwoord bij te werken" } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pl-PL.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pl-PL.json index 45c144626d..28c8dd3689 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pl-PL.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pl-PL.json @@ -35,7 +35,7 @@ "Feature:SettingManagementGroup": "Zarządzanie ustawieniami", "Feature:SettingManagementEnable": "Włącz zarządzanie ustawieniami", "Feature:SettingManagementEnableDescription": "Włącz system zarządzania ustawieniami w aplikacji.", - "Feature:AllowChangingEmailSettings": "Zezwól na zmianę ustawień poczty e-mail.", + "Feature:AllowChangingEmailSettings": "Zezwól na zmianę ustawień poczty e-mail", "Feature:AllowChangingEmailSettingsDescription": "Zezwól na zmianę ustawień poczty e-mail.", "SmtpPasswordPlaceholder": "Wprowadź wartość, aby zaktualizować hasło" } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pt-BR.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pt-BR.json index 831d54707e..8b968bacfe 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pt-BR.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pt-BR.json @@ -35,7 +35,7 @@ "Feature:SettingManagementGroup": "Gestão de Cenários", "Feature:SettingManagementEnable": "Habilitar gerenciamento de configuração", "Feature:SettingManagementEnableDescription": "Habilite o sistema de gerenciamento de configuração no aplicativo.", - "Feature:AllowChangingEmailSettings": "Permitir alterar as configurações de e-mail.", + "Feature:AllowChangingEmailSettings": "Permitir alterar as configurações de e-mail", "Feature:AllowChangingEmailSettingsDescription": "Permitir alterar as configurações de e-mail.", "SmtpPasswordPlaceholder": "Digite um valor para atualizar a senha" } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ro-RO.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ro-RO.json index a0f94747ed..83a9b3e2dc 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ro-RO.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ro-RO.json @@ -35,7 +35,7 @@ "Feature:SettingManagementGroup": "Administrarea setărilor", "Feature:SettingManagementEnable": "Activează administrarea setărilor", "Feature:SettingManagementEnableDescription": "Activează sistemul de administrare a setărilor în aplicaţie.", - "Feature:AllowChangingEmailSettings": "Permiteți modificarea setărilor de e-mail.", + "Feature:AllowChangingEmailSettings": "Permiteți modificarea setărilor de e-mail", "Feature:AllowChangingEmailSettingsDescription": "Permiteți modificarea setărilor de e-mail.", "SmtpPasswordPlaceholder": "Introduceți o valoare pentru a actualiza parola" } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ru.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ru.json index 1145595e8e..7026026918 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ru.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ru.json @@ -35,7 +35,7 @@ "Feature:SettingManagementGroup": "Управление настройками", "Feature:SettingManagementEnable": "Включить управление настройками", "Feature:SettingManagementEnableDescription": "Включите систему управления настройками в приложении.", - "Feature:AllowChangingEmailSettings": "Разрешить изменение настроек электронной почты.", + "Feature:AllowChangingEmailSettings": "Разрешить изменение настроек электронной почты", "Feature:AllowChangingEmailSettingsDescription": "Разрешить изменение настроек электронной почты.", "SmtpPasswordPlaceholder": "Введите значение для обновления пароля" } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sk.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sk.json index e8661a3471..9e4ef99363 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sk.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sk.json @@ -35,7 +35,7 @@ "Feature:SettingManagementGroup": "Správa nastavení", "Feature:SettingManagementEnable": "Povoliť správu nastavení", "Feature:SettingManagementEnableDescription": "Povoliť systém správy nastavení v aplikácii.", - "Feature:AllowChangingEmailSettings": "Povoliť zmenu nastavení e-mailu.", + "Feature:AllowChangingEmailSettings": "Povoliť zmenu nastavení e-mailu", "Feature:AllowChangingEmailSettingsDescription": "Povoliť zmenu nastavení e-mailu.", "SmtpPasswordPlaceholder": "Zadajte hodnotu pre aktualizáciu hesla" } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sl.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sl.json index 9bd877053b..e1cce43730 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sl.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sl.json @@ -35,7 +35,7 @@ "Feature:SettingManagementGroup": "Upravljanje nastavitev", "Feature:SettingManagementEnable": "Omogoči upravljanje nastavitev", "Feature:SettingManagementEnableDescription": "Omogočite nastavitev sistema upravljanja v aplikaciji.", - "Feature:AllowChangingEmailSettings": "Dovoli spreminjanje e-poštnih nastavitev.", + "Feature:AllowChangingEmailSettings": "Dovoli spreminjanje e-poštnih nastavitev", "Feature:AllowChangingEmailSettingsDescription": "Dovoli spreminjanje e-poštnih nastavitev.", "SmtpPasswordPlaceholder": "Vnesite vrednost za posodobitev gesla" } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sv.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sv.json index 01719059cc..95462e08b7 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sv.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/sv.json @@ -34,7 +34,7 @@ "Feature:SettingManagementGroup": "Hantering av inställningar", "Feature:SettingManagementEnable": "Aktivera hantering av inställningar", "Feature:SettingManagementEnableDescription": "Aktivera inställningshanteringssystem i applikationen.", - "Feature:AllowChangingEmailSettings": "Tillåt ändring av e-postinställningar.", + "Feature:AllowChangingEmailSettings": "Tillåt ändring av e-postinställningar", "Feature:AllowChangingEmailSettingsDescription": "Tillåt ändring av e-postinställningar.", "SmtpPasswordPlaceholder": "Ange ett värde för att uppdatera lösenordet" } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/tr.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/tr.json index ff4107e21b..8a2db80e58 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/tr.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/tr.json @@ -35,7 +35,7 @@ "Feature:SettingManagementGroup": "Ayar yönetimi", "Feature:SettingManagementEnable": "Ayar yönetimini etkinleştir", "Feature:SettingManagementEnableDescription": "Uygulamada ayar yönetim sistemini etkinleştirin.", - "Feature:AllowChangingEmailSettings": "E-posta ayarlarını değiştirmeye izin verin.", + "Feature:AllowChangingEmailSettings": "E-posta ayarlarını değiştirmeye izin verin", "Feature:AllowChangingEmailSettingsDescription": "E-posta ayarlarını değiştirmeye izin verin.", "SmtpPasswordPlaceholder": "Şifreyi güncellemek için bir değer girin" } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/vi.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/vi.json index 38b284a6ca..4c4f74ec2c 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/vi.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/vi.json @@ -35,7 +35,7 @@ "Feature:SettingManagementGroup": "Cài đặt quản lý", "Feature:SettingManagementEnable": "Bật quản lý cài đặt", "Feature:SettingManagementEnableDescription": "Bật cài đặt hệ thống quản lý trong ứng dụng.", - "Feature:AllowChangingEmailSettings": "Cho phép thay đổi cài đặt email.", + "Feature:AllowChangingEmailSettings": "Cho phép thay đổi cài đặt email", "Feature:AllowChangingEmailSettingsDescription": "Cho phép thay đổi cài đặt email.", "SmtpPasswordPlaceholder": "Nhập một giá trị để cập nhật mật khẩu" } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hans.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hans.json index b9d0940273..392eb7e4e9 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hans.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hans.json @@ -35,7 +35,7 @@ "Feature:SettingManagementGroup": "设置管理", "Feature:SettingManagementEnable": "启用设置管理", "Feature:SettingManagementEnableDescription": "在应用程序中启用设置管理系统。", - "Feature:AllowChangingEmailSettings": "允许更改邮件设置。", + "Feature:AllowChangingEmailSettings": "允许更改邮件设置", "Feature:AllowChangingEmailSettingsDescription": "允许更改邮件设置。", "SmtpPasswordPlaceholder": "输入一个值以更新密码" } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hant.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hant.json index b57a542842..3dea507456 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hant.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hant.json @@ -35,7 +35,7 @@ "Feature:SettingManagementGroup": "設定管理", "Feature:SettingManagementEnable": "啟用設定管理", "Feature:SettingManagementEnableDescription": "在應用程序中啟用設定管理系統.", - "Feature:AllowChangingEmailSettings": "允許更改電子郵件設置。", + "Feature:AllowChangingEmailSettings": "允許更改電子郵件設置", "Feature:AllowChangingEmailSettingsDescription": "允許更改電子郵件設置。", "SmtpPasswordPlaceholder": "輸入一個值以更新密碼" } diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor index f87467f8c2..77dc2b494c 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor @@ -40,7 +40,7 @@ { -
+ @L["NewTenant"] @@ -89,7 +89,7 @@ - +
@@ -101,7 +101,7 @@ { -
+ @L["Edit"] @@ -123,7 +123,7 @@ - +
diff --git a/modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/InviteUserToTenantRequestedEto.cs b/modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/InviteUserToTenantRequestedEto.cs new file mode 100644 index 0000000000..f47b1ea0e9 --- /dev/null +++ b/modules/users/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/InviteUserToTenantRequestedEto.cs @@ -0,0 +1,16 @@ +using System; +using Volo.Abp.EventBus; +using Volo.Abp.MultiTenancy; + +namespace Volo.Abp.Users; + +[Serializable] +[EventName("Volo.Abp.Users.InviteUserToTenantRequested")] +public class InviteUserToTenantRequestedEto : IMultiTenant +{ + public Guid? TenantId { get; set; } + + public string Email { get; set; } + + public bool DirectlyAddToTenant { get; set; } +} diff --git a/modules/virtual-file-explorer/app/package.json b/modules/virtual-file-explorer/app/package.json index 50866814bc..0bab9f7fda 100644 --- a/modules/virtual-file-explorer/app/package.json +++ b/modules/virtual-file-explorer/app/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0-rc.2", - "@abp/virtual-file-explorer": "~10.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0", + "@abp/virtual-file-explorer": "~10.1.0" } } diff --git a/npm/lerna.json b/npm/lerna.json index ee02c6794e..b8fb175701 100644 --- a/npm/lerna.json +++ b/npm/lerna.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "packages": [ "packs/*" ], diff --git a/npm/ng-packs/apps/dev-app/src/app/app.config.ts b/npm/ng-packs/apps/dev-app/src/app/app.config.ts index daa8a1f937..6b8bcf2c05 100644 --- a/npm/ng-packs/apps/dev-app/src/app/app.config.ts +++ b/npm/ng-packs/apps/dev-app/src/app/app.config.ts @@ -31,6 +31,10 @@ export const appConfig: ApplicationConfig = { registerLocaleFn: registerLocaleForEsBuild(), sendNullsAsQueryParam: false, skipGetAppConfiguration: false, + uiLocalization: { + enabled: true, + basePath: '/assets/localization', + }, }), ), provideAbpOAuth(), diff --git a/npm/ng-packs/apps/dev-app/src/app/app.routes.ts b/npm/ng-packs/apps/dev-app/src/app/app.routes.ts index c520328975..6c59a18bb1 100644 --- a/npm/ng-packs/apps/dev-app/src/app/app.routes.ts +++ b/npm/ng-packs/apps/dev-app/src/app/app.routes.ts @@ -10,6 +10,10 @@ export const appRoutes: Routes = [ path: 'dynamic-form', loadComponent: () => import('./dynamic-form-page/dynamic-form-page.component').then(m => m.DynamicFormPageComponent), }, + { + path: 'localization-test', + loadComponent: () => import('./localization-test/localization-test.component').then(m => m.LocalizationTestComponent), + }, { path: 'account', loadChildren: () => import('@abp/ng.account').then(m => m.createRoutes()), diff --git a/npm/ng-packs/apps/dev-app/src/app/dynamic-form-page/dynamic-form-page.component.ts b/npm/ng-packs/apps/dev-app/src/app/dynamic-form-page/dynamic-form-page.component.ts index 0955a448e5..aaa213775c 100644 --- a/npm/ng-packs/apps/dev-app/src/app/dynamic-form-page/dynamic-form-page.component.ts +++ b/npm/ng-packs/apps/dev-app/src/app/dynamic-form-page/dynamic-form-page.component.ts @@ -1,4 +1,4 @@ -import { Component, inject, OnInit, ViewChild } from '@angular/core'; +import { Component, inject, OnInit, viewChild } from '@angular/core'; import { DynamicFormComponent, FormFieldConfig } from '@abp/ng.components/dynamic-form'; import { FormConfigService } from './form-config.service'; @@ -8,7 +8,7 @@ import { FormConfigService } from './form-config.service'; imports: [DynamicFormComponent], }) export class DynamicFormPageComponent implements OnInit { - @ViewChild(DynamicFormComponent, { static: false }) dynamicFormComponent: DynamicFormComponent; + readonly dynamicFormComponent = viewChild(DynamicFormComponent); protected readonly formConfigService = inject(FormConfigService); formFields: FormFieldConfig[] = []; @@ -27,12 +27,12 @@ export class DynamicFormPageComponent implements OnInit { alert('✅ Form submitted successfully! Check the console for details.'); // Reset form after submission - this.dynamicFormComponent.resetForm(); + this.dynamicFormComponent().resetForm(); } cancel() { console.log('❌ Form Cancelled'); alert('Form cancelled'); - this.dynamicFormComponent.resetForm(); + this.dynamicFormComponent().resetForm(); } } diff --git a/npm/ng-packs/apps/dev-app/src/app/home/home.component.html b/npm/ng-packs/apps/dev-app/src/app/home/home.component.html index d83f2be7f1..d8b08c06ae 100644 --- a/npm/ng-packs/apps/dev-app/src/app/home/home.component.html +++ b/npm/ng-packs/apps/dev-app/src/app/home/home.component.html @@ -1,6 +1,7 @@
Go to Dynamic Form + Test Hybrid Localization
- \ No newline at end of file + diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.ts b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.ts index 09a29a98a9..a6a85cccee 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.ts @@ -14,14 +14,11 @@ import { ElementRef, inject, Injector, - Input, - OnChanges, Optional, - SimpleChanges, SkipSelf, - ViewChild, - signal, + viewChild, effect, + input, } from '@angular/core'; import { ControlContainer, @@ -42,7 +39,7 @@ import { debounceTime, distinctUntilChanged, switchMap } from 'rxjs/operators'; import { DateAdapter, DisabledDirective, TimeAdapter } from '@abp/ng.theme.shared'; import { EXTRA_PROPERTIES_KEY } from '../../constants/extra-properties'; import { FormProp } from '../../models/form-props'; -import { PropData } from '../../models/props'; +import { ReadonlyPropData } from '../../models/props'; import { selfFactory } from '../../utils/factory.util'; import { addTypeaheadTextSuffix } from '../../utils/typeahead.util'; import { eExtensibleComponents } from '../../enums/components'; @@ -72,8 +69,8 @@ import { ExtensibleFormMultiselectComponent } from '../multi-select/extensible-f AsyncPipe, NgComponentOutlet, NgTemplateOutlet, - FormsModule -], + FormsModule, + ], changeDetection: ChangeDetectionStrategy.OnPush, providers: [ExtensibleFormPropService], viewProviders: [ @@ -86,7 +83,7 @@ import { ExtensibleFormMultiselectComponent } from '../multi-select/extensible-f { provide: NgbTimeAdapter, useClass: TimeAdapter }, ], }) -export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit { +export class ExtensibleFormPropComponent implements AfterViewInit { protected service = inject(ExtensibleFormPropService); public readonly cdRef = inject(ChangeDetectorRef); public readonly track = inject(TrackByService); @@ -94,11 +91,11 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit { private injector = inject(Injector); private readonly form = this.#groupDirective.form; - @Input() data!: PropData; - @Input() prop!: FormProp; - @Input() first?: boolean; - @Input() isFirstGroup?: boolean; - @ViewChild('field') private fieldRef!: ElementRef; + readonly data = input.required(); + readonly prop = input.required(); + readonly first = input(undefined); + readonly isFirstGroup = input(undefined); + private readonly fieldRef = viewChild.required>('field'); injectorForCustomComponent?: Injector; asterisk = ''; @@ -110,10 +107,60 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit { typeaheadModel: any; passwordKey = eExtensibleComponents.PasswordComponent; - disabledFn = (data: PropData) => false; + disabledFn = (data: ReadonlyPropData) => false; get disabled() { - return this.disabledFn(this.data); + const data = this.data(); + if (!data) return false; + return this.disabledFn(data); + } + + constructor() { + // Watch prop changes and update state + effect(() => { + const currentProp = this.prop(); + const data = this.data(); + if (!currentProp || !data) return; + + const { options, readonly, disabled, validators, className, template } = currentProp; + + if (template) { + this.injectorForCustomComponent = Injector.create({ + providers: [ + { + provide: EXTENSIONS_FORM_PROP, + useValue: currentProp, + }, + { + provide: EXTENSIONS_FORM_PROP_DATA, + useValue: data?.record, + }, + { provide: ControlContainer, useExisting: FormGroupDirective }, + ], + parent: this.injector, + }); + } + + if (options) this.options$ = options(data); + if (readonly) this.readonly = readonly(data); + + if (disabled) { + this.disabledFn = disabled; + } + if (validators) { + this.validators = validators(data); + this.setAsterisk(); + } + if (className !== undefined) { + this.containerClassName = className; + } + + const [keyControl, valueControl] = this.getTypeaheadControls(); + if (keyControl && valueControl) + this.typeaheadModel = { key: keyControl.value, value: valueControl.value }; + + this.cdRef.markForCheck(); + }); } setTypeaheadValue(selectedOption: ABP.Option) { @@ -130,7 +177,7 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit { ? text$.pipe( debounceTime(300), distinctUntilChanged(), - switchMap(text => this.prop?.options?.(this.data, text) || of([])), + switchMap(text => this.prop()?.options?.(this.data(), text) || of([])), ) : of([]); @@ -139,12 +186,12 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit { meridian$ = this.service.meridian$; get isInvalid() { - const control = this.form.get(this.prop.name); + const control = this.form.get(this.prop().name); return control?.touched && control.invalid; } private getTypeaheadControls() { - const { name } = this.prop; + const { name } = this.prop(); const extraPropName = `${EXTRA_PROPERTIES_KEY}.${name}`; const keyControl = this.form.get(addTypeaheadTextSuffix(extraPropName)) || @@ -158,9 +205,9 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit { } ngAfterViewInit() { - if (this.isFirstGroup && this.first && this.fieldRef) { + if (this.isFirstGroup() && this.first() && this.fieldRef()) { requestAnimationFrame(() => { - this.fieldRef.nativeElement.focus(); + this.fieldRef().nativeElement.focus(); }); } } @@ -172,43 +219,4 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit { getType(prop: FormProp): string { return this.service.getType(prop); } - - ngOnChanges({ prop, data }: SimpleChanges) { - const currentProp = prop?.currentValue as FormProp; - const { options, readonly, disabled, validators, className, template } = currentProp || {}; - if (template) { - this.injectorForCustomComponent = Injector.create({ - providers: [ - { - provide: EXTENSIONS_FORM_PROP, - useValue: currentProp, - }, - { - provide: EXTENSIONS_FORM_PROP_DATA, - useValue: (data?.currentValue as PropData)?.record, - }, - { provide: ControlContainer, useExisting: FormGroupDirective }, - ], - parent: this.injector, - }); - } - - if (options) this.options$ = options(this.data); - if (readonly) this.readonly = readonly(this.data); - - if (disabled) { - this.disabledFn = disabled; - } - if (validators) { - this.validators = validators(this.data); - this.setAsterisk(); - } - if (className !== undefined) { - this.containerClassName = className; - } - - const [keyControl, valueControl] = this.getTypeaheadControls(); - if (keyControl && valueControl) - this.typeaheadModel = { key: keyControl.value, value: valueControl.value }; - } } diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.html b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.html index be937e21ca..cf715f2b27 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.html +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.html @@ -1,6 +1,6 @@ @if (form) { -@for (groupedProp of groupedPropList.items; track i; let i = $index; let first = $first) { - +@for (groupedProp of groupedPropList()?.items; track i; let i = $index; let first = $first) { + @if (isAnyGroupMemberVisible(i, data) && groupedProp.group?.className) {
diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.ts b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.ts index 8b5829754d..1f7e3753b1 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form.component.ts @@ -4,11 +4,12 @@ import { ChangeDetectorRef, Component, inject, - Input, Optional, - QueryList, SkipSelf, - ViewChildren, + viewChildren, + input, + signal, + effect } from '@angular/core'; import { ControlContainer, ReactiveFormsModule, UntypedFormGroup } from '@angular/forms'; import { EXTRA_PROPERTIES_KEY } from '../../constants/extra-properties'; @@ -41,21 +42,24 @@ export class ExtensibleFormComponent { private readonly extensions = inject(ExtensionsService); private readonly identifier = inject(EXTENSIONS_IDENTIFIER); - @ViewChildren(ExtensibleFormPropComponent) - formProps!: QueryList; + readonly formProps = viewChildren(ExtensibleFormPropComponent); - @Input() - set selectedRecord(record: R) { - const type = !record || JSON.stringify(record) === '{}' ? 'create' : 'edit'; - const propList = this.extensions[`${type}FormProps`].get(this.identifier).props; - this.groupedPropList = this.createGroupedList(propList); - this.record = record; - } + readonly selectedRecord = input(undefined); extraPropertiesKey = EXTRA_PROPERTIES_KEY; - groupedPropList!: GroupedFormPropList; + readonly groupedPropList = signal(undefined); groupedPropListOfArray: FormProp[][]; - record!: R; + readonly record = signal(undefined); + + constructor() { + effect(() => { + const recordValue = this.selectedRecord(); + const type = !recordValue || JSON.stringify(recordValue) === '{}' ? 'create' : 'edit'; + const propList = this.extensions[`${type}FormProps`].get(this.identifier).props; + this.groupedPropList.set(this.createGroupedList(propList)); + this.record.set(recordValue); + }); + } get form(): UntypedFormGroup { return (this.container ? this.container.control : { controls: {} }) as UntypedFormGroup; @@ -75,8 +79,10 @@ export class ExtensibleFormComponent { } //TODO: Reactor this method - isAnyGroupMemberVisible(index: number, data) { - const { items } = this.groupedPropList; + isAnyGroupMemberVisible(index: number, data: any) { + const groupedPropListValue = this.groupedPropList(); + if (!groupedPropListValue) return false; + const { items } = groupedPropListValue; const formPropList = items[index].formPropList.toArray(); return formPropList.some(prop => prop.visible(data)); } diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html index 8b0a5744b2..0425c17615 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html @@ -1,119 +1,197 @@ @if (isBrowser) { - - @if (effectiveRowDetailTemplate) { - - - - - + + @if (effectiveRowDetailTemplate) { + + + + + - - - - - - } - @if(selectable) { - - - - @if (_selectionType !== 'single') { -
- -
- } - - - - @if(_selectionType === 'single') { -
- -
- } - @if (_selectionType !== 'single') { -
- -
- } - + + + + + + } + @if (selectable()) { + + + @if (selectionType() !== 'single') { +
+ +
+ } + - - } - @if (actionsTemplate || (actionList.length && hasAtLeastOnePermittedAction)) { - - - - - @if (isVisibleActions(row)) { - - } - - - - } - @for (prop of propList; track prop.name; let i = $index) { - - - @if (prop.tooltip) { - - {{ column.name }} - - } @else { - - {{ column.name }} - - } - - - - - @if (!row['_' + prop.name].component) { - @if (prop.type === 'datetime' || prop.type === 'date' || prop.type === 'time') { -
- } @else { -
+ + @if (selectionType() === 'single') { +
+ +
+ } + @if (selectionType() !== 'single') { +
+ +
+ } + + + } + @if (actionsTemplate() || (actionList.length && hasAtLeastOnePermittedAction)) { + + + @if (actionsTemplate(); as template) { + + } @else if (isVisibleActions(row)) { + } + + + } + @for (prop of propList; track prop.name; let i = $index) { + + + @if (prop.tooltip) { + + {{ column.name }} + } @else { - + + {{ column.name }} + } - - - - - } - -} \ No newline at end of file + + + + + @if (!row['_' + prop.name].component) { + @if (prop.type === 'datetime' || prop.type === 'date' || prop.type === 'time') { +
+ } @else { +
+ } + } @else { + + } + + + + + } + +} diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.ts b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.ts index 75253b1f02..3112ab0a74 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.ts @@ -4,21 +4,19 @@ import { ChangeDetectorRef, Component, computed, - ContentChild, - EventEmitter, inject, Injector, - Input, LOCALE_ID, - OnChanges, OnDestroy, - Output, PLATFORM_ID, signal, - SimpleChanges, TemplateRef, TrackByFunction, - ViewChild, + input, + effect, + output, + contentChild, + viewChild, } from '@angular/core'; import { AsyncPipe, isPlatformBrowser, NgComponentOutlet, NgTemplateOutlet } from '@angular/common'; @@ -46,7 +44,7 @@ import { import { ePropType } from '../../enums/props.enum'; import { EntityActionList } from '../../models/entity-actions'; import { EntityProp, EntityPropList } from '../../models/entity-props'; -import { PropData } from '../../models/props'; +import { ReadonlyPropData } from '../../models/props'; import { ExtensionsService } from '../../services/extensions.service'; import { ENTITY_PROP_TYPE_CLASSES, @@ -79,14 +77,16 @@ const DEFAULT_ACTIONS_COLUMN_WIDTH = 150; ], templateUrl: './extensible-table.component.html', changeDetection: ChangeDetectionStrategy.OnPush, - styles: [` - :host ::ng-deep .ngx-datatable.material .datatable-body .datatable-row-detail { - background: none; - padding: 0; - } - `], + styles: [ + ` + :host ::ng-deep .ngx-datatable.material .datatable-body .datatable-row-detail { + background: none; + padding: 0; + } + `, + ], }) -export class ExtensibleTableComponent implements OnChanges, AfterViewInit, OnDestroy { +export class ExtensibleTableComponent implements AfterViewInit, OnDestroy { readonly #injector = inject(Injector); readonly getInjected = this.#injector.get.bind(this.#injector); protected readonly cdr = inject(ChangeDetectorRef); @@ -98,60 +98,68 @@ export class ExtensibleTableComponent implements OnChanges, AfterViewIn private platformId = inject(PLATFORM_ID); protected isBrowser = isPlatformBrowser(this.platformId); - protected _actionsText!: string; - @Input() - set actionsText(value: string) { - this._actionsText = value; - } - - get actionsText(): string { - return this._actionsText ?? (this.actionList.length >= 1 ? 'AbpUi::Actions' : ''); - } - - @Input() data!: R[]; - @Input() list!: ListService; - @Input() recordsTotal!: number; + // Input signals + readonly actionsTextInput = input(undefined, { alias: 'actionsText' }); + readonly dataInput = input([], { alias: 'data' }); + readonly list = input.required(); + readonly recordsTotal = input.required(); + readonly actionsColumnWidthInput = input(undefined, { + alias: 'actionsColumnWidth', + }); + readonly actionsTemplate = input | undefined>(undefined); + readonly selectable = input(false); + readonly selectionTypeInput = input( + SelectionType.multiClick, + { + alias: 'selectionType', + }, + ); + readonly selected = input([]); + readonly infiniteScroll = input(false); + readonly isLoading = input(false); + readonly scrollThreshold = input(10); + readonly tableHeight = input(undefined); + readonly rowDetailTemplate = input> | undefined>(undefined); + readonly rowDetailHeight = input('100%'); + + // Output signals + readonly tableActivate = output(); + readonly selectionChange = output(); + readonly loadMore = output(); + readonly rowDetailToggle = output(); + + // Internal signals + protected readonly _data = signal([]); + private readonly _actionsColumnWidth = signal(DEFAULT_ACTIONS_COLUMN_WIDTH); - @Input() set actionsColumnWidth(width: number) { - this._actionsColumnWidth.set(width ? Number(width) : undefined); - } + readonly rowDetailComponent = contentChild(ExtensibleTableRowDetailComponent); - @Input() actionsTemplate?: TemplateRef; + readonly table = viewChild.required('table'); - @Output() tableActivate = new EventEmitter(); + // Computed values + protected readonly actionsText = computed(() => { + return this.actionsTextInput() ?? (this.actionList.length >= 1 ? 'AbpUi::Actions' : ''); + }); - @Input() selectable = false; + protected readonly selectionType = computed(() => { + const value = this.selectionTypeInput(); + return typeof value === 'string' ? SelectionType[value as keyof typeof SelectionType] : value; + }); - @Input() set selectionType(value: SelectionType | string) { - this._selectionType = typeof value === 'string' ? SelectionType[value] : value; + protected get data(): R[] { + return this._data(); } - _selectionType: SelectionType = SelectionType.multiClick; - - @Input() selected: any[] = []; - @Output() selectionChange = new EventEmitter(); - - // Infinite scroll configuration - @Input() infiniteScroll = false; - @Input() isLoading = false; - @Input() scrollThreshold = 10; - @Output() loadMore = new EventEmitter(); - @Input() tableHeight: number; - - @Input() rowDetailTemplate?: TemplateRef>; - @Input() rowDetailHeight: string | number = '100%'; - @Output() rowDetailToggle = new EventEmitter(); - @ContentChild(ExtensibleTableRowDetailComponent) - rowDetailComponent?: ExtensibleTableRowDetailComponent; - - @ViewChild('table', { static: false }) table!: DatatableComponent; + protected set data(value: R[]) { + this._data.set(value); + } protected get effectiveRowDetailTemplate(): TemplateRef> | undefined { - return this.rowDetailComponent?.template() ?? this.rowDetailTemplate; + return this.rowDetailComponent()?.template() ?? this.rowDetailTemplate(); } protected get effectiveRowDetailHeight(): string | number { - return this.rowDetailComponent?.rowHeight() ?? this.rowDetailHeight; + return this.rowDetailComponent()?.rowHeight() ?? this.rowDetailHeight(); } hasAtLeastOnePermittedAction: boolean; @@ -162,9 +170,6 @@ export class ExtensibleTableComponent implements OnChanges, AfterViewIn readonly trackByFn: TrackByFunction> = (_, item) => item.name; - // Signal for actions column width - private readonly _actionsColumnWidth = signal(DEFAULT_ACTIONS_COLUMN_WIDTH); - // Infinite scroll: debounced load more subject private readonly loadMoreSubject = new Subject(); private readonly loadMoreSubscription = this.loadMoreSubject @@ -186,6 +191,55 @@ export class ExtensibleTableComponent implements OnChanges, AfterViewIn this.permissionService.filterItemsByPolicy( this.actionList.toArray().map(action => ({ requiredPolicy: action.permission })), ).length > 0; + + // Watch actionsColumnWidth input + effect(() => { + const width = this.actionsColumnWidthInput(); + this._actionsColumnWidth.set(width ? Number(width) : undefined); + }); + + // Watch data input changes + effect(() => { + const dataValue = this.dataInput(); + if (!dataValue) return; + + if (dataValue.length < 1) { + this.list().totalCount = this.recordsTotal(); + } + + this._data.set(dataValue.map((record, index) => this.prepareRecord(record, index))); + }); + } + + private prepareRecord(record: any, index: number): any { + this.propList.forEach(prop => { + const propData = { getInjected: this.getInjected, record, index } as ReadonlyPropData; + const value = this.getContent(prop.value, propData); + + const propKey = `_${prop.value.name}`; + record[propKey] = { + visible: prop.value.visible(propData), + value, + }; + if (prop.value.component) { + record[propKey].injector = Injector.create({ + providers: [ + { + provide: PROP_DATA_STREAM, + useValue: value, + }, + { + provide: ROW_RECORD, + useValue: record, + }, + ], + parent: this.#injector, + }); + record[propKey].component = prop.value.component; + } + }); + + return record; } private getIcon(value: boolean) { @@ -200,7 +254,7 @@ export class ExtensibleTableComponent implements OnChanges, AfterViewIn return key; } - getContent(prop: EntityProp, data: PropData): Observable { + getContent(prop: EntityProp, data: ReadonlyPropData): Observable { return prop.valueResolver(data).pipe( map(value => { switch (prop.type) { @@ -216,45 +270,6 @@ export class ExtensibleTableComponent implements OnChanges, AfterViewIn ); } - ngOnChanges({ data }: SimpleChanges) { - if (!data?.currentValue) return; - - if (data.currentValue.length < 1) { - this.list.totalCount = this.recordsTotal; - } - - this.data = data.currentValue.map((record: any, index: number) => { - this.propList.forEach(prop => { - const propData = { getInjected: this.getInjected, record, index } as any; - const value = this.getContent(prop.value, propData); - - const propKey = `_${prop.value.name}`; - record[propKey] = { - visible: prop.value.visible(propData), - value, - }; - if (prop.value.component) { - record[propKey].injector = Injector.create({ - providers: [ - { - provide: PROP_DATA_STREAM, - useValue: value, - }, - { - provide: ROW_RECORD, - useValue: record, - }, - ], - parent: this.#injector, - }); - record[propKey].component = prop.value.component; - } - }); - - return record; - }); - } - isVisibleActions(rowData: any): boolean { const actions = this.actionList.toArray(); const visibleActions = actions.filter(action => { @@ -277,9 +292,10 @@ export class ExtensibleTableComponent implements OnChanges, AfterViewIn return visibleActions.length > 0; } - onSelect({ selected }) { - this.selected.splice(0, this.selected.length); - this.selected.push(...selected); + onSelect({ selected }: { selected: any[] }) { + const selectedValue = this.selected(); + selectedValue.splice(0, selectedValue.length); + selectedValue.push(...selected); this.selectionChange.emit(selected); } @@ -299,12 +315,12 @@ export class ExtensibleTableComponent implements OnChanges, AfterViewIn } private shouldHandleScroll(): boolean { - return this.infiniteScroll && !this.isLoading; + return this.infiniteScroll() && !this.isLoading(); } private isNearScrollBottom(element: HTMLElement): boolean { const { offsetHeight, scrollTop, scrollHeight } = element; - return offsetHeight + scrollTop >= scrollHeight - this.scrollThreshold; + return offsetHeight + scrollTop >= scrollHeight - this.scrollThreshold(); } private triggerLoadMore(): void { @@ -312,24 +328,28 @@ export class ExtensibleTableComponent implements OnChanges, AfterViewIn } getTableHeight() { - if (!this.infiniteScroll) return 'auto'; + if (!this.infiniteScroll()) return 'auto'; - return this.tableHeight ? `${this.tableHeight}px` : 'auto'; + const tableHeight = this.tableHeight(); + return tableHeight ? `${tableHeight}px` : 'auto'; } toggleExpandRow(row: R): void { - if (this.table && this.table.rowDetail) { - this.table.rowDetail.toggleExpandRow(row); + const table = this.table(); + if (table && table.rowDetail) { + table.rowDetail.toggleExpandRow(row); } this.rowDetailToggle.emit(row); } ngAfterViewInit(): void { - if (!this.infiniteScroll) { - this.list?.requestStatus$?.pipe(filter(status => status === 'loading')).subscribe(() => { - this.data = []; - this.cdr.markForCheck(); - }); + if (!this.infiniteScroll()) { + this.list() + ?.requestStatus$?.pipe(filter(status => status === 'loading')) + .subscribe(() => { + this._data.set([]); + this.cdr.markForCheck(); + }); } } diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/grid-actions/grid-actions.component.html b/npm/ng-packs/packages/components/extensible/src/lib/components/grid-actions/grid-actions.component.html index 57a8b4a7fe..70e22ee3cf 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/grid-actions/grid-actions.component.html +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/grid-actions/grid-actions.component.html @@ -1,7 +1,7 @@ @if (actionList.length > 1) {
@for (action of actionList; track action.text) { diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/grid-actions/grid-actions.component.ts b/npm/ng-packs/packages/components/extensible/src/lib/components/grid-actions/grid-actions.component.ts index 9f7c28201e..4336b0f6fd 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/grid-actions/grid-actions.component.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/grid-actions/grid-actions.component.ts @@ -1,8 +1,8 @@ import { ChangeDetectionStrategy, Component, - Input, TrackByFunction, + input } from '@angular/core'; import { EntityAction, EntityActionList } from '../../models/entity-actions'; import { EXTENSIONS_ACTION_TYPE } from '../../tokens/extensions.token'; @@ -33,11 +33,9 @@ import { NgTemplateOutlet } from '@angular/common'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class GridActionsComponent extends AbstractActionsComponent> { - @Input() icon = 'fa fa-cog'; - - @Input() readonly index?: number; - - @Input() text = ''; + readonly icon = input('fa fa-cog'); + readonly index = input(undefined); + readonly text = input(''); readonly trackByFn: TrackByFunction> = (_, item) => item.text; diff --git a/npm/ng-packs/packages/components/extensible/src/lib/directives/prop-data.directive.ts b/npm/ng-packs/packages/components/extensible/src/lib/directives/prop-data.directive.ts index b7a05d314b..6d25e6da6a 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/directives/prop-data.directive.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/directives/prop-data.directive.ts @@ -1,34 +1,34 @@ /* eslint-disable @angular-eslint/no-input-rename */ -import { - Directive, - Injector, - Input, - OnChanges, - OnDestroy, - TemplateRef, - ViewContainerRef, - inject +import { + Directive, + Injector, + OnDestroy, + TemplateRef, + ViewContainerRef, + effect, + inject, + input } from '@angular/core'; import { PropData, PropList } from '../models/props'; +type InferredRecord = L extends PropList ? R : never; + @Directive({ exportAs: 'abpPropData', selector: '[abpPropData]', }) export class PropDataDirective> - extends PropData> - implements OnChanges, OnDestroy + extends PropData> + implements OnDestroy { private tempRef = inject>(TemplateRef); private vcRef = inject(ViewContainerRef); - @Input('abpPropDataFromList') propList?: L; - - @Input('abpPropDataWithRecord') record!: InferredData['record']; + readonly propList = input(undefined, { alias: 'abpPropDataFromList' }); + readonly record = input.required>({ alias: 'abpPropDataWithRecord' }); + readonly index = input(undefined, { alias: 'abpPropDataAtIndex' }); - @Input('abpPropDataAtIndex') index?: number; - - readonly getInjected: InferredData['getInjected']; + readonly getInjected: PropData>['getInjected']; constructor() { const injector = inject(Injector); @@ -36,14 +36,19 @@ export class PropDataDirective> super(); this.getInjected = injector.get.bind(injector); - } - ngOnChanges() { - this.vcRef.clear(); - - this.vcRef.createEmbeddedView(this.tempRef, { - $implicit: this.data, - index: 0, + // Watch for input changes and re-render + effect(() => { + // Read all inputs to track them + this.record(); + this.index(); + this.propList(); + + this.vcRef.clear(); + this.vcRef.createEmbeddedView(this.tempRef, { + $implicit: this.data, + index: 0, + }); }); } @@ -51,6 +56,3 @@ export class PropDataDirective> this.vcRef.clear(); } } - -type InferredData = PropData>; -type InferredRecord = L extends PropList ? R : never; diff --git a/npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts index 40938aca44..ed2986f81c 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts @@ -1,4 +1,4 @@ -import { InjectionToken, InjectOptions, Type } from '@angular/core'; +import { InjectionToken, InjectOptions, InputSignal, isSignal, Type } from '@angular/core'; import { LinkedList } from '@abp/utils'; export abstract class ActionList> extends LinkedList {} @@ -9,19 +9,28 @@ export abstract class ActionData { notFoundValue?: T, flags?: InjectOptions, ) => T; - index?: number; - abstract record: R; + index?: number | InputSignal; + abstract record: R | InputSignal; get data(): ReadonlyActionData { return { getInjected: this.getInjected, - index: this.index, - record: this.record, + // `record` / `index` may be signals; always use `data.record` / `data.index`. + index: isSignal(this.index) ? this.index() : this.index, + record: isSignal(this.record) ? this.record() : this.record, }; } } -export type ReadonlyActionData = Readonly, 'data'>>; +export type ReadonlyActionData = Readonly<{ + getInjected: ( + token: Type | InjectionToken, + notFoundValue?: T, + flags?: InjectOptions, + ) => T; + index?: number; + record: R; +}>; export abstract class Action { constructor( @@ -33,8 +42,8 @@ export abstract class Action { ) {} } -export type ActionCallback = (data: Omit, 'data'>) => R; -export type ActionPredicate = (data?: Omit, 'data'>) => boolean; +export type ActionCallback = (data: ReadonlyActionData) => R; +export type ActionPredicate = (data?: ReadonlyActionData) => boolean; export abstract class ActionsFactory> { protected abstract _ctor: Type; diff --git a/npm/ng-packs/packages/components/extensible/src/lib/models/form-props.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/form-props.ts index f99aa01623..ee54155b41 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/models/form-props.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/models/form-props.ts @@ -29,6 +29,7 @@ export interface FormPropGroup { export interface FormPropTooltip { text: string; + params?: string[]; placement?: 'top' | 'end' | 'bottom' | 'start'; } diff --git a/npm/ng-packs/packages/components/extensible/src/lib/models/props.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/props.ts index 8a2a29e425..0b9a55209a 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/models/props.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/models/props.ts @@ -1,4 +1,4 @@ -import { InjectionToken, InjectOptions, Type } from '@angular/core'; +import { InjectionToken, InjectOptions, InputSignal, isSignal, Type } from '@angular/core'; import { LinkedList } from '@abp/utils'; import { ePropType } from '../enums/props.enum'; import { FormPropTooltip } from './form-props'; @@ -11,19 +11,28 @@ export abstract class PropData { notFoundValue?: T, options?: InjectOptions, ) => T; - index?: number; - abstract record: R; + index?: number | InputSignal; + abstract record: R | InputSignal; get data(): ReadonlyPropData { return { getInjected: this.getInjected, - index: this.index, - record: this.record, + // `record` / `index` may be signals; always use `data.record` / `data.index`. + index: isSignal(this.index) ? this.index() : this.index, + record: isSignal(this.record) ? this.record() : this.record, }; } } -export type ReadonlyPropData = Readonly, 'data'>>; +export type ReadonlyPropData = Readonly<{ + getInjected: ( + token: Type | InjectionToken, + notFoundValue?: T, + options?: InjectOptions, + ) => T; + index?: number; + record: R; +}>; export abstract class Prop { constructor( @@ -43,9 +52,9 @@ export abstract class Prop { } } -export type PropCallback = (data: Omit, 'data'>, auxData?: any) => R; -export type PropPredicate = (data?: Omit, 'data'>, auxData?: any) => boolean; -export type PropDisplayTextResolver = (data?: Omit, 'data'>) => string; +export type PropCallback = (data: ReadonlyPropData, auxData?: any) => R; +export type PropPredicate = (data?: ReadonlyPropData, auxData?: any) => boolean; +export type PropDisplayTextResolver = (data?: ReadonlyPropData) => string; export abstract class PropsFactory> { protected abstract _ctor: Type; diff --git a/npm/ng-packs/packages/components/extensible/src/lib/utils/form-props.util.ts b/npm/ng-packs/packages/components/extensible/src/lib/utils/form-props.util.ts index 1bd25966fc..bda65957a6 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/utils/form-props.util.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/utils/form-props.util.ts @@ -4,11 +4,13 @@ import { DateTimeAdapter, DateAdapter, TimeAdapter } from '@abp/ng.theme.shared' import { EXTRA_PROPERTIES_KEY } from '../constants/extra-properties'; import { ePropType } from '../enums/props.enum'; import { FormPropList } from '../models/form-props'; -import { PropData } from '../models/props'; +import { PropData, ReadonlyPropData } from '../models/props'; import { ExtensionsService } from '../services/extensions.service'; import { EXTENSIONS_IDENTIFIER } from '../tokens/extensions.token'; -export function generateFormFromProps(data: PropData) { +export function generateFormFromProps(propData: PropData) { + const data: ReadonlyPropData = propData.data; + const extensions = data.getInjected(ExtensionsService); const identifier = data.getInjected(EXTENSIONS_IDENTIFIER); @@ -16,7 +18,7 @@ export function generateFormFromProps(data: PropData) { const extraForm = new UntypedFormGroup({}); form.addControl(EXTRA_PROPERTIES_KEY, extraForm); - const record = data.record || {}; + const record: any = data.record || {}; const type = JSON.stringify(record) === '{}' ? 'create' : 'edit'; const props: FormPropList = extensions[`${type}FormProps`].get(identifier).props; const extraProperties = record[EXTRA_PROPERTIES_KEY] || {}; @@ -33,7 +35,7 @@ export function generateFormFromProps(data: PropData) { value = record[name]; } - if (typeof value === 'undefined') value = prop.defaultValue; + if (typeof value === 'undefined') value = prop.defaultValue as any; if (value) { let adapter: DateAdapter | TimeAdapter | DateTimeAdapter; diff --git a/npm/ng-packs/packages/components/package.json b/npm/ng-packs/packages/components/package.json index f991cb13d4..7340ce3890 100644 --- a/npm/ng-packs/packages/components/package.json +++ b/npm/ng-packs/packages/components/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.components", - "version": "10.1.0-rc.2", + "version": "10.1.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "peerDependencies": { - "@abp/ng.core": ">=10.1.0-rc.2", - "@abp/ng.theme.shared": ">=10.1.0-rc.2" + "@abp/ng.core": ">=10.1.0", + "@abp/ng.theme.shared": ">=10.1.0" }, "dependencies": { "chart.js": "^3.5.1", diff --git a/npm/ng-packs/packages/components/page/src/page-part.directive.ts b/npm/ng-packs/packages/components/page/src/page-part.directive.ts index bfaf1e60b6..23c243edc6 100644 --- a/npm/ng-packs/packages/components/page/src/page-part.directive.ts +++ b/npm/ng-packs/packages/components/page/src/page-part.directive.ts @@ -1,24 +1,22 @@ -import { - Directive, - TemplateRef, - ViewContainerRef, - Input, - InjectionToken, - OnInit, - OnDestroy, - Injector, - OnChanges, - SimpleChanges, - SimpleChange, - inject - } from '@angular/core'; +import { + Directive, + TemplateRef, + ViewContainerRef, + InjectionToken, + OnInit, + OnDestroy, + Injector, + inject, + input, + effect +} from '@angular/core'; import { Observable, Subscription, of } from 'rxjs'; export interface PageRenderStrategy { shouldRender(type?: string): boolean | Observable; onInit?(type?: string, injector?: Injector, context?: any): void; onDestroy?(type?: string, injector?: Injector, context?: any): void; - onContextUpdate?(change?: SimpleChange): void; + onContextUpdate?(context?: any): void; } export const PAGE_RENDER_STRATEGY = new InjectionToken('PAGE_RENDER_STRATEGY'); @@ -26,20 +24,34 @@ export const PAGE_RENDER_STRATEGY = new InjectionToken('PAGE @Directive({ selector: '[abpPagePart]', }) -export class PagePartDirective implements OnInit, OnDestroy, OnChanges { +export class PagePartDirective implements OnInit, OnDestroy { private templateRef = inject>(TemplateRef); private viewContainer = inject(ViewContainerRef); private renderLogic = inject(PAGE_RENDER_STRATEGY, { optional: true })!; private injector = inject(Injector); hasRendered = false; - type!: string; subscription!: Subscription; - @Input('abpPagePartContext') context: any; - @Input() set abpPagePart(type: string) { - this.type = type; - this.createRenderStream(type); + readonly context = input(undefined, { alias: 'abpPagePartContext' }); + readonly abpPagePart = input(''); + + constructor() { + // Watch for type changes + effect(() => { + const type = this.abpPagePart(); + if (type) { + this.createRenderStream(type); + } + }); + + // Watch for context changes + effect(() => { + const ctx = this.context(); + if (this.renderLogic?.onContextUpdate) { + this.renderLogic.onContextUpdate(ctx); + } + }); } render = (shouldRender: boolean) => { @@ -52,15 +64,9 @@ export class PagePartDirective implements OnInit, OnDestroy, OnChanges { } }; - ngOnChanges({ context }: SimpleChanges): void { - if (this.renderLogic?.onContextUpdate) { - this.renderLogic.onContextUpdate(context); - } - } - ngOnInit() { if (this.renderLogic?.onInit) { - this.renderLogic.onInit(this.type, this.injector, this.context); + this.renderLogic.onInit(this.abpPagePart(), this.injector, this.context()); } } @@ -68,7 +74,7 @@ export class PagePartDirective implements OnInit, OnDestroy, OnChanges { this.clearSubscription(); if (this.renderLogic?.onDestroy) { - this.renderLogic.onDestroy(this.type, this.injector, this.context); + this.renderLogic.onDestroy(this.abpPagePart(), this.injector, this.context()); } } diff --git a/npm/ng-packs/packages/components/page/src/page.component.html b/npm/ng-packs/packages/components/page/src/page.component.html index ee32f2e5e2..8417c7c6e4 100644 --- a/npm/ng-packs/packages/components/page/src/page.component.html +++ b/npm/ng-packs/packages/components/page/src/page.component.html @@ -1,33 +1,33 @@ @if (shouldRenderRow) {
- @if (customTitle) { + @if (customTitle()) { } @else { - @if (title) { + @if (title()) {

- {{ title }} + {{ title() }}

} } - @if (customBreadcrumb) { + @if (customBreadcrumb()) { } @else { - @if (breadcrumb) { + @if (breadcrumb()) {
} } - @if (customToolbar) { + @if (customToolbar()) { } @else { - @if (toolbarVisible) { -
- + @if (toolbarVisible()) { +
+
} } diff --git a/npm/ng-packs/packages/components/page/src/page.component.ts b/npm/ng-packs/packages/components/page/src/page.component.ts index bd5242651f..24b6e60e0b 100644 --- a/npm/ng-packs/packages/components/page/src/page.component.ts +++ b/npm/ng-packs/packages/components/page/src/page.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, ViewEncapsulation, ContentChild } from '@angular/core'; +import { Component, ViewEncapsulation, input, effect, signal, contentChild } from '@angular/core'; import { PageTitleContainerComponent, PageBreadcrumbContainerComponent, @@ -16,20 +16,12 @@ import { PagePartDirective } from './page-part.directive'; imports: [BreadcrumbComponent, PageToolbarComponent, PagePartDirective], }) export class PageComponent { - @Input() title?: string; + readonly title = input(undefined); + readonly toolbarInput = input(undefined, { alias: 'toolbar' }); + readonly breadcrumb = input(true); - toolbarVisible = false; - _toolbarData: any; - @Input() set toolbar(val: any) { - this._toolbarData = val; - this.toolbarVisible = true; - } - - get toolbarData() { - return this._toolbarData; - } - - @Input() breadcrumb = true; + protected readonly toolbarVisible = signal(false); + protected readonly toolbarData = signal(undefined); pageParts = { title: PageParts.title, @@ -37,19 +29,28 @@ export class PageComponent { toolbar: PageParts.toolbar, }; - @ContentChild(PageTitleContainerComponent) customTitle?: PageTitleContainerComponent; - @ContentChild(PageBreadcrumbContainerComponent) - customBreadcrumb?: PageBreadcrumbContainerComponent; - @ContentChild(PageToolbarContainerComponent) customToolbar?: PageToolbarContainerComponent; + readonly customTitle = contentChild(PageTitleContainerComponent); + readonly customBreadcrumb = contentChild(PageBreadcrumbContainerComponent); + readonly customToolbar = contentChild(PageToolbarContainerComponent); + + constructor() { + effect(() => { + const toolbar = this.toolbarInput(); + if (toolbar !== undefined) { + this.toolbarData.set(toolbar); + this.toolbarVisible.set(true); + } + }); + } get shouldRenderRow() { return !!( - this.title || - this.toolbarVisible || - this.breadcrumb || - this.customTitle || - this.customBreadcrumb || - this.customToolbar || + this.title() || + this.toolbarVisible() || + this.breadcrumb() || + this.customTitle() || + this.customBreadcrumb() || + this.customToolbar() || this.pageParts ); } diff --git a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html index 8cd2058699..e83a419863 100644 --- a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html +++ b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html @@ -1,17 +1,17 @@ @@ -26,13 +26,13 @@
- @if (menu) { + @if (menu()) { } diff --git a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts index 5c320a539b..1cfbbb09f9 100644 --- a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts +++ b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts @@ -2,14 +2,15 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, - ContentChild, - EventEmitter, + contentChild, inject, - Input, OnInit, - Output, TemplateRef, ViewEncapsulation, + input, + output, + signal, + effect } from '@angular/core'; import { NgbDropdown, NgbDropdownMenu, NgbDropdownToggle } from '@ng-bootstrap/ng-bootstrap'; import { @@ -56,32 +57,64 @@ export class TreeComponent implements OnInit { private cdr = inject(ChangeDetectorRef); private disableTreeStyleLoading = inject(DISABLE_TREE_STYLE_LOADING_TOKEN, { optional: true }); - dropPosition: number; + dropPosition!: number; dropdowns = {} as { [key: string]: NgbDropdown }; - @ContentChild('menu') menu: TemplateRef; - @ContentChild(TreeNodeTemplateDirective) customNodeTemplate: TreeNodeTemplateDirective; - @ContentChild(ExpandedIconTemplateDirective) expandedIconTemplate: ExpandedIconTemplateDirective; - @Output() readonly checkedKeysChange = new EventEmitter(); - @Output() readonly expandedKeysChange = new EventEmitter(); - @Output() readonly selectedNodeChange = new EventEmitter(); - @Output() readonly dropOver = new EventEmitter(); - @Output() readonly nzExpandChange = new EventEmitter(); - @Input() noAnimation = true; - @Input() draggable: boolean; - @Input() checkable: boolean; - @Input() checkStrictly: boolean; - @Input() checkedKeys = []; - @Input() nodes = []; - @Input() expandedKeys: string[] = []; - @Input() selectedNode: any; - @Input() changeCheckboxWithNode: boolean; - @Input() isNodeSelected = node => this.selectedNode?.id === node.key; - @Input() beforeDrop = (event: NzFormatBeforeDropEvent) => { - this.dropPosition = event.pos; - return of(false); - }; + readonly menu = contentChild>('menu'); + readonly customNodeTemplate = contentChild(TreeNodeTemplateDirective); + readonly expandedIconTemplate = contentChild(ExpandedIconTemplateDirective); + readonly checkedKeysChange = output(); + readonly expandedKeysChange = output(); + readonly selectedNodeChange = output(); + readonly dropOver = output(); + readonly nzExpandChange = output(); + + // Input signals + readonly noAnimation = input(true); + readonly draggable = input(undefined); + readonly checkable = input(undefined); + readonly checkStrictly = input(undefined); + readonly checkedKeysInput = input([], { alias: 'checkedKeys' }); + readonly nodesInput = input([], { alias: 'nodes' }); + readonly expandedKeysInput = input([], { alias: 'expandedKeys' }); + readonly selectedNodeInput = input(undefined, { alias: 'selectedNode' }); + readonly changeCheckboxWithNode = input(undefined); + readonly isNodeSelectedFn = input<(node: any) => boolean>( + (node) => this._selectedNode()?.id === node.key, + { alias: 'isNodeSelected' } + ); + readonly beforeDropFn = input<(event: NzFormatBeforeDropEvent) => any>( + (event: NzFormatBeforeDropEvent) => { + this.dropPosition = event.pos; + return of(false); + }, + { alias: 'beforeDrop' } + ); + + // Internal signals for two-way binding + protected readonly _checkedKeys = signal([]); + protected readonly _expandedKeys = signal([]); + protected readonly _selectedNode = signal(undefined); + protected readonly _nodes = signal([]); + + // Getters for template access + get checkedKeys() { return this._checkedKeys(); } + get expandedKeys() { return this._expandedKeys(); } + get selectedNode() { return this._selectedNode(); } + get nodes() { return this._nodes(); } + get isNodeSelected() { return this.isNodeSelectedFn(); } + get beforeDrop() { return this.beforeDropFn(); } + + constructor() { + // Sync input signals to internal signals + effect(() => { + this._checkedKeys.set(this.checkedKeysInput()); + this._expandedKeys.set(this.expandedKeysInput()); + this._selectedNode.set(this.selectedNodeInput()); + this._nodes.set(this.nodesInput()); + }); + } ngOnInit() { this.loadStyle(); @@ -97,13 +130,13 @@ export class TreeComponent implements OnInit { this.subscriptionService.addOne(loaded$); } - private findNode(target: any, nodes: any[]) { + private findNode(target: any, nodes: any[]): any { for (const node of nodes) { if (node.key === target.id) { return node; } if (node.children) { - const res = this.findNode(target, node.children); + const res: any = this.findNode(target, node.children); if (res) { return res; } @@ -113,36 +146,37 @@ export class TreeComponent implements OnInit { } onSelectedNodeChange(node: NzTreeNode) { - this.selectedNode = node.origin.entity; - if (this.changeCheckboxWithNode) { + this._selectedNode.set(node.origin.entity); + if (this.changeCheckboxWithNode()) { + const keys = this._checkedKeys(); let newVal; if (node.isChecked) { - newVal = this.checkedKeys.filter(x => x !== node.key); + newVal = keys.filter(x => x !== node.key); } else { - newVal = [...this.checkedKeys, node.key]; + newVal = [...keys, node.key]; } this.selectedNodeChange.emit(node); - this.checkedKeys = newVal; + this._checkedKeys.set(newVal); this.checkedKeysChange.emit(newVal); } else { this.selectedNodeChange.emit(node.origin.entity); } } - onCheckboxChange(event) { - this.checkedKeys = [...event.keys]; + onCheckboxChange(event: { keys: any[] }) { + this._checkedKeys.set([...event.keys]); this.checkedKeysChange.emit(event.keys); } - onExpandedKeysChange(event) { - this.expandedKeys = [...event.keys]; + onExpandedKeysChange(event: { keys: string[] } & NzFormatEmitEvent) { + this._expandedKeys.set([...event.keys]); this.expandedKeysChange.emit(event.keys); this.nzExpandChange.emit(event); } onDrop(event: DropEvent) { - event.event.stopPropagation(); - event.event.preventDefault(); + event.event?.stopPropagation(); + event.event?.preventDefault(); event.pos = this.dropPosition; this.dropOver.emit(event); @@ -160,12 +194,14 @@ export class TreeComponent implements OnInit { dropdown.close(); } }); - this.dropdowns[dropdownKey]?.toggle(); + if (dropdownKey) { + this.dropdowns[dropdownKey]?.toggle(); + } } setSelectedNode(node: any) { - const newSelectedNode = this.findNode(node, this.nodes); - this.selectedNode = { ...newSelectedNode }; + const newSelectedNode = this.findNode(node, this._nodes()); + this._selectedNode.set({ ...newSelectedNode }); this.cdr.markForCheck(); } } diff --git a/npm/ng-packs/packages/core/package.json b/npm/ng-packs/packages/core/package.json index da1307759c..59a86a32f8 100644 --- a/npm/ng-packs/packages/core/package.json +++ b/npm/ng-packs/packages/core/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.core", - "version": "10.1.0-rc.2", + "version": "10.1.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/utils": "~10.1.0-rc.2", + "@abp/utils": "~10.1.0", "just-clone": "^6.0.0", "just-compare": "^2.0.0", "ts-toolbelt": "^9.0.0", diff --git a/npm/ng-packs/packages/core/src/lib/abstracts/ng-model.component.ts b/npm/ng-packs/packages/core/src/lib/abstracts/ng-model.component.ts index 8e8ed6e66e..889143c9ed 100644 --- a/npm/ng-packs/packages/core/src/lib/abstracts/ng-model.component.ts +++ b/npm/ng-packs/packages/core/src/lib/abstracts/ng-model.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectorRef, Component, inject, Input } from '@angular/core'; +import { ChangeDetectorRef, Component, inject, input } from '@angular/core'; import { ControlValueAccessor } from '@angular/forms'; // Not an abstract class on purpose. Do not change! @@ -11,23 +11,20 @@ export class AbstractNgModelComponent implements ControlValueAcc onChange?: (value: T) => void; onTouched?: () => void; - @Input() + // Note: disabled needs to remain as a regular property because setDisabledState assigns to it disabled?: boolean; - @Input() - readonly?: boolean; + readonly readonly = input(undefined); - @Input() - valueFn: (value: U, previousValue?: T) => T = value => value as any as T; + readonly valueFn = input<(value: U, previousValue?: T) => T>(value => value as any as T); - @Input() - valueLimitFn: (value: T, previousValue?: T) => any = value => false; + readonly valueLimitFn = input<(value: T, previousValue?: T) => any>(value => false); - @Input() + // Note: value needs getter/setter for ControlValueAccessor and two-way binding set value(value: T) { - value = this.valueFn(value as any as U, this._value); + value = this.valueFn()(value as any as U, this._value); - if (this.valueLimitFn(value, this._value) !== false || this.readonly) return; + if (this.valueLimitFn()(value, this._value) !== false || this.readonly()) return; this._value = value; this.notifyValueChange(); @@ -48,7 +45,7 @@ export class AbstractNgModelComponent implements ControlValueAcc } writeValue(value: T): void { - this._value = this.valueLimitFn(value, this._value) || value; + this._value = this.valueLimitFn()(value, this._value) || value; this.cdRef.markForCheck(); } diff --git a/npm/ng-packs/packages/core/src/lib/directives/autofocus.directive.ts b/npm/ng-packs/packages/core/src/lib/directives/autofocus.directive.ts index 398eaef9cc..4400c6d5af 100644 --- a/npm/ng-packs/packages/core/src/lib/directives/autofocus.directive.ts +++ b/npm/ng-packs/packages/core/src/lib/directives/autofocus.directive.ts @@ -1,4 +1,4 @@ -import { AfterViewInit, Directive, ElementRef, Input, inject } from '@angular/core'; +import { AfterViewInit, Directive, ElementRef, inject, input } from '@angular/core'; @Directive({ selector: '[autofocus]', @@ -6,18 +6,12 @@ import { AfterViewInit, Directive, ElementRef, Input, inject } from '@angular/co export class AutofocusDirective implements AfterViewInit { private elRef = inject(ElementRef); - private _delay = 0; - - @Input('autofocus') - set delay(val: number | string | undefined) { - this._delay = Number(val) || 0; - } - - get delay() { - return this._delay; - } + readonly delay = input(0, { + alias: 'autofocus', + transform: (v: unknown) => Number(v) || 0, + }); ngAfterViewInit(): void { - setTimeout(() => this.elRef.nativeElement.focus(), this.delay as number); + setTimeout(() => this.elRef.nativeElement.focus(), this.delay()); } } diff --git a/npm/ng-packs/packages/core/src/lib/directives/caps-lock.directive.ts b/npm/ng-packs/packages/core/src/lib/directives/caps-lock.directive.ts index 99bfcebb92..792b671962 100644 --- a/npm/ng-packs/packages/core/src/lib/directives/caps-lock.directive.ts +++ b/npm/ng-packs/packages/core/src/lib/directives/caps-lock.directive.ts @@ -1,10 +1,10 @@ -import { Directive, EventEmitter, HostListener, Output } from '@angular/core'; +import { Directive, HostListener, output } from '@angular/core'; @Directive({ selector: '[abpCapsLock]', }) export class TrackCapsLockDirective { - @Output('abpCapsLock') capsLock = new EventEmitter(); + readonly capsLock = output({ alias: 'abpCapsLock' }); @HostListener('window:keydown', ['$event']) onKeyDown(event: KeyboardEvent): void { diff --git a/npm/ng-packs/packages/core/src/lib/directives/debounce.directive.ts b/npm/ng-packs/packages/core/src/lib/directives/debounce.directive.ts index 239aed688d..e2b023a3af 100644 --- a/npm/ng-packs/packages/core/src/lib/directives/debounce.directive.ts +++ b/npm/ng-packs/packages/core/src/lib/directives/debounce.directive.ts @@ -1,4 +1,4 @@ -import { Directive, ElementRef, EventEmitter, Input, OnInit, Output, inject } from '@angular/core'; +import { Directive, ElementRef, OnInit, inject, input, output } from '@angular/core'; import { fromEvent } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; import { SubscriptionService } from '../services/subscription.service'; @@ -11,13 +11,13 @@ export class InputEventDebounceDirective implements OnInit { private el = inject(ElementRef); private subscription = inject(SubscriptionService); - @Input() debounce = 300; + readonly debounce = input(300); - @Output('input.debounce') readonly debounceEvent = new EventEmitter(); + readonly debounceEvent = output({ alias: 'input.debounce' }); ngOnInit(): void { const input$ = fromEvent(this.el.nativeElement, 'input').pipe( - debounceTime(this.debounce), + debounceTime(this.debounce()), ); this.subscription.addOne(input$, (event: Event) => { diff --git a/npm/ng-packs/packages/core/src/lib/directives/for.directive.ts b/npm/ng-packs/packages/core/src/lib/directives/for.directive.ts index f26c12b706..0e3f1c8179 100644 --- a/npm/ng-packs/packages/core/src/lib/directives/for.directive.ts +++ b/npm/ng-packs/packages/core/src/lib/directives/for.directive.ts @@ -1,7 +1,6 @@ import { Directive, EmbeddedViewRef, - Input, IterableChangeRecord, IterableChanges, IterableDiffer, @@ -11,6 +10,7 @@ import { TrackByFunction, ViewContainerRef, inject, + input } from '@angular/core'; import clone from 'just-clone'; import compare from 'just-compare'; @@ -42,29 +42,21 @@ export class ForDirective implements OnChanges { private differs = inject(IterableDiffers); // eslint-disable-next-line @angular-eslint/no-input-rename - @Input('abpForOf') - items!: any[]; + readonly items = input.required({ alias: "abpForOf" }); - @Input('abpForOrderBy') - orderBy?: string; + readonly orderBy = input(undefined, { alias: "abpForOrderBy" }); - @Input('abpForOrderDir') - orderDir?: 'ASC' | 'DESC'; + readonly orderDir = input<'ASC' | 'DESC'>(undefined, { alias: "abpForOrderDir" }); - @Input('abpForFilterBy') - filterBy?: string; + readonly filterBy = input(undefined, { alias: "abpForFilterBy" }); - @Input('abpForFilterVal') - filterVal: any; + readonly filterVal = input(undefined, { alias: "abpForFilterVal" }); - @Input('abpForTrackBy') - trackBy?: TrackByFunction; + readonly trackBy = input>(undefined, { alias: "abpForTrackBy" }); - @Input('abpForCompareBy') - compareBy?: CompareFn; + readonly compareBy = input(undefined, { alias: "abpForCompareBy" }); - @Input('abpForEmptyRef') - emptyRef?: TemplateRef; + readonly emptyRef = input>(undefined, { alias: "abpForEmptyRef" }); private differ!: IterableDiffer | null; private lastItemsRef: any[] | null = null; @@ -72,11 +64,11 @@ export class ForDirective implements OnChanges { private isShowEmptyRef!: boolean; get compareFn(): CompareFn { - return this.compareBy || compare; + return this.compareBy() || compare; } get trackByFn(): TrackByFunction { - return this.trackBy || ((index: number, item: any) => (item as any).id || index); + return this.trackBy() || ((index: number, item: any) => (item as any).id || index); } private iterateOverAppliedOperations(changes: IterableChanges) { @@ -91,7 +83,7 @@ export class ForDirective implements OnChanges { if (record.previousIndex == null) { const view = this.vcRef.createEmbeddedView( this.tempRef, - new AbpForContext(null, -1, -1, this.items), + new AbpForContext(null, -1, -1, this.items()), currentIndex || 0, ); @@ -120,7 +112,7 @@ export class ForDirective implements OnChanges { const viewRef = this.vcRef.get(i) as EmbeddedViewRef; viewRef.context.index = i; viewRef.context.count = l; - viewRef.context.list = this.items; + viewRef.context.list = this.items(); } changes.forEachIdentityChange((record: IterableChangeRecord) => { @@ -132,9 +124,10 @@ export class ForDirective implements OnChanges { } private projectItems(items: any[]): void { - if (!items.length && this.emptyRef) { + const emptyRef = this.emptyRef(); + if (!items.length && emptyRef) { this.vcRef.clear(); - this.vcRef.createEmbeddedView(this.emptyRef).rootNodes; + this.vcRef.createEmbeddedView(emptyRef).rootNodes; this.isShowEmptyRef = true; this.differ = null; this.lastItemsRef = null; @@ -142,7 +135,7 @@ export class ForDirective implements OnChanges { return; } - if (this.emptyRef && this.isShowEmptyRef) { + if (emptyRef && this.isShowEmptyRef) { this.vcRef.clear(); this.isShowEmptyRef = false; } @@ -162,7 +155,7 @@ export class ForDirective implements OnChanges { } private sortItems(items: any[]) { - const orderBy = this.orderBy; + const orderBy = this.orderBy(); if (orderBy) { items.sort((a, b) => (a[orderBy] > b[orderBy] ? 1 : a[orderBy] < b[orderBy] ? -1 : 0)); } else { @@ -171,28 +164,31 @@ export class ForDirective implements OnChanges { } ngOnChanges() { - if (!this.items) return; + const itemsValue = this.items(); + if (!itemsValue) return; // Recreate differ if items array reference changed - if (this.lastItemsRef !== this.items) { + if (this.lastItemsRef !== itemsValue) { + this.vcRef.clear(); this.differ = null; - this.lastItemsRef = this.items; + this.lastItemsRef = itemsValue; } - let items = clone(this.items) as any[]; + let items = clone(itemsValue) as any[]; if (!Array.isArray(items)) return; const compareFn = this.compareFn; - const filterBy = this.filterBy; + const filterBy = this.filterBy(); + const filterVal = this.filterVal(); if ( typeof filterBy !== 'undefined' && - typeof this.filterVal !== 'undefined' && - this.filterVal !== '' + typeof filterVal !== 'undefined' && + filterVal !== '' ) { - items = items.filter(item => compareFn(item[filterBy], this.filterVal)); + items = items.filter(item => compareFn(item[filterBy], this.filterVal())); } - switch (this.orderDir) { + switch (this.orderDir()) { case 'ASC': this.sortItems(items); this.projectItems(items); diff --git a/npm/ng-packs/packages/core/src/lib/directives/form-submit.directive.ts b/npm/ng-packs/packages/core/src/lib/directives/form-submit.directive.ts index 879fbdf780..b6ecbedec5 100644 --- a/npm/ng-packs/packages/core/src/lib/directives/form-submit.directive.ts +++ b/npm/ng-packs/packages/core/src/lib/directives/form-submit.directive.ts @@ -1,12 +1,11 @@ -import { - ChangeDetectorRef, - Directive, - ElementRef, - EventEmitter, - Input, - OnInit, - Output, - inject +import { + ChangeDetectorRef, + Directive, + ElementRef, + OnInit, + inject, + input, + output } from '@angular/core'; import { FormGroupDirective, UntypedFormControl, UntypedFormGroup } from '@angular/forms'; import { fromEvent } from 'rxjs'; @@ -27,23 +26,20 @@ export class FormSubmitDirective implements OnInit { private cdRef = inject(ChangeDetectorRef); private subscription = inject(SubscriptionService); - @Input() - debounce = 200; + readonly debounce = input(200); // TODO: Remove unused input - @Input() - notValidateOnSubmit?: string | boolean; + readonly notValidateOnSubmit = input(undefined); - @Input() - markAsDirtyWhenSubmit = true; + readonly markAsDirtyWhenSubmit = input(true); - @Output() readonly ngSubmit = new EventEmitter(); + readonly ngSubmit = output(); executedNgSubmit = false; ngOnInit() { this.subscription.addOne(this.formGroupDirective.ngSubmit, () => { - if (this.markAsDirtyWhenSubmit) { + if (this.markAsDirtyWhenSubmit()) { this.markAsDirty(); } @@ -51,7 +47,7 @@ export class FormSubmitDirective implements OnInit { }); const keyup$ = fromEvent(this.host.nativeElement as HTMLElement, 'keyup').pipe( - debounceTime(this.debounce), + debounceTime(this.debounce()), filter(event => !(event.target instanceof HTMLTextAreaElement)), filter(event => event && event.key === 'Enter'), ); diff --git a/npm/ng-packs/packages/core/src/lib/directives/init.directive.ts b/npm/ng-packs/packages/core/src/lib/directives/init.directive.ts index 1271f031ba..e4033f9f16 100644 --- a/npm/ng-packs/packages/core/src/lib/directives/init.directive.ts +++ b/npm/ng-packs/packages/core/src/lib/directives/init.directive.ts @@ -1,4 +1,4 @@ -import { Directive, Output, EventEmitter, ElementRef, AfterViewInit, inject } from '@angular/core'; +import { Directive, ElementRef, AfterViewInit, inject, output } from '@angular/core'; @Directive({ selector: '[abpInit]', @@ -6,7 +6,7 @@ import { Directive, Output, EventEmitter, ElementRef, AfterViewInit, inject } fr export class InitDirective implements AfterViewInit { private elRef = inject(ElementRef); - @Output('abpInit') readonly init = new EventEmitter>(); + readonly init = output>({ alias: 'abpInit' }); ngAfterViewInit() { this.init.emit(this.elRef); diff --git a/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts b/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts index 2c17885984..b12782288d 100644 --- a/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts +++ b/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts @@ -2,12 +2,12 @@ import { AfterViewInit, ChangeDetectorRef, Directive, - Input, OnChanges, OnDestroy, TemplateRef, ViewContainerRef, inject, + input } from '@angular/core'; import { ReplaySubject, Subscription } from 'rxjs'; import { distinctUntilChanged, take } from 'rxjs/operators'; @@ -25,9 +25,9 @@ export class PermissionDirective implements OnDestroy, OnChanges, AfterViewInit private cdRef = inject(ChangeDetectorRef); queue = inject(QUEUE_MANAGER); - @Input('abpPermission') condition: string | undefined; + readonly condition = input(undefined, { alias: "abpPermission" }); - @Input('abpPermissionRunChangeDetection') runChangeDetection = true; + readonly runChangeDetection = input(true, { alias: "abpPermissionRunChangeDetection" }); subscription!: Subscription; @@ -41,14 +41,14 @@ export class PermissionDirective implements OnDestroy, OnChanges, AfterViewInit } this.subscription = this.permissionService - .getGrantedPolicy$(this.condition || '') + .getGrantedPolicy$(this.condition() || '') .pipe(distinctUntilChanged()) .subscribe(isGranted => { this.vcRef.clear(); if (isGranted && this.templateRef) { this.vcRef.createEmbeddedView(this.templateRef); } - if (this.runChangeDetection) { + if (this.runChangeDetection()) { if (!this.rendered) { this.cdrSubject.next(); } else { diff --git a/npm/ng-packs/packages/core/src/lib/directives/replaceable-template.directive.ts b/npm/ng-packs/packages/core/src/lib/directives/replaceable-template.directive.ts index 7e948cc20f..f39ba1fdd3 100644 --- a/npm/ng-packs/packages/core/src/lib/directives/replaceable-template.directive.ts +++ b/npm/ng-packs/packages/core/src/lib/directives/replaceable-template.directive.ts @@ -1,14 +1,15 @@ -import { - Directive, - Injector, - Input, - OnChanges, - OnInit, - SimpleChanges, - TemplateRef, - Type, - ViewContainerRef, - inject +import { + Directive, + effect, + Injector, + OnChanges, + OnInit, + SimpleChanges, + TemplateRef, + Type, + ViewContainerRef, + inject, + input } from '@angular/core'; import compare from 'just-compare'; import { Subscription } from 'rxjs'; @@ -29,8 +30,7 @@ export class ReplaceableTemplateDirective implements OnInit, OnChanges { private replaceableComponents = inject(ReplaceableComponentsService); private subscription = inject(SubscriptionService); - @Input('abpReplaceableTemplate') - data!: ReplaceableComponents.ReplaceableTemplateDirectiveInput; + readonly data = input.required>({ alias: "abpReplaceableTemplate" }); providedData = { inputs: {}, @@ -55,11 +55,18 @@ export class ReplaceableTemplateDirective implements OnInit, OnChanges { this.setDefaultComponentInputs(); }, }; + + effect(() => { + const data = this.data(); + if (data?.inputs && this.defaultComponentRef) { + this.setDefaultComponentInputs(); + } + }); } ngOnInit() { const component$ = this.replaceableComponents - .get$(this.data.componentKey) + .get$(this.data().componentKey) .pipe( filter( (res = {} as ReplaceableComponents.ReplaceableComponent) => @@ -102,25 +109,26 @@ export class ReplaceableTemplateDirective implements OnInit, OnChanges { } setDefaultComponentInputs() { - if (!this.defaultComponentRef || (!this.data.inputs && !this.data.outputs)) return; - - if (this.data.inputs) { - for (const key in this.data.inputs) { - if (Object.prototype.hasOwnProperty.call(this.data.inputs, key)) { - if (!compare(this.defaultComponentRef[key], this.data.inputs[key].value)) { - this.defaultComponentRef[key] = this.data.inputs[key].value; + const data = this.data(); + if (!this.defaultComponentRef || (!data.inputs && !data.outputs)) return; + + if (data.inputs) { + for (const key in data.inputs) { + if (Object.prototype.hasOwnProperty.call(data.inputs, key)) { + if (!compare(this.defaultComponentRef[key], data.inputs[key].value)) { + this.defaultComponentRef[key] = data.inputs[key].value; } } } } - if (this.data.outputs) { - for (const key in this.data.outputs) { - if (Object.prototype.hasOwnProperty.call(this.data.outputs, key)) { + if (data.outputs) { + for (const key in data.outputs) { + if (Object.prototype.hasOwnProperty.call(data.outputs, key)) { if (!this.defaultComponentSubscriptions[key]) { this.defaultComponentSubscriptions[key] = this.defaultComponentRef[key].subscribe( (value: any) => { - this.data.outputs?.[key](value); + this.data().outputs?.[key](value); }, ); } @@ -130,24 +138,26 @@ export class ReplaceableTemplateDirective implements OnInit, OnChanges { } setProvidedData() { - this.providedData = { outputs: {}, ...this.data, inputs: {} }; + this.providedData = { outputs: {}, ...this.data(), inputs: {} }; - if (!this.data.inputs) return; + const data = this.data(); + if (!data.inputs) return; Object.defineProperties(this.providedData.inputs, { - ...Object.keys(this.data.inputs).reduce( + ...Object.keys(data.inputs).reduce( (acc, key) => ({ ...acc, [key]: { enumerable: true, configurable: true, - get: () => this.data.inputs?.[key]?.value, - ...(this.data.inputs?.[key]?.twoWay && { + get: () => this.data().inputs?.[key]?.value, + ...(this.data().inputs?.[key]?.twoWay && { set: (newValue: any) => { - if (this.data.inputs?.[key]) { - this.data.inputs[key].value = newValue; + const dataValue = this.data(); + if (dataValue.inputs?.[key]) { + dataValue.inputs[key].value = newValue; } - if (this.data.outputs?.[`${key}Change`]) { - this.data.outputs[`${key}Change`](newValue); + if (dataValue.outputs?.[`${key}Change`]) { + dataValue.outputs[`${key}Change`](newValue); } }, }), diff --git a/npm/ng-packs/packages/core/src/lib/directives/show-password.directive.ts b/npm/ng-packs/packages/core/src/lib/directives/show-password.directive.ts index a8d8addd6c..367f483b21 100644 --- a/npm/ng-packs/packages/core/src/lib/directives/show-password.directive.ts +++ b/npm/ng-packs/packages/core/src/lib/directives/show-password.directive.ts @@ -1,4 +1,4 @@ -import { Directive, ElementRef, Input, inject } from '@angular/core'; +import { Directive, ElementRef, effect, inject, input } from '@angular/core'; @Directive({ selector: '[abpShowPassword]', @@ -6,10 +6,15 @@ import { Directive, ElementRef, Input, inject } from '@angular/core'; export class ShowPasswordDirective { protected readonly elementRef = inject(ElementRef); - @Input() set abpShowPassword(visible: boolean) { - const element = this.elementRef.nativeElement as HTMLInputElement; - if (!element) return; + readonly abpShowPassword = input(false); - element.type = visible ? 'text' : 'password'; + constructor() { + effect(() => { + const visible = this.abpShowPassword(); + const element = this.elementRef.nativeElement as HTMLInputElement; + if (!element) return; + + element.type = visible ? 'text' : 'password'; + }); } } diff --git a/npm/ng-packs/packages/core/src/lib/directives/stop-propagation.directive.ts b/npm/ng-packs/packages/core/src/lib/directives/stop-propagation.directive.ts index a1af9bf07e..2a3c8f0a80 100644 --- a/npm/ng-packs/packages/core/src/lib/directives/stop-propagation.directive.ts +++ b/npm/ng-packs/packages/core/src/lib/directives/stop-propagation.directive.ts @@ -1,4 +1,4 @@ -import { Directive, ElementRef, EventEmitter, OnInit, Output, inject } from '@angular/core'; +import { Directive, ElementRef, OnInit, inject, output } from '@angular/core'; import { fromEvent } from 'rxjs'; import { SubscriptionService } from '../services/subscription.service'; @@ -10,7 +10,7 @@ export class StopPropagationDirective implements OnInit { private el = inject(ElementRef); private subscription = inject(SubscriptionService); - @Output('click.stop') readonly stopPropEvent = new EventEmitter(); + readonly stopPropEvent = output({ alias: 'click.stop' }); ngOnInit(): void { this.subscription.addOne(fromEvent(this.el.nativeElement, 'click'), event => { diff --git a/npm/ng-packs/packages/core/src/lib/models/common.ts b/npm/ng-packs/packages/core/src/lib/models/common.ts index 704fde958a..1506dc3a8b 100644 --- a/npm/ng-packs/packages/core/src/lib/models/common.ts +++ b/npm/ng-packs/packages/core/src/lib/models/common.ts @@ -16,6 +16,26 @@ export namespace ABP { othersGroup?: string; dynamicLayouts?: Map; disableProjectNameInTitle?: boolean; + uiLocalization?: UILocalizationOptions; + } + + export interface UILocalizationOptions { + /** + * Enable UI localization feature + * When enabled, localization files are automatically loaded based on selected language + * Files should be located at: {basePath}/{culture}.json + * Example: /assets/localization/en.json + * JSON format: { "ResourceName": { "Key": "Value" } } + * Merges with backend localizations (UI > Backend priority) + */ + enabled?: boolean; + /** + * Base path for localization JSON files + * Default: '/assets/localization' + * Files should be located at: {basePath}/{culture}.json + * Example: /assets/localization/en.json + */ + basePath?: string; } export interface Child { diff --git a/npm/ng-packs/packages/core/src/lib/providers/core-module-config.provider.ts b/npm/ng-packs/packages/core/src/lib/providers/core-module-config.provider.ts index 6d46caedeb..08f1beb706 100644 --- a/npm/ng-packs/packages/core/src/lib/providers/core-module-config.provider.ts +++ b/npm/ng-packs/packages/core/src/lib/providers/core-module-config.provider.ts @@ -23,7 +23,12 @@ import { RoutesHandler } from '../handlers'; import { ABP, SortableItem } from '../models'; import { AuthErrorFilterService } from '../abstracts'; import { DEFAULT_DYNAMIC_LAYOUTS } from '../constants'; -import { LocalizationService, LocalStorageListenerService, AbpTitleStrategy } from '../services'; +import { + LocalizationService, + LocalStorageListenerService, + AbpTitleStrategy, + UILocalizationService, +} from '../services'; import { DefaultQueueManager, getInitialData } from '../utils'; import { CookieLanguageProvider, IncludeLocalizationResourcesProvider, LocaleProvider } from './'; import { timezoneInterceptor, transferStateInterceptor } from '../interceptors'; @@ -113,6 +118,11 @@ export function provideAbpCore(...features: CoreFeature[]) { inject(LocalizationService); inject(LocalStorageListenerService); inject(RoutesHandler); + // Initialize UILocalizationService if UI-only mode is enabled + const options = inject(CORE_OPTIONS); + if (options?.uiLocalization?.enabled) { + inject(UILocalizationService); + } await getInitialData(); }), LocaleProvider, diff --git a/npm/ng-packs/packages/core/src/lib/proxy/volo/abp/asp-net-core/mvc/application-configurations/abp-application-configuration.service.ts b/npm/ng-packs/packages/core/src/lib/proxy/volo/abp/asp-net-core/mvc/application-configurations/abp-application-configuration.service.ts index 9dc35fa7b6..4e1b115b7c 100644 --- a/npm/ng-packs/packages/core/src/lib/proxy/volo/abp/asp-net-core/mvc/application-configurations/abp-application-configuration.service.ts +++ b/npm/ng-packs/packages/core/src/lib/proxy/volo/abp/asp-net-core/mvc/application-configurations/abp-application-configuration.service.ts @@ -6,8 +6,8 @@ import { Injectable, inject } from '@angular/core'; @Injectable({ providedIn: 'root', }) -export class AbpApplicationConfigurationService { - private restService = inject(RestService); +export class AbpApplicationConfigurationService { + private restService = inject(RestService); apiName = 'abp'; diff --git a/npm/ng-packs/packages/core/src/lib/services/index.ts b/npm/ng-packs/packages/core/src/lib/services/index.ts index 61fd1ef480..205fd2f0dc 100644 --- a/npm/ng-packs/packages/core/src/lib/services/index.ts +++ b/npm/ng-packs/packages/core/src/lib/services/index.ts @@ -8,6 +8,7 @@ export * from './http-wait.service'; export * from './lazy-load.service'; export * from './list.service'; export * from './localization.service'; +export * from './ui-localization.service'; export * from './multi-tenancy.service'; export * from './permission.service'; export * from './replaceable-components.service'; diff --git a/npm/ng-packs/packages/core/src/lib/services/localization.service.ts b/npm/ng-packs/packages/core/src/lib/services/localization.service.ts index d91679effb..0e27973a90 100644 --- a/npm/ng-packs/packages/core/src/lib/services/localization.service.ts +++ b/npm/ng-packs/packages/core/src/lib/services/localization.service.ts @@ -60,6 +60,8 @@ export class LocalizationService { private initLocalizationValues() { localizations$.subscribe(val => this.addLocalization(val)); + // Backend-based localization loading (always enabled) + // UI localizations are merged via addLocalization() (UI > Backend priority) const legacyResources$ = this.configState.getDeep$('localization.values') as Observable< Record> >; @@ -90,7 +92,8 @@ export class LocalizationService { const resourceName = entry[0]; const remoteTexts = entry[1]; let resource = local?.get(resourceName) || {}; - resource = { ...resource, ...remoteTexts }; + // UI > Backend priority: local texts override remote texts + resource = { ...remoteTexts, ...resource }; local?.set(resourceName, resource); }); diff --git a/npm/ng-packs/packages/core/src/lib/services/ui-localization.service.ts b/npm/ng-packs/packages/core/src/lib/services/ui-localization.service.ts new file mode 100644 index 0000000000..3bbbfa71aa --- /dev/null +++ b/npm/ng-packs/packages/core/src/lib/services/ui-localization.service.ts @@ -0,0 +1,119 @@ +import { Injectable, inject } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { BehaviorSubject, distinctUntilChanged, switchMap, of } from 'rxjs'; +import { catchError, shareReplay, tap } from 'rxjs/operators'; +import { ABP } from '../models/common'; +import { LocalizationService } from './localization.service'; +import { SessionStateService } from './session-state.service'; +import { CORE_OPTIONS } from '../tokens/options.token'; + +export interface UILocalizationResource { + [resourceName: string]: Record; +} + +/** + * Service for managing UI localizations in ABP Angular applications. + * Automatically loads localization files based on selected language + * Merges with backend localizations (UI > Backend priority) + */ +@Injectable({ providedIn: 'root' }) +export class UILocalizationService { + private http = inject(HttpClient); + private localizationService = inject(LocalizationService); + private sessionState = inject(SessionStateService); + private options = inject(CORE_OPTIONS); + + private loadedLocalizations$ = new BehaviorSubject>({}); + + private currentLanguage$ = this.sessionState.getLanguage$(); + + constructor() { + const uiLocalization = this.options.uiLocalization; + if (uiLocalization?.enabled) { + this.subscribeToLanguageChanges(); + } + } + + private subscribeToLanguageChanges() { + this.currentLanguage$ + .pipe( + distinctUntilChanged(), + switchMap(culture => this.loadLocalizationFile(culture)) + ) + .subscribe(); + } + + private loadLocalizationFile(culture: string) { + const config = this.options.uiLocalization; + if (!config?.enabled) return of(null); + + const basePath = config.basePath || '/assets/localization'; + const url = `${basePath}/${culture}.json`; + + return this.http.get(url).pipe( + catchError(() => { + // If file not found or error occurs, return null + return of(null); + }), + tap(data => { + if (data) { + this.processLocalizationData(culture, data); + } + }), + ); + } + + private processLocalizationData(culture: string, data: UILocalizationResource) { + const abpFormat: ABP.Localization[] = [ + { + culture, + resources: Object.entries(data).map(([resourceName, texts]) => ({ + resourceName, + texts, + })), + }, + ]; + this.localizationService.addLocalization(abpFormat); + + const current = this.loadedLocalizations$.value; + current[culture] = data; + this.loadedLocalizations$.next(current); + } + + addAngularLocalizeLocalization( + culture: string, + resourceName: string, + translations: Record, + ): void { + const abpFormat: ABP.Localization[] = [ + { + culture, + resources: [ + { + resourceName, + texts: translations, + }, + ], + }, + ]; + this.localizationService.addLocalization(abpFormat); + + const current = this.loadedLocalizations$.value; + if (!current[culture]) { + current[culture] = {}; + } + if (!current[culture][resourceName]) { + current[culture][resourceName] = {}; + } + current[culture][resourceName] = { + ...current[culture][resourceName], + ...translations, + }; + this.loadedLocalizations$.next(current); + } + + getLoadedLocalizations(culture?: string): UILocalizationResource { + const lang = culture || this.sessionState.getLanguage(); + return this.loadedLocalizations$.value[lang] || {}; + } +} diff --git a/npm/ng-packs/packages/core/src/lib/tests/environment-utils.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/environment-utils.spec.ts index bc1af8e5f4..353f1ebe69 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/environment-utils.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/environment-utils.spec.ts @@ -1,7 +1,7 @@ import { HttpClient } from '@angular/common/http'; import { Component, Injector } from '@angular/core'; import { createComponentFactory, Spectator } from '@ngneat/spectator/vitest'; -import { BehaviorSubject } from 'rxjs'; +import { BehaviorSubject, throwError } from 'rxjs'; import { Environment, RemoteEnv } from '../models/environment'; import { EnvironmentService } from '../services/environment.service'; import { getRemoteEnv } from '../utils/environment-utils'; @@ -85,7 +85,6 @@ describe('EnvironmentUtils', () => { injectorSpy.mockReturnValueOnce(environmentService); injectorSpy.mockReturnValueOnce(http); - injectorSpy.mockReturnValueOnce({}); requestSpy.mockReturnValue(new BehaviorSubject(customEnv)); @@ -95,5 +94,24 @@ describe('EnvironmentUtils', () => { expect(requestSpy).toHaveBeenCalledWith('GET', '/assets/appsettings.json', { headers: {} }); expect(setStateSpy).toHaveBeenCalledWith(expectedValue); } + + it('should handle request error gracefully and use local environment', async () => { + const injector = spectator.inject(Injector); + const injectorSpy = jest.spyOn(injector, 'get'); + const http = spectator.inject(HttpClient); + const requestSpy = jest.spyOn(http, 'request'); + const environmentService = spectator.inject(EnvironmentService); + const setStateSpy = jest.spyOn(environmentService, 'setState'); + + injectorSpy.mockReturnValueOnce(environmentService); + injectorSpy.mockReturnValueOnce(http); + + requestSpy.mockReturnValue(throwError(() => new Error('Network error'))); + + environment.remoteEnv.mergeStrategy = 'deepmerge'; + await getRemoteEnv(injector, environment); + + expect(setStateSpy).toHaveBeenCalledWith(deepMerge(environment, {})); + }); }); }); diff --git a/npm/ng-packs/packages/core/src/lib/tests/replaceable-template.directive.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/replaceable-template.directive.spec.ts index 08075ee7f4..3cd625cd3c 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/replaceable-template.directive.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/replaceable-template.directive.spec.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, Output, inject } from '@angular/core'; +import { Component, Input, inject, output } from '@angular/core'; import { Router } from '@angular/router'; import { createDirectiveFactory, SpectatorDirective } from '@ngneat/spectator/vitest'; import { BehaviorSubject } from 'rxjs'; @@ -18,11 +18,9 @@ class DefaultComponent { @Input() twoWay: boolean; - @Output() - readonly twoWayChange = new EventEmitter(); + readonly twoWayChange = output(); - @Output() - readonly someOutput = new EventEmitter(); + readonly someOutput = output(); setTwoWay(value) { this.twoWay = value; diff --git a/npm/ng-packs/packages/core/src/lib/tests/ui-localization.service.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/ui-localization.service.spec.ts new file mode 100644 index 0000000000..abb15217c1 --- /dev/null +++ b/npm/ng-packs/packages/core/src/lib/tests/ui-localization.service.spec.ts @@ -0,0 +1,160 @@ +import { createServiceFactory, SpectatorService } from '@ngneat/spectator/vitest'; +import { of, Subject, throwError } from 'rxjs'; +import { HttpClient } from '@angular/common/http'; +import { UILocalizationService } from '../services/ui-localization.service'; +import { LocalizationService } from '../services/localization.service'; +import { SessionStateService } from '../services/session-state.service'; +import { CORE_OPTIONS } from '../tokens/options.token'; + +describe('UILocalizationService', () => { + let spectator: SpectatorService; + let service: UILocalizationService; + let language$: Subject; + let httpGet: ReturnType; + let addLocalizationSpy: ReturnType; + + const createService = createServiceFactory({ + service: UILocalizationService, + mocks: [HttpClient, LocalizationService], + providers: [ + { + provide: SessionStateService, + useFactory: () => { + let currentLanguage = 'en'; + language$ = new Subject(); + language$.subscribe(lang => { + currentLanguage = lang; + }); + return { + getLanguage: vi.fn(() => currentLanguage), + getLanguage$: vi.fn(() => language$.asObservable()), + }; + }, + }, + { + provide: CORE_OPTIONS, + useValue: { + uiLocalization: { + enabled: true, + basePath: '/assets/localization', + }, + }, + }, + ], + }); + + beforeEach(() => { + spectator = createService(); + service = spectator.service; + const http = spectator.inject(HttpClient); + const localizationService = spectator.inject(LocalizationService); + httpGet = vi.fn(); + (http as any).get = httpGet; + addLocalizationSpy = vi.fn(); + (localizationService as any).addLocalization = addLocalizationSpy; + }); + + describe('when uiLocalization is enabled', () => { + it('should load localization file when language changes', () => { + const uiData = { MyApp: { Welcome: 'Welcome from UI' } }; + httpGet.mockReturnValue(of(uiData)); + + language$.next('en'); + + expect(httpGet).toHaveBeenCalledWith('/assets/localization/en.json'); + expect(addLocalizationSpy).toHaveBeenCalledWith([ + { + culture: 'en', + resources: [{ resourceName: 'MyApp', texts: { Welcome: 'Welcome from UI' } }], + }, + ]); + }); + + it('should use default basePath when not provided', () => { + expect(httpGet).not.toHaveBeenCalled(); + httpGet.mockReturnValue(of({})); + language$.next('en'); + expect(httpGet).toHaveBeenCalledWith('/assets/localization/en.json'); + }); + + it('should not call addLocalization when file is missing (HTTP error)', () => { + httpGet.mockReturnValue(throwError(() => new Error('404'))); + + language$.next('fr'); + + expect(httpGet).toHaveBeenCalledWith('/assets/localization/fr.json'); + expect(addLocalizationSpy).not.toHaveBeenCalled(); + }); + + it('should cache loaded data in getLoadedLocalizations', () => { + const uiData = { AbpAccount: { Login: 'Sign In (UI)' } }; + httpGet.mockReturnValue(of(uiData)); + + language$.next('en'); + + const loaded = service.getLoadedLocalizations('en'); + expect(loaded).toEqual(uiData); + }); + + it('should load again when language changes to another culture', () => { + httpGet.mockReturnValue(of({})); + language$.next('en'); + expect(httpGet).toHaveBeenCalledTimes(1); + + httpGet.mockClear(); + httpGet.mockReturnValue(of({ MyApp: { Title: 'Titre' } })); + language$.next('fr'); + + expect(httpGet).toHaveBeenCalledWith('/assets/localization/fr.json'); + expect(addLocalizationSpy).toHaveBeenCalledWith([ + { + culture: 'fr', + resources: [{ resourceName: 'MyApp', texts: { Title: 'Titre' } }], + }, + ]); + }); + }); + + describe('addAngularLocalizeLocalization', () => { + it('should add localization via LocalizationService (UI data in merge pipeline)', () => { + service.addAngularLocalizeLocalization('en', 'MyApp', { + CustomKey: 'UI Override', + }); + + expect(addLocalizationSpy).toHaveBeenCalledWith([ + { + culture: 'en', + resources: [ + { + resourceName: 'MyApp', + texts: { CustomKey: 'UI Override' }, + }, + ], + }, + ]); + }); + + it('should merge into getLoadedLocalizations cache', () => { + service.addAngularLocalizeLocalization('en', 'MyApp', { Key1: 'Val1' }); + service.addAngularLocalizeLocalization('en', 'MyApp', { Key2: 'Val2' }); + + const loaded = service.getLoadedLocalizations('en'); + expect(loaded.MyApp).toEqual({ Key1: 'Val1', Key2: 'Val2' }); + }); + }); + + describe('getLoadedLocalizations', () => { + it('should return empty object when no culture loaded', () => { + expect(service.getLoadedLocalizations('de')).toEqual({}); + }); + + it('should return current language when culture not passed', () => { + const uiData = { R: { K: 'V' } }; + httpGet.mockReturnValue(of(uiData)); + language$.next('tr'); + + const loaded = service.getLoadedLocalizations(); + expect(loaded).toEqual(uiData); + }); + }); +}); diff --git a/npm/ng-packs/packages/core/src/lib/utils/environment-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/environment-utils.ts index 8db9b5e02f..ae11ef002a 100644 --- a/npm/ng-packs/packages/core/src/lib/utils/environment-utils.ts +++ b/npm/ng-packs/packages/core/src/lib/utils/environment-utils.ts @@ -1,10 +1,9 @@ import { HttpClient } from '@angular/common/http'; -import { Injector } from '@angular/core'; +import { Injector, isDevMode } from '@angular/core'; import { of } from 'rxjs'; import { catchError, tap } from 'rxjs/operators'; import { Environment, RemoteEnv } from '../models/environment'; import { EnvironmentService } from '../services/environment.service'; -import { HttpErrorReporterService } from '../services/http-error-reporter.service'; import { deepMerge } from './object-utils'; export function getRemoteEnv(injector: Injector, environment: Partial) { @@ -15,15 +14,20 @@ export function getRemoteEnv(injector: Injector, environment: Partial(method, url, { headers }) .pipe( catchError(err => { - httpErrorReporter.reportError(err); + if (isDevMode()) { + console.warn( + `[ABP Environment] Failed to fetch remote environment from "${url}". ` + + `Error: ${err.message || err}\n` + + `See https://abp.io/docs/latest/framework/ui/angular/environment#example-remoteenv-configuration for configuration details.`, + ); + } return of(null); - }), // TODO: Consider get handle function from a provider + }), tap(env => environmentService.setState( mergeEnvironments(environment, env || ({} as Environment), remoteEnv as RemoteEnv), diff --git a/npm/ng-packs/packages/feature-management/package.json b/npm/ng-packs/packages/feature-management/package.json index 1b847655e7..538ac318ac 100644 --- a/npm/ng-packs/packages/feature-management/package.json +++ b/npm/ng-packs/packages/feature-management/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.feature-management", - "version": "10.1.0-rc.2", + "version": "10.1.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~10.1.0-rc.2", + "@abp/ng.theme.shared": "~10.1.0", "tslib": "^2.0.0" }, "peerDependencies": { diff --git a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html index f59a66b6a5..bd08cbb7b7 100644 --- a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html +++ b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html @@ -3,8 +3,8 @@

{{ 'AbpFeatureManagement::Features' | abpLocalization }} - @if (providerTitle) { - - {{ providerTitle }} + @if (providerTitle()) { + - {{ providerTitle() }} }

@@ -38,7 +38,7 @@ @for (feature of features[group.name]; track feature.id || i; let i = $index) { @let provider = feature.provider.name; @let isFeatureDisabled = !feature.parentName ? isParentDisabled(feature.name, group.name, provider) : - (provider !== providerName && provider !== defaultProviderName); + (provider !== providerName() && provider !== defaultProviderName);
@switch (feature.valueType?.name) { diff --git a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts index 5feac210e5..0ba6880036 100644 --- a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts +++ b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, Output, inject, DOCUMENT } from '@angular/core'; +import { Component, inject, DOCUMENT, input, output, signal, effect } from '@angular/core'; import { NgTemplateOutlet } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { ConfigStateService, LocalizationPipe, TrackByService } from '@abp/ng.core'; @@ -20,7 +20,6 @@ import { import { Tabs, TabList, Tab, TabPanel, TabContent } from '@angular/aria/tabs'; import { finalize } from 'rxjs/operators'; import { FreeTextInputDirective } from '../../directives'; -import { FeatureManagement } from '../../models'; enum ValueTypes { ToggleStringValueType = 'ToggleStringValueType', @@ -49,11 +48,7 @@ const DEFAULT_PROVIDER_NAME = 'D'; ModalCloseDirective, ], }) -export class FeatureManagementComponent - implements - FeatureManagement.FeatureManagementComponentInputs, - FeatureManagement.FeatureManagementComponentOutputs -{ +export class FeatureManagementComponent { protected readonly track = inject(TrackByService); protected readonly toasterService = inject(ToasterService); protected readonly service = inject(FeaturesService); @@ -61,14 +56,17 @@ export class FeatureManagementComponent protected readonly confirmationService = inject(ConfirmationService); private document = inject(DOCUMENT); - @Input() - providerKey: string; + // Signal inputs + readonly providerKey = input(undefined); + readonly providerName = input(undefined); + readonly providerTitle = input(undefined); + readonly visibleInput = input(false, { alias: 'visible' }); - @Input() - providerName: string; + // Output signals + readonly visibleChange = output(); - @Input({ required: false }) - providerTitle: string; + // Internal state + protected readonly _visible = signal(false); selectedGroupDisplayName: string; @@ -82,33 +80,41 @@ export class FeatureManagementComponent defaultProviderName = DEFAULT_PROVIDER_NAME; - protected _visible; + modalBusy = false; - @Input() + // Getter/setter for backward compatibility get visible(): boolean { - return this._visible; + return this._visible(); } set visible(value: boolean) { - if (this._visible === value) { + if (this._visible() === value) { return; } - this._visible = value; + this._visible.set(value); this.visibleChange.emit(value); if (value) { this.openModal(); - return; } } - @Output() readonly visibleChange = new EventEmitter(); - - modalBusy = false; + constructor() { + // Sync visible input to internal signal + effect(() => { + const inputValue = this.visibleInput(); + if (this._visible() !== inputValue) { + this._visible.set(inputValue); + if (inputValue) { + this.openModal(); + } + } + }); + } openModal() { - if (!this.providerName) { + if (!this.providerName()) { throw new Error('providerName is required.'); } @@ -116,7 +122,7 @@ export class FeatureManagementComponent } getFeatures() { - this.service.get(this.providerName, this.providerKey).subscribe(res => { + this.service.get(this.providerName()!, this.providerKey()).subscribe(res => { if (!res.groups?.length) return; this.groups = res.groups.map(({ name, displayName }) => ({ name, displayName })); this.selectedGroupDisplayName = this.groups[0].displayName; @@ -149,13 +155,13 @@ export class FeatureManagementComponent this.modalBusy = true; this.service - .update(this.providerName, this.providerKey, { features: changedFeatures }) + .update(this.providerName()!, this.providerKey(), { features: changedFeatures }) .pipe(finalize(() => (this.modalBusy = false))) .subscribe(() => { this.visible = false; this.toasterService.success('AbpUi::SavedSuccessfully'); - if (!this.providerKey) { + if (!this.providerKey()) { // to refresh host's features this.configState.refreshAppState().subscribe(); } @@ -167,11 +173,11 @@ export class FeatureManagementComponent .warn('AbpFeatureManagement::AreYouSureToResetToDefault', 'AbpFeatureManagement::AreYouSure') .subscribe((status: Confirmation.Status) => { if (status === Confirmation.Status.confirm) { - this.service.delete(this.providerName, this.providerKey).subscribe(() => { + this.service.delete(this.providerName()!, this.providerKey()).subscribe(() => { this.toasterService.success('AbpFeatureManagement::ResetedToDefault'); this.visible = false; - if (!this.providerKey) { + if (!this.providerKey()) { // to refresh host's features this.configState.refreshAppState().subscribe(); } @@ -190,17 +196,18 @@ export class FeatureManagementComponent isParentDisabled(parentName: string, groupName: string, provider: string): boolean { const children = this.features[groupName]?.filter(f => f.parentName === parentName); + const providerNameValue = this.providerName(); if (children?.length) { return children.some(child => { const childProvider = child.provider?.name; return ( - (childProvider !== this.providerName && childProvider !== this.defaultProviderName) || - (provider !== this.providerName && provider !== this.defaultProviderName) + (childProvider !== providerNameValue && childProvider !== this.defaultProviderName) || + (provider !== providerNameValue && provider !== this.defaultProviderName) ); }); } else { - return provider !== this.providerName && provider !== this.defaultProviderName; + return provider !== providerNameValue && provider !== this.defaultProviderName; } } diff --git a/npm/ng-packs/packages/feature-management/src/lib/directives/free-text-input.directive.ts b/npm/ng-packs/packages/feature-management/src/lib/directives/free-text-input.directive.ts index 6b6556dcfa..b341879995 100644 --- a/npm/ng-packs/packages/feature-management/src/lib/directives/free-text-input.directive.ts +++ b/npm/ng-packs/packages/feature-management/src/lib/directives/free-text-input.directive.ts @@ -1,4 +1,4 @@ -import { Directive, HostBinding, Input } from '@angular/core'; +import { Directive, effect, inject, input, ElementRef, Renderer2 } from '@angular/core'; // TODO: improve this type export interface FreeTextType { @@ -9,7 +9,7 @@ export interface FreeTextType { }; } -export const INPUT_TYPES = { +export const INPUT_TYPES: Record = { numeric: 'number', default: 'text', }; @@ -19,21 +19,25 @@ export const INPUT_TYPES = { exportAs: 'inputAbpFeatureManagementFreeText', }) export class FreeTextInputDirective { - _feature: FreeTextType; - // eslint-disable-next-line @angular-eslint/no-input-rename - @Input('abpFeatureManagementFreeText') set feature(val: FreeTextType) { - this._feature = val; - this.setInputType(); - } + private readonly elRef = inject(ElementRef); + private readonly renderer = inject(Renderer2); - get feature() { - return this._feature; - } + readonly feature = input(undefined, { + alias: 'abpFeatureManagementFreeText', + }); - @HostBinding('type') type: string; + constructor() { + effect(() => { + const feature = this.feature(); + if (feature) { + this.setInputType(feature); + } + }); + } - private setInputType() { - const validatorType = this.feature?.valueType?.validator?.name.toLowerCase(); - this.type = INPUT_TYPES[validatorType] ?? INPUT_TYPES.default; + private setInputType(feature: FreeTextType) { + const validatorType = feature?.valueType?.validator?.name?.toLowerCase(); + const type = INPUT_TYPES[validatorType] ?? INPUT_TYPES['default']; + this.renderer.setAttribute(this.elRef.nativeElement, 'type', type); } } diff --git a/npm/ng-packs/packages/feature-management/src/lib/models/feature-management.ts b/npm/ng-packs/packages/feature-management/src/lib/models/feature-management.ts index c04d917515..6337eea163 100644 --- a/npm/ng-packs/packages/feature-management/src/lib/models/feature-management.ts +++ b/npm/ng-packs/packages/feature-management/src/lib/models/feature-management.ts @@ -1,4 +1,4 @@ -import { EventEmitter } from '@angular/core'; +import { EventEmitter, OutputEmitterRef } from '@angular/core'; export namespace FeatureManagement { export interface FeatureManagementComponentInputs { @@ -8,6 +8,6 @@ export namespace FeatureManagement { } export interface FeatureManagementComponentOutputs { - readonly visibleChange: EventEmitter; + readonly visibleChange: EventEmitter | OutputEmitterRef; } } diff --git a/npm/ng-packs/packages/generators/package.json b/npm/ng-packs/packages/generators/package.json index ff1932f9e0..a06715fea8 100644 --- a/npm/ng-packs/packages/generators/package.json +++ b/npm/ng-packs/packages/generators/package.json @@ -1,6 +1,6 @@ { "name": "@abp/nx.generators", - "version": "10.1.0-rc.2", + "version": "10.1.0", "homepage": "https://abp.io", "generators": "./generators.json", "type": "commonjs", diff --git a/npm/ng-packs/packages/identity/package.json b/npm/ng-packs/packages/identity/package.json index 140c739280..f8a3559de5 100644 --- a/npm/ng-packs/packages/identity/package.json +++ b/npm/ng-packs/packages/identity/package.json @@ -1,15 +1,15 @@ { "name": "@abp/ng.identity", - "version": "10.1.0-rc.2", + "version": "10.1.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.components": "~10.1.0-rc.2", - "@abp/ng.permission-management": "~10.1.0-rc.2", - "@abp/ng.theme.shared": "~10.1.0-rc.2", + "@abp/ng.components": "~10.1.0", + "@abp/ng.permission-management": "~10.1.0", + "@abp/ng.theme.shared": "~10.1.0", "tslib": "^2.0.0" }, "peerDependencies": { diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts index 7ff04cf679..ada580059d 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts +++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts @@ -39,7 +39,7 @@ import { OnInit, TemplateRef, TrackByFunction, - ViewChild, + viewChild } from '@angular/core'; import { AbstractControl, @@ -99,8 +99,7 @@ export class UsersComponent implements OnInit { data: PagedResultDto = { items: [], totalCount: 0 }; - @ViewChild('modalContent', { static: false }) - modalContent!: TemplateRef; + readonly modalContent = viewChild.required>('modalContent'); form!: UntypedFormGroup; diff --git a/npm/ng-packs/packages/oauth/package.json b/npm/ng-packs/packages/oauth/package.json index 98bc02a772..4842c8b547 100644 --- a/npm/ng-packs/packages/oauth/package.json +++ b/npm/ng-packs/packages/oauth/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.oauth", - "version": "10.1.0-rc.2", + "version": "10.1.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.core": "~10.1.0-rc.2", - "@abp/utils": "~10.1.0-rc.2", + "@abp/ng.core": "~10.1.0", + "@abp/utils": "~10.1.0", "angular-oauth2-oidc": "^20.0.0", "just-clone": "^6.0.0", "just-compare": "^2.0.0", diff --git a/npm/ng-packs/packages/permission-management/package.json b/npm/ng-packs/packages/permission-management/package.json index 3eb2efbfda..930eec339b 100644 --- a/npm/ng-packs/packages/permission-management/package.json +++ b/npm/ng-packs/packages/permission-management/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.permission-management", - "version": "10.1.0-rc.2", + "version": "10.1.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~10.1.0-rc.2", + "@abp/ng.theme.shared": "~10.1.0", "tslib": "^2.0.0" }, "peerDependencies": { diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html index 0224f3d45a..3190d5216c 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html +++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html @@ -1,9 +1,9 @@ - @if (data.entityDisplayName || entityDisplayName) { + @if (data.entityDisplayName || entityDisplayName()) {

{{ 'AbpPermissionManagement::Permissions' | abpLocalization }} - - {{ entityDisplayName || data.entityDisplayName }} + {{ entityDisplayName() || data.entityDisplayName }}

diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts index b2612e9aaf..26b9a49349 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts +++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts @@ -15,21 +15,23 @@ import { UpdatePermissionDto, } from '@abp/ng.permission-management/proxy'; import { + afterNextRender, Component, computed, DOCUMENT, + effect, ElementRef, - EventEmitter, inject, - Input, - Output, - QueryList, + Injector, + input, + output, signal, TrackByFunction, - ViewChildren, + untracked, + viewChildren, } from '@angular/core'; -import { concat, of } from 'rxjs'; -import { finalize, switchMap, take, tap } from 'rxjs/operators'; +import { of } from 'rxjs'; +import { finalize, switchMap, tap } from 'rxjs/operators'; import { PermissionManagement } from '../models'; import { FormsModule } from '@angular/forms'; @@ -108,64 +110,53 @@ type PermissionWithGroupName = PermissionGrantInfoDto & { TabContent, ], }) -export class PermissionManagementComponent - implements - PermissionManagement.PermissionManagementComponentInputs, - PermissionManagement.PermissionManagementComponentOutputs -{ +export class PermissionManagementComponent { protected readonly service = inject(PermissionsService); protected readonly configState = inject(ConfigStateService); protected readonly toasterService = inject(ToasterService); + private readonly injector = inject(Injector); private document = inject(DOCUMENT); - @Input() - readonly providerName!: string; - @Input() - readonly providerKey!: string; + readonly providerNameInput = input('', { alias: 'providerName' }); + readonly providerKeyInput = input('', { alias: 'providerKey' }); + readonly hideBadgesInput = input(false, { alias: 'hideBadges' }); + readonly entityDisplayName = input(undefined); + readonly visibleInput = input(false, { alias: 'visible' }); - @Input() - readonly hideBadges = false; + // Output signals + readonly visibleChange = output(); - protected _visible = false; + // Internal state + protected readonly _visible = signal(false); - @Input() - entityDisplayName: string | undefined; - - @Input() - get visible(): boolean { - return this._visible; + // Backward-compatible getters/setters for ReplaceableTemplateDirective. + private _providerNameOverride?: string; + get providerName(): string { + return this._providerNameOverride ?? this.providerNameInput(); + } + set providerName(value: string) { + this._providerNameOverride = value; } - set visible(value: boolean) { - if (value === this._visible) { - return; - } - - if (value) { - this.openModal().subscribe(() => { - this._visible = true; - this.visibleChange.emit(true); - concat(this.selectAllInAllTabsRef.changes, this.selectAllInThisTabsRef.changes) - .pipe(take(1)) - .subscribe(() => { - this.initModal(); - }); - }); - } else { - this.setSelectedGroup(null); - this._visible = false; - this.visibleChange.emit(false); - this.filter.set(''); - } + private _providerKeyOverride?: string; + get providerKey(): string { + return this._providerKeyOverride ?? this.providerKeyInput(); + } + set providerKey(value: string) { + this._providerKeyOverride = value; } - @Output() readonly visibleChange = new EventEmitter(); + private _hideBadgesOverride?: boolean; + get hideBadges(): boolean { + return this._hideBadgesOverride ?? this.hideBadgesInput(); + } + set hideBadges(value: boolean) { + this._hideBadgesOverride = value; + } - @ViewChildren('selectAllInThisTabsRef') - selectAllInThisTabsRef!: QueryList>; - @ViewChildren('selectAllInAllTabsRef') - selectAllInAllTabsRef!: QueryList>; + selectAllInThisTabsRef = viewChildren>('selectAllInThisTabsRef'); + selectAllInAllTabsRef = viewChildren>('selectAllInAllTabsRef'); data: GetPermissionListResultDto = { groups: [], entityDisplayName: '' }; @@ -216,6 +207,54 @@ export class PermissionManagementComponent trackByFn: TrackByFunction = (_, item) => item.name; + // Getter/setter for visible - used by ReplaceableTemplateDirective and internal code + get visible(): boolean { + return this._visible(); + } + + set visible(value: boolean) { + if (value === this._visible()) { + return; + } + + if (value) { + this.openModal().subscribe(() => { + this._visible.set(true); + this.visibleChange.emit(true); + afterNextRender(() => { + this.initModal(); + }, { injector: this.injector }); + }); + } else { + this.setSelectedGroup(null); + this._visible.set(false); + this.visibleChange.emit(false); + this.filter.set(''); + } + } + + constructor() { + effect(() => { + const inputValue = this.visibleInput(); + untracked(() => { + if (this._visible() !== inputValue) { + if (inputValue) { + this.openModal().subscribe(() => { + this._visible.set(true); + afterNextRender(() => { + this.initModal(); + }, { injector: this.injector }); + }); + } else { + this.setSelectedGroup(null); + this._visible.set(false); + this.filter.set(''); + } + } + }); + }); + } + getChecked(name: string) { return (this.permissions.find(per => per.name === name) || { isGranted: false }).isGranted; } @@ -347,8 +386,9 @@ export class PermissionManagementComponent } setTabCheckboxState() { + const providerName = this.providerName; const selectablePermissions = this.selectedGroupPermissions.filter(per => - per.grantedProviders.every(p => p.providerName === this.providerName), + per.grantedProviders.every(p => p.providerName === providerName), ); const selectedPermissions = selectablePermissions.filter(per => per.isGranted); @@ -369,8 +409,9 @@ export class PermissionManagementComponent } setGrantCheckboxState() { + const providerName = this.providerName; const selectablePermissions = this.permissions.filter(per => - per.grantedProviders.every(p => p.providerName === this.providerName), + per.grantedProviders.every(p => p.providerName === providerName), ); const selectedAllPermissions = selectablePermissions.filter(per => per.isGranted); const checkboxElement = this.document.querySelector('#select-all-in-all-tabs') as any; @@ -470,11 +511,14 @@ export class PermissionManagementComponent } openModal() { - if (!this.providerKey || !this.providerName) { + const providerName = this.providerName; + const providerKey = this.providerKey; + + if (!providerKey || !providerName) { throw new Error('Provider Key and Provider Name are required.'); } - return this.service.get(this.providerName, this.providerKey).pipe( + return this.service.get(providerName, providerKey).pipe( tap((permissionRes: GetPermissionListResultDto) => { const { groups } = permissionRes || {}; @@ -486,7 +530,7 @@ export class PermissionManagementComponent this.disabledSelectAllInAllTabs = this.permissions.every( per => per.isGranted && - per.grantedProviders.every(provider => provider.providerName !== this.providerName), + per.grantedProviders.every(provider => provider.providerName !== providerName), ); }), ); @@ -510,10 +554,12 @@ export class PermissionManagementComponent shouldFetchAppConfig() { const currentUser = this.configState.getOne('currentUser') as CurrentUserDto; + const providerName = this.providerName; + const providerKey = this.providerKey; - if (this.providerName === 'R') return currentUser.roles.some(role => role === this.providerKey); + if (providerName === 'R') return currentUser.roles.some(role => role === providerKey); - if (this.providerName === 'U') return currentUser.id === this.providerKey; + if (providerName === 'U') return currentUser.id === providerKey; return false; } diff --git a/npm/ng-packs/packages/permission-management/src/lib/models/permission-management.ts b/npm/ng-packs/packages/permission-management/src/lib/models/permission-management.ts index 7909de0db9..58d7d95232 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/models/permission-management.ts +++ b/npm/ng-packs/packages/permission-management/src/lib/models/permission-management.ts @@ -1,5 +1,5 @@ import { GetPermissionListResultDto } from '@abp/ng.permission-management/proxy'; -import { EventEmitter } from '@angular/core'; +import { EventEmitter, OutputEmitterRef } from '@angular/core'; export namespace PermissionManagement { export interface State { @@ -14,6 +14,6 @@ export namespace PermissionManagement { } export interface PermissionManagementComponentOutputs { - readonly visibleChange: EventEmitter; + readonly visibleChange: EventEmitter | OutputEmitterRef; } } diff --git a/npm/ng-packs/packages/schematics/package.json b/npm/ng-packs/packages/schematics/package.json index 199be73f20..e92fe7605c 100644 --- a/npm/ng-packs/packages/schematics/package.json +++ b/npm/ng-packs/packages/schematics/package.json @@ -1,6 +1,6 @@ { "name": "@abp/ng.schematics", - "version": "10.1.0-rc.2", + "version": "10.1.0", "author": "", "schematics": "./collection.json", "dependencies": { diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package-standalone/__libraryName@kebab__/karma.conf.js.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package-standalone/__libraryName@kebab__/karma.conf.js.template deleted file mode 100644 index e181d4088d..0000000000 --- a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package-standalone/__libraryName@kebab__/karma.conf.js.template +++ /dev/null @@ -1,44 +0,0 @@ -// Karma configuration file, see link for more information -// https://karma-runner.github.io/1.0/config/configuration-file.html - -module.exports = function (config) { - config.set({ - basePath: '', - frameworks: ['jasmine', '@angular-devkit/build-angular'], - plugins: [ - require('karma-jasmine'), - require('karma-chrome-launcher'), - require('karma-jasmine-html-reporter'), - require('karma-coverage'), - require('@angular-devkit/build-angular/plugins/karma') - ], - client: { - jasmine: { - // you can add configuration options for Jasmine here - // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html - // for example, you can disable the random execution with `random: false` - // or set a specific seed with `seed: 4321` - }, - clearContext: false // leave Jasmine Spec Runner output visible in browser - }, - jasmineHtmlReporter: { - suppressAll: true // removes the duplicated traces - }, - coverageReporter: { - dir: require('path').join(__dirname, '../../coverage/<%= kebab(libraryName) %>'), - subdir: '.', - reporters: [ - { type: 'html' }, - { type: 'text-summary' } - ] - }, - reporters: ['progress', 'kjhtml'], - port: 9876, - colors: true, - logLevel: config.LOG_INFO, - autoWatch: true, - browsers: ['Chrome'], - singleRun: false, - restartOnFileChange: true - }); -}; diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package-standalone/__libraryName@kebab__/src/test-setup.ts.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package-standalone/__libraryName@kebab__/src/test-setup.ts.template new file mode 100644 index 0000000000..699d1a1d5e --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package-standalone/__libraryName@kebab__/src/test-setup.ts.template @@ -0,0 +1,7 @@ +import 'zone.js'; +import 'zone.js/testing'; +import { getTestBed } from '@angular/core/testing'; +import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing'; + +// Initialize Angular testing environment +getTestBed().initTestEnvironment(BrowserTestingModule, platformBrowserTesting()); diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package-standalone/__libraryName@kebab__/src/test.ts.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package-standalone/__libraryName@kebab__/src/test.ts.template deleted file mode 100644 index 52e55168eb..0000000000 --- a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package-standalone/__libraryName@kebab__/src/test.ts.template +++ /dev/null @@ -1,26 +0,0 @@ -// This file is required by karma.conf.js and loads recursively all the .spec and framework files - -import 'zone.js'; -import 'zone.js/testing'; -import { getTestBed } from '@angular/core/testing'; -import { - BrowserDynamicTestingModule, - platformBrowserDynamicTesting -} from '@angular/platform-browser-dynamic/testing'; - -declare const require: { - context(path: string, deep?: boolean, filter?: RegExp): { - keys(): string[]; - (id: string): T; - }; -}; - -// First, initialize the Angular testing environment. -getTestBed().initTestEnvironment( - BrowserDynamicTestingModule, - platformBrowserDynamicTesting() -); -// Then we find all the tests. -const context = require.context('./', true, /\.spec\.ts$/); -// And load the modules. -context.keys().map(context); diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package-standalone/__libraryName@kebab__/tsconfig.lib.json.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package-standalone/__libraryName@kebab__/tsconfig.lib.json.template index 7b5ac72780..65831c6293 100644 --- a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package-standalone/__libraryName@kebab__/tsconfig.lib.json.template +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package-standalone/__libraryName@kebab__/tsconfig.lib.json.template @@ -14,7 +14,7 @@ ] }, "exclude": [ - "src/test.ts", + "src/test-setup.ts", "**/*.spec.ts" ] } diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package-standalone/__libraryName@kebab__/tsconfig.spec.json.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package-standalone/__libraryName@kebab__/tsconfig.spec.json.template index 715dd0a5d2..610066df66 100644 --- a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package-standalone/__libraryName@kebab__/tsconfig.spec.json.template +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package-standalone/__libraryName@kebab__/tsconfig.spec.json.template @@ -3,15 +3,7 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "../../out-tsc/spec", - "types": [ - "jasmine" - ] + "types": ["vitest/globals"] }, - "files": [ - "src/test.ts" - ], - "include": [ - "**/*.spec.ts", - "**/*.d.ts" - ] + "include": ["**/*.spec.ts", "**/*.d.ts"] } diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/karma.conf.js.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/karma.conf.js.template deleted file mode 100644 index e181d4088d..0000000000 --- a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/karma.conf.js.template +++ /dev/null @@ -1,44 +0,0 @@ -// Karma configuration file, see link for more information -// https://karma-runner.github.io/1.0/config/configuration-file.html - -module.exports = function (config) { - config.set({ - basePath: '', - frameworks: ['jasmine', '@angular-devkit/build-angular'], - plugins: [ - require('karma-jasmine'), - require('karma-chrome-launcher'), - require('karma-jasmine-html-reporter'), - require('karma-coverage'), - require('@angular-devkit/build-angular/plugins/karma') - ], - client: { - jasmine: { - // you can add configuration options for Jasmine here - // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html - // for example, you can disable the random execution with `random: false` - // or set a specific seed with `seed: 4321` - }, - clearContext: false // leave Jasmine Spec Runner output visible in browser - }, - jasmineHtmlReporter: { - suppressAll: true // removes the duplicated traces - }, - coverageReporter: { - dir: require('path').join(__dirname, '../../coverage/<%= kebab(libraryName) %>'), - subdir: '.', - reporters: [ - { type: 'html' }, - { type: 'text-summary' } - ] - }, - reporters: ['progress', 'kjhtml'], - port: 9876, - colors: true, - logLevel: config.LOG_INFO, - autoWatch: true, - browsers: ['Chrome'], - singleRun: false, - restartOnFileChange: true - }); -}; diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/test-setup.ts.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/test-setup.ts.template new file mode 100644 index 0000000000..699d1a1d5e --- /dev/null +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/test-setup.ts.template @@ -0,0 +1,7 @@ +import 'zone.js'; +import 'zone.js/testing'; +import { getTestBed } from '@angular/core/testing'; +import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing'; + +// Initialize Angular testing environment +getTestBed().initTestEnvironment(BrowserTestingModule, platformBrowserTesting()); diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/test.ts.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/test.ts.template deleted file mode 100644 index 52e55168eb..0000000000 --- a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/src/test.ts.template +++ /dev/null @@ -1,26 +0,0 @@ -// This file is required by karma.conf.js and loads recursively all the .spec and framework files - -import 'zone.js'; -import 'zone.js/testing'; -import { getTestBed } from '@angular/core/testing'; -import { - BrowserDynamicTestingModule, - platformBrowserDynamicTesting -} from '@angular/platform-browser-dynamic/testing'; - -declare const require: { - context(path: string, deep?: boolean, filter?: RegExp): { - keys(): string[]; - (id: string): T; - }; -}; - -// First, initialize the Angular testing environment. -getTestBed().initTestEnvironment( - BrowserDynamicTestingModule, - platformBrowserDynamicTesting() -); -// Then we find all the tests. -const context = require.context('./', true, /\.spec\.ts$/); -// And load the modules. -context.keys().map(context); diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.lib.json.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.lib.json.template index 7b5ac72780..65831c6293 100644 --- a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.lib.json.template +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.lib.json.template @@ -14,7 +14,7 @@ ] }, "exclude": [ - "src/test.ts", + "src/test-setup.ts", "**/*.spec.ts" ] } diff --git a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.spec.json.template b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.spec.json.template index 715dd0a5d2..610066df66 100644 --- a/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.spec.json.template +++ b/npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.spec.json.template @@ -3,15 +3,7 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "../../out-tsc/spec", - "types": [ - "jasmine" - ] + "types": ["vitest/globals"] }, - "files": [ - "src/test.ts" - ], - "include": [ - "**/*.spec.ts", - "**/*.d.ts" - ] + "include": ["**/*.spec.ts", "**/*.d.ts"] } diff --git a/npm/ng-packs/packages/schematics/src/utils/angular-schematic/generate-lib.ts b/npm/ng-packs/packages/schematics/src/utils/angular-schematic/generate-lib.ts index f96b2b38ea..6980d08339 100644 --- a/npm/ng-packs/packages/schematics/src/utils/angular-schematic/generate-lib.ts +++ b/npm/ng-packs/packages/schematics/src/utils/angular-schematic/generate-lib.ts @@ -39,11 +39,11 @@ export function addLibToWorkspaceFile(projectRoot: string, projectName: string): }, }, test: { - builder: Builders.Karma, + builder: Builders.UnitTest, options: { - main: `${projectRoot}/src/test.ts`, tsConfig: `${projectRoot}/tsconfig.spec.json`, - karmaConfig: `${projectRoot}/karma.conf.js`, + buildTarget: `${projectName}:build`, + runner: 'vitest', }, }, }, diff --git a/npm/ng-packs/packages/schematics/src/utils/angular/workspace-models.ts b/npm/ng-packs/packages/schematics/src/utils/angular/workspace-models.ts index 34c329b470..84a53e2bbc 100644 --- a/npm/ng-packs/packages/schematics/src/utils/angular/workspace-models.ts +++ b/npm/ng-packs/packages/schematics/src/utils/angular/workspace-models.ts @@ -36,6 +36,7 @@ export enum Builders { BuildExtractI18n = '@angular/build:extract-i18n', Protractor = '@angular-devkit/build-angular:private-protractor', BuildApplication = '@angular/build:application', + UnitTest = '@angular/build:unit-test', } export interface FileReplacements { diff --git a/npm/ng-packs/packages/setting-management/package.json b/npm/ng-packs/packages/setting-management/package.json index b182196ce9..e5b18c4b2e 100644 --- a/npm/ng-packs/packages/setting-management/package.json +++ b/npm/ng-packs/packages/setting-management/package.json @@ -1,18 +1,18 @@ { "name": "@abp/ng.setting-management", - "version": "10.1.0-rc.2", + "version": "10.1.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.components": "~10.1.0-rc.2", - "@abp/ng.theme.shared": "~10.1.0-rc.2", + "@abp/ng.components": "~10.1.0", + "@abp/ng.theme.shared": "~10.1.0", "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/aria": "~21.1.0" + "@angular/aria": "~21.0.0" }, "publishConfig": { "access": "public" diff --git a/npm/ng-packs/packages/tenant-management/package.json b/npm/ng-packs/packages/tenant-management/package.json index 1ced045022..cb3e1d90a2 100644 --- a/npm/ng-packs/packages/tenant-management/package.json +++ b/npm/ng-packs/packages/tenant-management/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.tenant-management", - "version": "10.1.0-rc.2", + "version": "10.1.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.feature-management": "~10.1.0-rc.2", - "@abp/ng.theme.shared": "~10.1.0-rc.2", + "@abp/ng.feature-management": "~10.1.0", + "@abp/ng.theme.shared": "~10.1.0", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/theme-basic/package.json b/npm/ng-packs/packages/theme-basic/package.json index e6e08aa95f..766690a8b1 100644 --- a/npm/ng-packs/packages/theme-basic/package.json +++ b/npm/ng-packs/packages/theme-basic/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.theme.basic", - "version": "10.1.0-rc.2", + "version": "10.1.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.account.core": "~10.1.0-rc.2", - "@abp/ng.theme.shared": "~10.1.0-rc.2", + "@abp/ng.account.core": "~10.1.0", + "@abp/ng.theme.shared": "~10.1.0", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html index a29fb3323e..afc498d5ac 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html +++ b/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.html @@ -30,7 +30,7 @@
+ [class.d-block]="smallScreen() && rootDropdownExpand[route.name]">
@@ -60,7 +60,7 @@
+ [class.d-block]="smallScreen() && dropdownSubmenu.isOpen()">
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.ts index a6afd37b12..8ec0681e52 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.ts +++ b/npm/ng-packs/packages/theme-basic/src/lib/components/routes/routes.component.ts @@ -10,11 +10,10 @@ import { Component, ElementRef, inject, - Input, - QueryList, Renderer2, TrackByFunction, - ViewChildren, + input, + viewChildren } from '@angular/core'; import { NgTemplateOutlet, AsyncPipe } from '@angular/common'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; @@ -39,9 +38,9 @@ export class RoutesComponent { public readonly routesService = inject(RoutesService); protected renderer = inject(Renderer2); - @Input() smallScreen?: boolean; + readonly smallScreen = input(undefined); - @ViewChildren('childrenContainer') childrenContainers!: QueryList>; + readonly childrenContainers = viewChildren>('childrenContainer'); rootDropdownExpand = {} as { [key: string]: boolean }; @@ -52,7 +51,7 @@ export class RoutesComponent { } closeDropdown() { - this.childrenContainers.forEach(({ nativeElement }) => { + this.childrenContainers().forEach(({ nativeElement }) => { this.renderer.addClass(nativeElement, 'd-none'); setTimeout(() => this.renderer.removeClass(nativeElement, 'd-none'), 0); }); diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json index dc42e452a3..c243b4ef19 100644 --- a/npm/ng-packs/packages/theme-shared/package.json +++ b/npm/ng-packs/packages/theme-shared/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.theme.shared", - "version": "10.1.0-rc.2", + "version": "10.1.0", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.core": "~10.1.0-rc.2", + "@abp/ng.core": "~10.1.0", "@fortawesome/fontawesome-free": "^6.0.0", "@ng-bootstrap/ng-bootstrap": "~20.0.0", "@ngx-validate/core": "^0.2.0", diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/breadcrumb-items/breadcrumb-items.component.html b/npm/ng-packs/packages/theme-shared/src/lib/components/breadcrumb-items/breadcrumb-items.component.html index 4b2dbf611d..4480e34c96 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/breadcrumb-items/breadcrumb-items.component.html +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/breadcrumb-items/breadcrumb-items.component.html @@ -1,9 +1,9 @@ -@if (items.length) { +@if (items().length) {
    2. - @for (item of items; track $index; let last = $last) { + @for (item of items(); track $index; let last = $last) {
  2. [] = []; + readonly items = input[]>([]); } diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts index 47272992fd..010e66f8cb 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts @@ -2,13 +2,14 @@ import { Component, ElementRef, - EventEmitter, - Input, OnInit, - Output, Renderer2, - ViewChild, + computed, inject, + input, + output, + signal, + viewChild, } from '@angular/core'; import { ABP, StopPropagationDirective } from '@abp/ng.core'; @@ -17,16 +18,16 @@ import { ABP, StopPropagationDirective } from '@abp/ng.core'; template: ` `, imports: [StopPropagationDirective], @@ -34,54 +35,48 @@ import { ABP, StopPropagationDirective } from '@abp/ng.core'; export class ButtonComponent implements OnInit { private renderer = inject(Renderer2); - @Input() - buttonId = ''; + readonly buttonId = input(''); + readonly buttonClass = input('btn btn-primary'); + readonly buttonType = input('button'); + readonly formName = input(undefined); + readonly iconClass = input(undefined); + readonly loadingInput = input(false, { alias: 'loading' }); + readonly disabled = input(false); + readonly attributes = input | undefined>(undefined); - @Input() - buttonClass = 'btn btn-primary'; + // Internal writable signal for loading state - can be set programmatically + private readonly _loading = signal(false); - @Input() - buttonType = 'button'; + // Computed that combines input and internal state + readonly isLoading = computed(() => this.loadingInput() || this._loading()); - @Input() - formName?: string = undefined; - - @Input() - iconClass?: string; - - @Input() - loading = false; - - @Input() - disabled: boolean | undefined = false; - - @Input() - attributes?: ABP.Dictionary; - - @Output() readonly click = new EventEmitter(); - - @Output() readonly focus = new EventEmitter(); - - @Output() readonly blur = new EventEmitter(); - - @Output() readonly abpClick = new EventEmitter(); - - @Output() readonly abpFocus = new EventEmitter(); + // Getter/setter for backward compatibility (used by ModalComponent) + get loading(): boolean { + return this._loading(); + } + set loading(value: boolean) { + this._loading.set(value); + } - @Output() readonly abpBlur = new EventEmitter(); + readonly click = output(); + readonly focus = output(); + readonly blur = output(); + readonly abpClick = output(); + readonly abpFocus = output(); + readonly abpBlur = output(); - @ViewChild('button', { static: true }) - buttonRef!: ElementRef; + readonly buttonRef = viewChild.required>('button'); - get icon(): string { - return `${this.loading ? 'fa fa-spinner fa-spin' : this.iconClass || 'd-none'}`; - } + protected readonly icon = computed(() => { + return this.isLoading() ? 'fa fa-spinner fa-spin' : this.iconClass() || 'd-none'; + }); ngOnInit() { - if (this.attributes) { - Object.keys(this.attributes).forEach(key => { - if (this.attributes?.[key]) { - this.renderer.setAttribute(this.buttonRef.nativeElement, key, this.attributes[key]); + const attributes = this.attributes(); + if (attributes) { + Object.keys(attributes).forEach(key => { + if (attributes[key]) { + this.renderer.setAttribute(this.buttonRef().nativeElement, key, attributes[key]); } }); } diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/card/card-body.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/card/card-body.component.ts index 6f8eade8d2..617271ca50 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/card/card-body.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/card/card-body.component.ts @@ -1,13 +1,13 @@ -import { Component, HostBinding, Input } from '@angular/core'; +import { Component, HostBinding, input } from '@angular/core'; @Component({ selector: 'abp-card-body', - template: `
    + template: `
    `, }) export class CardBodyComponent { @HostBinding('class') componentClass = 'card-body'; - @Input() cardBodyClass: string; - @Input() cardBodyStyle: string; + readonly cardBodyClass = input(undefined); + readonly cardBodyStyle = input(undefined); } diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/card/card-footer.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/card/card-footer.component.ts index 3b96418fbd..95bcb91b88 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/card/card-footer.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/card/card-footer.component.ts @@ -1,9 +1,9 @@ -import { Component, HostBinding, Input } from '@angular/core'; +import { Component, HostBinding, input } from '@angular/core'; @Component({ selector: 'abp-card-footer', template: ` -
    +
    `, @@ -12,6 +12,6 @@ import { Component, HostBinding, Input } from '@angular/core'; }) export class CardFooterComponent { @HostBinding('class') componentClass = 'card-footer'; - @Input() cardFooterStyle: string; - @Input() cardFooterClass: string; + readonly cardFooterStyle = input(undefined); + readonly cardFooterClass = input(undefined); } diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/card/card-header.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/card/card-header.component.ts index 3c31d16d74..692a261195 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/card/card-header.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/card/card-header.component.ts @@ -1,9 +1,9 @@ -import { Component, HostBinding, Input } from '@angular/core'; +import { Component, HostBinding, input } from '@angular/core'; @Component({ selector: 'abp-card-header', template: ` -
    +
    `, @@ -12,6 +12,6 @@ import { Component, HostBinding, Input } from '@angular/core'; }) export class CardHeaderComponent { @HostBinding('class') componentClass = 'card-header'; - @Input() cardHeaderClass: string; - @Input() cardHeaderStyle: string; + readonly cardHeaderClass = input(undefined); + readonly cardHeaderStyle = input(undefined); } diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/card/card.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/card/card.component.ts index d65b8a12dc..8374d9f5e0 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/card/card.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/card/card.component.ts @@ -1,14 +1,14 @@ -import { Component, Input } from '@angular/core'; +import { Component, input } from '@angular/core'; @Component({ selector: 'abp-card', - template: `
    + template: `
    `, imports: [], }) export class CardComponent { - @Input() cardClass: string; + readonly cardClass = input(undefined); - @Input() cardStyle: string; + readonly cardStyle = input(undefined); } diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/checkbox/checkbox.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/checkbox/checkbox.component.ts index 8da578f9a7..22636f0af9 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/checkbox/checkbox.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/checkbox/checkbox.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, forwardRef, Input, Output } from '@angular/core'; +import { Component, forwardRef, input, output } from '@angular/core'; import { NG_VALUE_ACCESSOR, FormsModule } from '@angular/forms'; import { AbstractNgModelComponent, LocalizationPipe } from '@abp/ng.core'; @@ -9,16 +9,16 @@ import { AbstractNgModelComponent, LocalizationPipe } from '@abp/ng.core'; - @if (label) { -
    @@ -33,17 +33,12 @@ import { AbstractNgModelComponent, LocalizationPipe } from '@abp/ng.core'; imports: [FormsModule, LocalizationPipe], }) export class FormCheckboxComponent extends AbstractNgModelComponent { - @Input() label?: string; - @Input() labelClass = 'form-check-label'; - @Input() checkboxId!: string; - @Input() checkboxStyle: - | { - [klass: string]: any; - } - | null - | undefined; - @Input() checkboxClass = 'form-check-input'; - @Input() checkboxReadonly = false; - @Output() checkboxBlur = new EventEmitter(); - @Output() checkboxFocus = new EventEmitter(); + readonly label = input(undefined); + readonly labelClass = input('form-check-label'); + readonly checkboxId = input.required(); + readonly checkboxStyle = input<{ [klass: string]: any } | null | undefined>(undefined); + readonly checkboxClass = input('form-check-input'); + readonly checkboxReadonly = input(false); + readonly checkboxBlur = output(); + readonly checkboxFocus = output(); } diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/form-input/form-input.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/form-input/form-input.component.ts index 9e1b843755..d63c6cc931 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/form-input/form-input.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/form-input/form-input.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, forwardRef, Input, Output } from '@angular/core'; +import { Component, forwardRef, input, output } from '@angular/core'; import { FormsModule, NG_VALUE_ACCESSOR } from '@angular/forms'; import { AbstractNgModelComponent, LocalizationPipe } from '@abp/ng.core'; @@ -6,20 +6,20 @@ import { AbstractNgModelComponent, LocalizationPipe } from '@abp/ng.core'; selector: 'abp-form-input', template: `
    - @if (label) { -
    @@ -34,18 +34,13 @@ import { AbstractNgModelComponent, LocalizationPipe } from '@abp/ng.core'; imports: [LocalizationPipe, FormsModule], }) export class FormInputComponent extends AbstractNgModelComponent { - @Input() inputId!: string; - @Input() inputReadonly = false; - @Input() label = ''; - @Input() labelClass = 'form-label'; - @Input() inputPlaceholder = ''; - @Input() inputStyle: - | { - [klass: string]: any; - } - | null - | undefined; - @Input() inputClass = 'form-control'; - @Output() formBlur = new EventEmitter(); - @Output() formFocus = new EventEmitter(); + readonly inputId = input(); + readonly inputReadonly = input(false); + readonly label = input(''); + readonly labelClass = input('form-label'); + readonly inputPlaceholder = input(''); + readonly inputStyle = input<{ [klass: string]: any } | null | undefined>(undefined); + readonly inputClass = input('form-control'); + readonly formBlur = output(); + readonly formFocus = output(); } diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.ts index 24e7fae1d6..c24728b886 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.ts @@ -6,12 +6,12 @@ import { ElementRef, EmbeddedViewRef, Type, - ViewChild, AfterViewInit, OnDestroy, createComponent, EnvironmentInjector, DestroyRef, + viewChild } from '@angular/core'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { DOCUMENT } from '@angular/common'; @@ -53,8 +53,7 @@ export class HttpErrorWrapperComponent implements OnInit, AfterViewInit, OnDestr isHomeShow = true; - @ViewChild('container', { static: false }) - containerRef?: ElementRef; + readonly containerRef = viewChild>('container'); get statusText(): string { return this.status ? `[${this.status}]` : ''; @@ -86,8 +85,9 @@ export class HttpErrorWrapperComponent implements OnInit, AfterViewInit, OnDestr this.appRef.attachView(customComponentRef.hostView); - if (this.containerRef) { - this.containerRef.nativeElement.appendChild( + const containerRef = this.containerRef(); + if (containerRef) { + containerRef.nativeElement.appendChild( (customComponentRef.hostView as EmbeddedViewRef).rootNodes[0], ); } diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/loader-bar/loader-bar.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/loader-bar/loader-bar.component.ts index 28955596a5..efe34b2e78 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/loader-bar/loader-bar.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/loader-bar/loader-bar.component.ts @@ -1,17 +1,17 @@ -import { ChangeDetectorRef, Component, Input, OnDestroy, OnInit, inject } from '@angular/core'; +import { ChangeDetectorRef, Component, OnDestroy, OnInit, inject, input, effect, signal } from '@angular/core'; import { combineLatest, Subscription, timer } from 'rxjs'; import { HttpWaitService, RouterWaitService, SubscriptionService } from '@abp/ng.core'; @Component({ selector: 'abp-loader-bar', template: ` -
    +
    @@ -27,33 +27,26 @@ export class LoaderBarComponent implements OnDestroy, OnInit { private httpWaitService = inject(HttpWaitService); private routerWaitService = inject(RouterWaitService); - protected _isLoading!: boolean; + readonly isLoadingInput = input(false, { alias: 'isLoading' }); + readonly containerClass = input('abp-loader-bar'); + readonly color = input('#77b6ff'); - @Input() - set isLoading(value: boolean) { - this._isLoading = value; - this.cdRef.detectChanges(); - } - get isLoading(): boolean { - return this._isLoading; - } - - @Input() - containerClass = 'abp-loader-bar'; - - @Input() - color = '#77b6ff'; + protected readonly isLoading = signal(false); progressLevel = 0; - interval = new Subscription(); - timer = new Subscription(); - intervalPeriod = 350; - stopDelay = 800; + constructor() { + effect(() => { + const value = this.isLoadingInput(); + this.isLoading.set(value); + this.cdRef.detectChanges(); + }); + } + private readonly clearProgress = () => { this.progressLevel = 0; this.cdRef.detectChanges(); @@ -73,7 +66,7 @@ export class LoaderBarComponent implements OnDestroy, OnInit { }; get boxShadow(): string { - return `0 0 10px rgba(${this.color}, 0.5)`; + return `0 0 10px rgba(${this.color()}, 0.5)`; } ngOnInit() { @@ -95,9 +88,9 @@ export class LoaderBarComponent implements OnDestroy, OnInit { } startLoading() { - if (this.isLoading || !this.interval.closed) return; + if (this.isLoading() || !this.interval.closed) return; - this.isLoading = true; + this.isLoading.set(true); this.progressLevel = 0; this.cdRef.detectChanges(); this.interval = timer(0, this.intervalPeriod).subscribe(this.reportProgress); @@ -108,7 +101,7 @@ export class LoaderBarComponent implements OnDestroy, OnInit { this.interval.unsubscribe(); this.progressLevel = 100; - this.isLoading = false; + this.isLoading.set(false); if (!this.timer.closed) return; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/password/password.component.html b/npm/ng-packs/packages/theme-shared/src/lib/components/password/password.component.html index 0200a82a59..cc53c815b0 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/password/password.component.html +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/password/password.component.html @@ -2,7 +2,7 @@ diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/password/password.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/password/password.component.ts index 24dffcbce0..bd03b25b56 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/password/password.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/password/password.component.ts @@ -1,4 +1,4 @@ -import { Component, forwardRef, Input } from '@angular/core'; +import { Component, forwardRef, input } from '@angular/core'; import { FormsModule, NG_VALUE_ACCESSOR } from '@angular/forms'; import { AbstractNgModelComponent } from '@abp/ng.core'; @@ -21,8 +21,8 @@ import { NgxValidateCoreModule } from '@ngx-validate/core'; ], }) export class PasswordComponent extends AbstractNgModelComponent { - @Input() inputId!: string; - @Input() formControlName!: string; + readonly inputId = input.required(); + readonly formControlName = input.required(); fieldTextType?: boolean; toggleFieldTextType() { diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.html b/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.html index 70fdaa5ebd..9969fd693f 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.html +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.html @@ -1,9 +1,9 @@
    diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.ts index 9c884cb937..11225f7b55 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.ts @@ -1,4 +1,4 @@ -import { Component, HostListener, Input, OnInit } from '@angular/core'; +import { Component, OnInit, input, signal, effect } from '@angular/core'; import { ReplaySubject } from 'rxjs'; import { toastInOut } from '../../animations/toast.animations'; import { Toaster } from '../../models/toaster'; @@ -10,6 +10,9 @@ import { ToastComponent } from '../toast/toast.component'; styleUrls: ['./toast-container.component.scss'], animations: [toastInOut], imports: [ToastComponent], + host: { + '(window:resize)': 'onWindowResize()' + } }) export class ToastContainerComponent implements OnInit { toasts$!: ReplaySubject; @@ -18,43 +21,41 @@ export class ToastContainerComponent implements OnInit { toasts = [] as Toaster.Toast[]; - @Input() - top?: string; - - @Input() - right = '30px'; - defaultRight = '30px'; - defaultMobileRight = '0'; - - @Input() - bottom = '30px'; + readonly top = input(undefined); + readonly rightInput = input('30px', { alias: 'right' }); + readonly bottom = input('30px'); + readonly left = input(undefined); + readonly toastKey = input(undefined); - @Input() - left?: string; + protected readonly right = signal('30px'); + readonly defaultRight = '30px'; + readonly defaultMobileRight = '0'; - @Input() - toastKey?: string; + constructor() { + effect(() => { + this.right.set(this.rightInput()); + }); + } ngOnInit() { this.setDefaultRight(); this.toasts$.subscribe(toasts => { - this.toasts = this.toastKey + this.toasts = this.toastKey() ? toasts.filter(t => { - return t.options && t.options.containerKey !== this.toastKey; + return t.options && t.options.containerKey !== this.toastKey(); }) : toasts; }); } - @HostListener('window:resize') onWindowResize() { this.setDefaultRight(); } setDefaultRight() { const screenWidth = window.innerWidth; - if (screenWidth < 768 && this.right == this.defaultRight) { - this.right = this.defaultMobileRight; + if (screenWidth < 768 && this.right() === this.defaultRight) { + this.right.set(this.defaultMobileRight); } } diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.html b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.html index ead9a95368..7d27398d88 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.html +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.html @@ -3,15 +3,15 @@
    - @if (toast.options?.closable) { + @if (toast().options?.closable) { }
    - {{ toast.title | abpLocalization: toast.options?.titleLocalizationParams }} + {{ toast().title | abpLocalization: toast().options?.titleLocalizationParams }}

    + [innerHTML]="toast().message | abpLocalization: toast().options?.messageLocalizationParams">

    \ No newline at end of file diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.ts index c3fb4d251e..e5a5f78684 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { Component, OnInit, input, output } from '@angular/core'; import { Toaster } from '../../models/toaster'; import { LocalizationPipe } from '@abp/ng.core'; @@ -9,24 +9,24 @@ import { LocalizationPipe } from '@abp/ng.core'; imports: [LocalizationPipe], }) export class ToastComponent implements OnInit { - @Input() - toast!: Toaster.Toast; + readonly toast = input.required(); - @Output() remove = new EventEmitter(); + readonly remove = output(); get severityClass(): string { - if (!this.toast || !this.toast.severity) return ''; - return `abp-toast-${this.toast.severity}`; + const toast = this.toast(); + if (!toast || !toast.severity) return ''; + return `abp-toast-${toast.severity}`; } get iconClass(): string { - const { iconClass } = this.toast.options || {}; + const { iconClass } = this.toast().options || {}; if (iconClass) { return iconClass; } - switch (this.toast.severity) { + switch (this.toast().severity) { case 'success': return 'bi-check'; case 'info': @@ -41,7 +41,7 @@ export class ToastComponent implements OnInit { } ngOnInit() { - const { sticky, life } = this.toast.options || {}; + const { sticky, life } = this.toast().options || {}; if (sticky) return; const timeout = life || 5000; @@ -51,10 +51,10 @@ export class ToastComponent implements OnInit { } close() { - this.remove.emit(this.toast.options?.id); + this.remove.emit(this.toast().options?.id); } tap() { - if (this.toast.options?.tapToDismiss) this.close(); + if (this.toast().options?.tapToDismiss) this.close(); } } diff --git a/npm/ng-packs/packages/theme-shared/src/lib/directives/disabled.directive.ts b/npm/ng-packs/packages/theme-shared/src/lib/directives/disabled.directive.ts index e00d827ba7..6c53df9aa4 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/directives/disabled.directive.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/directives/disabled.directive.ts @@ -1,19 +1,19 @@ -import { Directive, Input, OnChanges, SimpleChanges, inject } from '@angular/core'; +import { Directive, effect, inject, input } from '@angular/core'; import { NgControl } from '@angular/forms'; @Directive({ selector: '[abpDisabled]', }) -export class DisabledDirective implements OnChanges { +export class DisabledDirective { private ngControl = inject(NgControl, { host: true }); - @Input() - abpDisabled = false; + readonly abpDisabled = input(false); // Related issue: https://github.com/angular/angular/issues/35330 - ngOnChanges({ abpDisabled }: SimpleChanges) { - if (this.ngControl.control && abpDisabled) { - this.ngControl.control[abpDisabled.currentValue ? 'disable' : 'enable'](); + private disabledEffect = effect(() => { + const disabled = this.abpDisabled(); + if (this.ngControl.control) { + this.ngControl.control[disabled ? 'disable' : 'enable'](); } - } + }); } diff --git a/npm/ng-packs/packages/theme-shared/src/lib/directives/ellipsis.directive.ts b/npm/ng-packs/packages/theme-shared/src/lib/directives/ellipsis.directive.ts index b26be01a34..f5ec50ec1f 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/directives/ellipsis.directive.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/directives/ellipsis.directive.ts @@ -1,47 +1,48 @@ -import { - AfterViewInit, - ChangeDetectorRef, - Directive, - ElementRef, - HostBinding, - Input, - inject +import { + AfterViewInit, + ChangeDetectorRef, + computed, + Directive, + ElementRef, + inject, + input, + signal } from '@angular/core'; @Directive({ selector: '[abpEllipsis]', + host: { + '[title]': 'effectiveTitle()', + '[class.abp-ellipsis-inline]': 'inlineClass()', + '[class.abp-ellipsis]': 'ellipsisClass()', + '[style.max-width]': 'maxWidth()' + } }) export class EllipsisDirective implements AfterViewInit { private cdRef = inject(ChangeDetectorRef); private elRef = inject(ElementRef); - @Input('abpEllipsis') - width?: string; + readonly width = input(undefined, { alias: 'abpEllipsis' }); + readonly title = input(undefined); + readonly enabled = input(true, { alias: 'abpEllipsisEnabled' }); - @HostBinding('title') - @Input() - title?: string; + private readonly autoTitle = signal(undefined); - @Input('abpEllipsisEnabled') - enabled = true; + protected readonly effectiveTitle = computed(() => this.title() || this.autoTitle()); - @HostBinding('class.abp-ellipsis-inline') - get inlineClass() { - return this.enabled && this.width; - } + protected readonly inlineClass = computed(() => this.enabled() && !!this.width()); - @HostBinding('class.abp-ellipsis') - get class() { - return this.enabled && !this.width; - } + protected readonly ellipsisClass = computed(() => this.enabled() && !this.width()); - @HostBinding('style.max-width') - get maxWidth() { - return this.enabled && this.width ? this.width || '170px' : undefined; - } + protected readonly maxWidth = computed(() => { + const width = this.width(); + return this.enabled() && width ? width || '170px' : undefined; + }); ngAfterViewInit() { - this.title = this.title || (this.elRef.nativeElement as HTMLElement).innerText; - this.cdRef.detectChanges(); + if (!this.title()) { + this.autoTitle.set((this.elRef.nativeElement as HTMLElement).innerText); + this.cdRef.detectChanges(); + } } } diff --git a/npm/ng-packs/packages/theme-shared/src/lib/directives/loading.directive.ts b/npm/ng-packs/packages/theme-shared/src/lib/directives/loading.directive.ts index 2ac03dcc19..2d1fbb0ddc 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/directives/loading.directive.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/directives/loading.directive.ts @@ -1,16 +1,16 @@ -import { - ComponentFactoryResolver, - ComponentRef, - Directive, - ElementRef, - EmbeddedViewRef, - HostBinding, - Injector, - Input, - OnDestroy, - OnInit, - Renderer2, - inject +import { + ComponentRef, + Directive, + ElementRef, + EmbeddedViewRef, + Injector, + OnDestroy, + OnInit, + Renderer2, + effect, + inject, + input, + ViewContainerRef } from '@angular/core'; import { Subscription, timer } from 'rxjs'; import { take } from 'rxjs/operators'; @@ -18,29 +18,38 @@ import { LoadingComponent } from '../components'; @Directive({ selector: '[abpLoading]', + host: { + '[style.position]': '"relative"' + } }) export class LoadingDirective implements OnInit, OnDestroy { private elRef = inject>(ElementRef); - private cdRes = inject(ComponentFactoryResolver); private injector = inject(Injector); private renderer = inject(Renderer2); + private viewContainerRef = inject(ViewContainerRef); - private _loading!: boolean; + readonly loading = input(false, { alias: 'abpLoading' }); + readonly targetElementInput = input(undefined, { alias: 'abpLoadingTargetElement' }); + readonly delay = input(0, { alias: 'abpLoadingDelay' }); - @HostBinding('style.position') - position = 'relative'; + private targetElement: HTMLElement | undefined; - @Input('abpLoading') - get loading(): boolean { - return this._loading; + componentRef: ComponentRef | null = null; + rootNode: HTMLDivElement | null = null; + timerSubscription: Subscription | null = null; + + constructor() { + effect(() => { + const newValue = this.loading(); + this.handleLoadingChange(newValue); + }); } - set loading(newValue: boolean) { + private handleLoadingChange(newValue: boolean) { setTimeout(() => { if (!newValue && this.timerSubscription) { this.timerSubscription.unsubscribe(); this.timerSubscription = null; - this._loading = newValue; if (this.rootNode) { this.renderer.removeChild(this.rootNode.parentElement, this.rootNode); @@ -49,13 +58,13 @@ export class LoadingDirective implements OnInit, OnDestroy { return; } - this.timerSubscription = timer(this.delay) + this.timerSubscription = timer(this.delay()) .pipe(take(1)) .subscribe(() => { if (!this.componentRef) { - this.componentRef = this.cdRes - .resolveComponentFactory(LoadingComponent) - .create(this.injector); + this.componentRef = this.viewContainerRef.createComponent(LoadingComponent, { + injector: this.injector + }); } if (newValue && !this.rootNode) { @@ -66,23 +75,13 @@ export class LoadingDirective implements OnInit, OnDestroy { this.rootNode = null; } - this._loading = newValue; this.timerSubscription = null; }); }, 0); } - @Input('abpLoadingTargetElement') - targetElement: HTMLElement | undefined; - - @Input('abpLoadingDelay') - delay = 0; - - componentRef!: ComponentRef; - rootNode: HTMLDivElement | null = null; - timerSubscription: Subscription | null = null; - ngOnInit() { + this.targetElement = this.targetElementInput(); if (!this.targetElement) { const { offsetHeight, offsetWidth } = this.elRef.nativeElement; if (!offsetHeight && !offsetWidth && this.elRef.nativeElement.children?.length) { diff --git a/npm/ng-packs/packages/theme-shared/src/lib/directives/ngx-datatable-default.directive.ts b/npm/ng-packs/packages/theme-shared/src/lib/directives/ngx-datatable-default.directive.ts index 951de1a6f2..a773bf5dab 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/directives/ngx-datatable-default.directive.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/directives/ngx-datatable-default.directive.ts @@ -3,10 +3,10 @@ import { AfterViewInit, Directive, HostBinding, - Input, OnDestroy, inject, PLATFORM_ID, + input } from '@angular/core'; import { ColumnMode, DatatableComponent } from '@swimlane/ngx-datatable'; import { fromEvent, Subscription } from 'rxjs'; @@ -25,11 +25,11 @@ export class NgxDatatableDefaultDirective implements AfterViewInit, OnDestroy { private subscription = new Subscription(); private resizeDiff = 0; - @Input() class = 'material bordered'; + readonly class = input('material bordered'); @HostBinding('class') get classes(): string { - return `ngx-datatable ${this.class}`; + return `ngx-datatable ${this.class()}`; } constructor() { diff --git a/npm/ng-packs/packages/theme-shared/src/lib/directives/ngx-datatable-list.directive.ts b/npm/ng-packs/packages/theme-shared/src/lib/directives/ngx-datatable-list.directive.ts index 0754300b0f..7b66905308 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/directives/ngx-datatable-list.directive.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/directives/ngx-datatable-list.directive.ts @@ -1,7 +1,6 @@ import { ChangeDetectorRef, Directive, - Input, OnChanges, OnInit, DoCheck, @@ -10,6 +9,7 @@ import { DestroyRef, ViewContainerRef, Renderer2, + input } from '@angular/core'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { distinctUntilChanged } from 'rxjs'; @@ -35,7 +35,7 @@ export class NgxDatatableListDirective implements OnChanges, OnInit, DoCheck { protected readonly viewContainerRef = inject(ViewContainerRef); protected readonly renderer = inject(Renderer2); - @Input() list!: ListService; + readonly list = input.required(); constructor() { this.setInitialValues(); @@ -62,7 +62,7 @@ export class NgxDatatableListDirective implements OnChanges, OnInit, DoCheck { } protected subscribeToRequestStatus() { - const requestStatus$ = this.list.requestStatus$.pipe(distinctUntilChanged()); + const requestStatus$ = this.list().requestStatus$.pipe(distinctUntilChanged()); const { emptyMessage, errorMessage } = this.ngxDatatableMessages || defaultNgxDatatableMessages; requestStatus$.subscribe(status => { @@ -137,14 +137,15 @@ export class NgxDatatableListDirective implements OnChanges, OnInit, DoCheck { this.table.sort .pipe(takeUntilDestroyed(this.destroyRef)) .subscribe(({ sorts: [{ prop, dir }] }) => { - if (prop === this.list.sortKey && this.list.sortOrder === 'desc') { - this.list.sortKey = ''; - this.list.sortOrder = ''; + const list = this.list(); + if (prop === list.sortKey && list.sortOrder === 'desc') { + list.sortKey = ''; + list.sortOrder = ''; this.table.sorts = []; this.cdRef.detectChanges(); } else { - this.list.sortKey = prop; - this.list.sortOrder = dir; + list.sortKey = prop; + list.sortOrder = dir; } }); } @@ -156,32 +157,32 @@ export class NgxDatatableListDirective implements OnChanges, OnInit, DoCheck { } protected subscribeToQuery() { - this.list.query$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(() => { - const offset = this.list.page; + this.list().query$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(() => { + const offset = this.list().page; if (this.table.offset !== offset) this.table.offset = offset; }); } protected setTablePage(pageNum: number) { - this.list.page = pageNum; + this.list().page = pageNum; this.table.offset = pageNum; } protected refreshPageIfDataExist() { if (this.table.rows?.length < 1 && this.table.count > 0) { - let maxPage = Math.floor(Number(this.table.count / this.list.maxResultCount)); + let maxPage = Math.floor(Number(this.table.count / this.list().maxResultCount)); - if (this.table.count < this.list.maxResultCount) { + if (this.table.count < this.list().maxResultCount) { this.setTablePage(0); return; } - if (this.table.count % this.list.maxResultCount === 0) { + if (this.table.count % this.list().maxResultCount === 0) { maxPage -= 1; } - if (this.list.page < maxPage) { - this.setTablePage(this.list.page); + if (this.list().page < maxPage) { + this.setTablePage(this.list().page); return; } diff --git a/npm/ng-packs/packages/theme-shared/src/lib/directives/visible.directive.ts b/npm/ng-packs/packages/theme-shared/src/lib/directives/visible.directive.ts index 7532041462..df8ebf9197 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/directives/visible.directive.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/directives/visible.directive.ts @@ -1,37 +1,45 @@ -import { OnInit, Directive, OnDestroy, Input, ViewContainerRef, TemplateRef, inject } from '@angular/core'; +import { Directive, OnDestroy, ViewContainerRef, TemplateRef, inject, input, effect } from '@angular/core'; import { EMPTY, from, Observable, of, Subscription } from 'rxjs'; +type VisibleInput = boolean | Promise | Observable | undefined | null; + @Directive({ selector: '[abpVisible]', }) -export class AbpVisibleDirective implements OnDestroy, OnInit { +export class AbpVisibleDirective implements OnDestroy { private viewContainerRef = inject(ViewContainerRef); private templateRef = inject>(TemplateRef); - conditionSubscription: Subscription | undefined; - isVisible: boolean | undefined; + private conditionSubscription: Subscription | undefined; + private isVisible: boolean | undefined; + private condition$: Observable = of(false); - @Input() set abpVisible( - value: boolean | Promise | Observable | undefined | null, - ) { - this.condition$ = checkType(value); - this.subscribeToCondition(); - } + readonly abpVisible = input(); - private condition$: Observable = of(false); - ngOnInit(): void { - this.updateVisibility(); + private lastInput: VisibleInput; + + constructor() { + effect(() => { + const value = this.abpVisible(); + if (value === this.lastInput) return; + this.lastInput = value; + this.condition$ = checkType(value); + this.subscribeToCondition(); + }); } + ngOnDestroy(): void { this.conditionSubscription?.unsubscribe(); } private subscribeToCondition() { + this.conditionSubscription?.unsubscribe(); this.conditionSubscription = this.condition$.subscribe(value => { this.isVisible = value; this.updateVisibility(); }); } + private updateVisibility() { this.viewContainerRef.clear(); // it should be false not falsy @@ -42,7 +50,7 @@ export class AbpVisibleDirective implements OnDestroy, OnInit { } } -function checkType(value: boolean | Promise | Observable | undefined | null) { +function checkType(value: VisibleInput) { if (value instanceof Promise) { return from(value); } else if (value instanceof Observable) { diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tokens/index.ts b/npm/ng-packs/packages/theme-shared/src/lib/tokens/index.ts index fc60386b7d..97bccdebb5 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tokens/index.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tokens/index.ts @@ -4,3 +4,4 @@ export * from './ngx-datatable-messages.token'; export * from './suppress-unsaved-changes-warning.token'; export * from './confirmation-icons.token'; export * from './logo.token'; +export * from './theme-change.token'; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tokens/theme-change.token.ts b/npm/ng-packs/packages/theme-shared/src/lib/tokens/theme-change.token.ts new file mode 100644 index 0000000000..e527dff1bc --- /dev/null +++ b/npm/ng-packs/packages/theme-shared/src/lib/tokens/theme-change.token.ts @@ -0,0 +1,6 @@ +import { InjectionToken } from '@angular/core'; +import { Observable } from 'rxjs'; + +export const THEME_CHANGE_TOKEN = new InjectionToken>( + 'THEME_CHANGE_TOKEN', +); diff --git a/npm/ng-packs/tsconfig.base.json b/npm/ng-packs/tsconfig.base.json index 5e84e8105b..3c38c46d4c 100644 --- a/npm/ng-packs/tsconfig.base.json +++ b/npm/ng-packs/tsconfig.base.json @@ -50,9 +50,12 @@ "@abp/ng.theme.shared": ["packages/theme-shared/src/public-api.ts"], "@abp/ng.theme.shared/testing": ["packages/theme-shared/testing/src/public-api.ts"], "@abp/nx.generators": ["packages/generators/src/index.ts"], - "ng-zorro-antd/core/no-animation": [ - "node_modules/ng-zorro-antd/core/no-animation" - ] + "@abp/ng.cms-kit": ["packages/cms-kit/src/public-api.ts"], + "@abp/ng.cms-kit/proxy": ["packages/cms-kit/proxy/src/public-api.ts"], + "@abp/ng.cms-kit/admin": ["packages/cms-kit/admin/src/public-api.ts"], + "@abp/ng.cms-kit/admin/config": ["packages/cms-kit/admin/config/src/public-api.ts"], + "@abp/ng.cms-kit/public": ["packages/cms-kit/public/src/public-api.ts"], + "@abp/ng.cms-kit/public/config": ["packages/cms-kit/public/config/src/public-api.ts"] } }, "exclude": ["node_modules", "tmp"] diff --git a/npm/packs/anchor-js/package.json b/npm/packs/anchor-js/package.json index 66c70614a8..caf741659b 100644 --- a/npm/packs/anchor-js/package.json +++ b/npm/packs/anchor-js/package.json @@ -1,11 +1,11 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/anchor-js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~10.1.0-rc.2", + "@abp/core": "~10.1.0", "anchor-js": "^5.0.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/aspnetcore.components.server.basictheme/package.json b/npm/packs/aspnetcore.components.server.basictheme/package.json index d566c60e3a..515197b70f 100644 --- a/npm/packs/aspnetcore.components.server.basictheme/package.json +++ b/npm/packs/aspnetcore.components.server.basictheme/package.json @@ -1,11 +1,11 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/aspnetcore.components.server.basictheme", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.components.server.theming": "~10.1.0-rc.2" + "@abp/aspnetcore.components.server.theming": "~10.1.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/aspnetcore.components.server.theming/package.json b/npm/packs/aspnetcore.components.server.theming/package.json index 5b98884eb5..3294a5383d 100644 --- a/npm/packs/aspnetcore.components.server.theming/package.json +++ b/npm/packs/aspnetcore.components.server.theming/package.json @@ -1,12 +1,12 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/aspnetcore.components.server.theming", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/bootstrap": "~10.1.0-rc.2", - "@abp/font-awesome": "~10.1.0-rc.2" + "@abp/bootstrap": "~10.1.0", + "@abp/font-awesome": "~10.1.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json index be30febb4a..ab9e0c45db 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/aspnetcore.mvc.ui.theme.basic", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~10.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.shared": "~10.1.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json index 3143c0fc0a..a40c61cd90 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/aspnetcore.mvc.ui.theme.shared", "repository": { "type": "git", @@ -10,21 +10,21 @@ "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui": "~10.1.0-rc.2", - "@abp/bootstrap": "~10.1.0-rc.2", - "@abp/bootstrap-datepicker": "~10.1.0-rc.2", - "@abp/bootstrap-daterangepicker": "~10.1.0-rc.2", - "@abp/datatables.net-bs5": "~10.1.0-rc.2", - "@abp/font-awesome": "~10.1.0-rc.2", - "@abp/jquery-form": "~10.1.0-rc.2", - "@abp/jquery-validation-unobtrusive": "~10.1.0-rc.2", - "@abp/lodash": "~10.1.0-rc.2", - "@abp/luxon": "~10.1.0-rc.2", - "@abp/malihu-custom-scrollbar-plugin": "~10.1.0-rc.2", - "@abp/moment": "~10.1.0-rc.2", - "@abp/select2": "~10.1.0-rc.2", - "@abp/sweetalert2": "~10.1.0-rc.2", - "@abp/timeago": "~10.1.0-rc.2" + "@abp/aspnetcore.mvc.ui": "~10.1.0", + "@abp/bootstrap": "~10.1.0", + "@abp/bootstrap-datepicker": "~10.1.0", + "@abp/bootstrap-daterangepicker": "~10.1.0", + "@abp/datatables.net-bs5": "~10.1.0", + "@abp/font-awesome": "~10.1.0", + "@abp/jquery-form": "~10.1.0", + "@abp/jquery-validation-unobtrusive": "~10.1.0", + "@abp/lodash": "~10.1.0", + "@abp/luxon": "~10.1.0", + "@abp/malihu-custom-scrollbar-plugin": "~10.1.0", + "@abp/moment": "~10.1.0", + "@abp/select2": "~10.1.0", + "@abp/sweetalert2": "~10.1.0", + "@abp/timeago": "~10.1.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/aspnetcore.mvc.ui/package-lock.json b/npm/packs/aspnetcore.mvc.ui/package-lock.json index 3ec3578119..50456bcf8c 100644 --- a/npm/packs/aspnetcore.mvc.ui/package-lock.json +++ b/npm/packs/aspnetcore.mvc.ui/package-lock.json @@ -1,6 +1,6 @@ { "name": "@abp/aspnetcore.mvc.ui", - "version": "10.1.0-rc.2", + "version": "10.1.0", "lockfileVersion": 1, "requires": true, "packages": { diff --git a/npm/packs/aspnetcore.mvc.ui/package.json b/npm/packs/aspnetcore.mvc.ui/package.json index 52fe871c52..6f5bebafed 100644 --- a/npm/packs/aspnetcore.mvc.ui/package.json +++ b/npm/packs/aspnetcore.mvc.ui/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/aspnetcore.mvc.ui", "repository": { "type": "git", diff --git a/npm/packs/blogging/package.json b/npm/packs/blogging/package.json index 94be08cdb9..9a4a5744f1 100644 --- a/npm/packs/blogging/package.json +++ b/npm/packs/blogging/package.json @@ -1,14 +1,14 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/blogging", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~10.1.0-rc.2", - "@abp/owl.carousel": "~10.1.0-rc.2", - "@abp/prismjs": "~10.1.0-rc.2", - "@abp/tui-editor": "~10.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.shared": "~10.1.0", + "@abp/owl.carousel": "~10.1.0", + "@abp/prismjs": "~10.1.0", + "@abp/tui-editor": "~10.1.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/bootstrap-datepicker/package.json b/npm/packs/bootstrap-datepicker/package.json index 48241bfb07..70323a3532 100644 --- a/npm/packs/bootstrap-datepicker/package.json +++ b/npm/packs/bootstrap-datepicker/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/bootstrap-datepicker", "repository": { "type": "git", diff --git a/npm/packs/bootstrap-daterangepicker/package.json b/npm/packs/bootstrap-daterangepicker/package.json index d027c0f0bd..58ea46786c 100644 --- a/npm/packs/bootstrap-daterangepicker/package.json +++ b/npm/packs/bootstrap-daterangepicker/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/bootstrap-daterangepicker", "repository": { "type": "git", diff --git a/npm/packs/bootstrap/package.json b/npm/packs/bootstrap/package.json index 479f04b7a1..bb0ae55946 100644 --- a/npm/packs/bootstrap/package.json +++ b/npm/packs/bootstrap/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/bootstrap", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.1.0-rc.2", + "@abp/core": "~10.1.0", "bootstrap": "^5.3.8" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/chart.js/package.json b/npm/packs/chart.js/package.json index 6f3148b0e3..e69f2b5085 100644 --- a/npm/packs/chart.js/package.json +++ b/npm/packs/chart.js/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/chart.js", "publishConfig": { "access": "public" diff --git a/npm/packs/clipboard/package.json b/npm/packs/clipboard/package.json index 64c7810dda..6c71fc541e 100644 --- a/npm/packs/clipboard/package.json +++ b/npm/packs/clipboard/package.json @@ -1,11 +1,11 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/clipboard", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~10.1.0-rc.2", + "@abp/core": "~10.1.0", "clipboard": "^2.0.11" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/cms-kit.admin/package.json b/npm/packs/cms-kit.admin/package.json index 3c9f0b9058..f785cb7ad6 100644 --- a/npm/packs/cms-kit.admin/package.json +++ b/npm/packs/cms-kit.admin/package.json @@ -1,16 +1,16 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/cms-kit.admin", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/codemirror": "~10.1.0-rc.2", - "@abp/jstree": "~10.1.0-rc.2", - "@abp/markdown-it": "~10.1.0-rc.2", - "@abp/slugify": "~10.1.0-rc.2", - "@abp/tui-editor": "~10.1.0-rc.2", - "@abp/uppy": "~10.1.0-rc.2" + "@abp/codemirror": "~10.1.0", + "@abp/jstree": "~10.1.0", + "@abp/markdown-it": "~10.1.0", + "@abp/slugify": "~10.1.0", + "@abp/tui-editor": "~10.1.0", + "@abp/uppy": "~10.1.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/cms-kit.public/package.json b/npm/packs/cms-kit.public/package.json index b7fcf1b540..5e706dc9c8 100644 --- a/npm/packs/cms-kit.public/package.json +++ b/npm/packs/cms-kit.public/package.json @@ -1,12 +1,12 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/cms-kit.public", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/highlight.js": "~10.1.0-rc.2", - "@abp/star-rating-svg": "~10.1.0-rc.2" + "@abp/highlight.js": "~10.1.0", + "@abp/star-rating-svg": "~10.1.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/cms-kit/package.json b/npm/packs/cms-kit/package.json index 86686216d4..a4a7cc66b5 100644 --- a/npm/packs/cms-kit/package.json +++ b/npm/packs/cms-kit/package.json @@ -1,12 +1,12 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/cms-kit", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/cms-kit.admin": "~10.1.0-rc.2", - "@abp/cms-kit.public": "~10.1.0-rc.2" + "@abp/cms-kit.admin": "~10.1.0", + "@abp/cms-kit.public": "~10.1.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/codemirror/package.json b/npm/packs/codemirror/package.json index 808bc652ef..fbba5ac933 100644 --- a/npm/packs/codemirror/package.json +++ b/npm/packs/codemirror/package.json @@ -1,11 +1,11 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/codemirror", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~10.1.0-rc.2", + "@abp/core": "~10.1.0", "codemirror": "^5.65.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/core/package.json b/npm/packs/core/package.json index 1b0fea5b69..5c5802c632 100644 --- a/npm/packs/core/package.json +++ b/npm/packs/core/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/core", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/utils": "~10.1.0-rc.2" + "@abp/utils": "~10.1.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/cropperjs/package.json b/npm/packs/cropperjs/package.json index 8732cf5faf..ac6061b8de 100644 --- a/npm/packs/cropperjs/package.json +++ b/npm/packs/cropperjs/package.json @@ -1,11 +1,11 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/cropperjs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~10.1.0-rc.2", + "@abp/core": "~10.1.0", "cropperjs": "^1.6.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/datatables.net-bs4/package.json b/npm/packs/datatables.net-bs4/package.json index 18b00a2cf9..8b5a587d10 100644 --- a/npm/packs/datatables.net-bs4/package.json +++ b/npm/packs/datatables.net-bs4/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/datatables.net-bs4", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/datatables.net": "~10.1.0-rc.2", + "@abp/datatables.net": "~10.1.0", "datatables.net-bs4": "^2.3.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/datatables.net-bs5/package.json b/npm/packs/datatables.net-bs5/package.json index 19c71ea013..b2495a028c 100644 --- a/npm/packs/datatables.net-bs5/package.json +++ b/npm/packs/datatables.net-bs5/package.json @@ -1,11 +1,11 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/datatables.net-bs5", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/datatables.net": "~10.1.0-rc.2", + "@abp/datatables.net": "~10.1.0", "datatables.net-bs5": "^2.3.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/datatables.net/package.json b/npm/packs/datatables.net/package.json index d0f0c240e4..b599e94328 100644 --- a/npm/packs/datatables.net/package.json +++ b/npm/packs/datatables.net/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/datatables.net", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~10.1.0-rc.2", + "@abp/jquery": "~10.1.0", "datatables.net": "^2.3.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/docs/package.json b/npm/packs/docs/package.json index cafd0f48bb..e5e36f7daf 100644 --- a/npm/packs/docs/package.json +++ b/npm/packs/docs/package.json @@ -1,15 +1,15 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/docs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/anchor-js": "~10.1.0-rc.2", - "@abp/clipboard": "~10.1.0-rc.2", - "@abp/malihu-custom-scrollbar-plugin": "~10.1.0-rc.2", - "@abp/popper.js": "~10.1.0-rc.2", - "@abp/prismjs": "~10.1.0-rc.2" + "@abp/anchor-js": "~10.1.0", + "@abp/clipboard": "~10.1.0", + "@abp/malihu-custom-scrollbar-plugin": "~10.1.0", + "@abp/popper.js": "~10.1.0", + "@abp/prismjs": "~10.1.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/flag-icon-css/package.json b/npm/packs/flag-icon-css/package.json index cd5cdec40f..20afba8bd8 100644 --- a/npm/packs/flag-icon-css/package.json +++ b/npm/packs/flag-icon-css/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/flag-icon-css", "publishConfig": { "access": "public" diff --git a/npm/packs/flag-icons/package.json b/npm/packs/flag-icons/package.json index fba66cb6bb..022a9d2194 100644 --- a/npm/packs/flag-icons/package.json +++ b/npm/packs/flag-icons/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/flag-icons", "publishConfig": { "access": "public" diff --git a/npm/packs/font-awesome/package.json b/npm/packs/font-awesome/package.json index 41f0c12daf..1e22bd814a 100644 --- a/npm/packs/font-awesome/package.json +++ b/npm/packs/font-awesome/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/font-awesome", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.1.0-rc.2", + "@abp/core": "~10.1.0", "@fortawesome/fontawesome-free": "^7.0.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/highlight.js/package.json b/npm/packs/highlight.js/package.json index 922abc3da8..7a927fda5e 100644 --- a/npm/packs/highlight.js/package.json +++ b/npm/packs/highlight.js/package.json @@ -1,11 +1,11 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/highlight.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~10.1.0-rc.2", + "@abp/core": "~10.1.0", "@highlightjs/cdn-assets": "~11.11.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jquery-form/package.json b/npm/packs/jquery-form/package.json index 9682e9c275..47aea3742c 100644 --- a/npm/packs/jquery-form/package.json +++ b/npm/packs/jquery-form/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/jquery-form", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~10.1.0-rc.2", + "@abp/jquery": "~10.1.0", "jquery-form": "^4.3.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jquery-validation-unobtrusive/package.json b/npm/packs/jquery-validation-unobtrusive/package.json index 34ce45bf1c..7f8dd38e52 100644 --- a/npm/packs/jquery-validation-unobtrusive/package.json +++ b/npm/packs/jquery-validation-unobtrusive/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/jquery-validation-unobtrusive", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery-validation": "~10.1.0-rc.2", + "@abp/jquery-validation": "~10.1.0", "jquery-validation-unobtrusive": "^4.0.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jquery-validation/package.json b/npm/packs/jquery-validation/package.json index 4cad463ff2..6deb646c6f 100644 --- a/npm/packs/jquery-validation/package.json +++ b/npm/packs/jquery-validation/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/jquery-validation", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~10.1.0-rc.2", + "@abp/jquery": "~10.1.0", "jquery-validation": "^1.21.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jquery/package.json b/npm/packs/jquery/package.json index 4a4f7f0aa7..375b4a8926 100644 --- a/npm/packs/jquery/package.json +++ b/npm/packs/jquery/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/jquery", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.1.0-rc.2", + "@abp/core": "~10.1.0", "jquery": "~3.7.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/jstree/package.json b/npm/packs/jstree/package.json index 24e1786cb7..96adee3704 100644 --- a/npm/packs/jstree/package.json +++ b/npm/packs/jstree/package.json @@ -1,11 +1,11 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/jstree", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~10.1.0-rc.2", + "@abp/jquery": "~10.1.0", "jstree": "^3.3.17" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/lodash/package.json b/npm/packs/lodash/package.json index 64050e87fc..758947b6aa 100644 --- a/npm/packs/lodash/package.json +++ b/npm/packs/lodash/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/lodash", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.1.0-rc.2", + "@abp/core": "~10.1.0", "lodash": "^4.17.21" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/luxon/package.json b/npm/packs/luxon/package.json index 29d4dbb782..ec2cafc99d 100644 --- a/npm/packs/luxon/package.json +++ b/npm/packs/luxon/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/luxon", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.1.0-rc.2", + "@abp/core": "~10.1.0", "luxon": "^3.7.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/malihu-custom-scrollbar-plugin/package.json b/npm/packs/malihu-custom-scrollbar-plugin/package.json index 1f291f26ca..8037f6e6cc 100644 --- a/npm/packs/malihu-custom-scrollbar-plugin/package.json +++ b/npm/packs/malihu-custom-scrollbar-plugin/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/malihu-custom-scrollbar-plugin", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.1.0-rc.2", + "@abp/core": "~10.1.0", "malihu-custom-scrollbar-plugin": "^3.1.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/markdown-it/package.json b/npm/packs/markdown-it/package.json index fb554e3883..cbfc4f62de 100644 --- a/npm/packs/markdown-it/package.json +++ b/npm/packs/markdown-it/package.json @@ -1,11 +1,11 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/markdown-it", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~10.1.0-rc.2", + "@abp/core": "~10.1.0", "markdown-it": "^14.1.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/moment/package.json b/npm/packs/moment/package.json index b0f2c78e4e..64b4f251d1 100644 --- a/npm/packs/moment/package.json +++ b/npm/packs/moment/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/moment", "repository": { "type": "git", diff --git a/npm/packs/owl.carousel/package.json b/npm/packs/owl.carousel/package.json index 5044c2fbe0..bbc8e7df3c 100644 --- a/npm/packs/owl.carousel/package.json +++ b/npm/packs/owl.carousel/package.json @@ -1,11 +1,11 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/owl.carousel", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~10.1.0-rc.2", + "@abp/core": "~10.1.0", "owl.carousel": "^2.3.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/popper.js/package.json b/npm/packs/popper.js/package.json index cc86b2e2ea..602ddf6708 100644 --- a/npm/packs/popper.js/package.json +++ b/npm/packs/popper.js/package.json @@ -1,11 +1,11 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/popper.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~10.1.0-rc.2", + "@abp/core": "~10.1.0", "@popperjs/core": "^2.11.8" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/prismjs/package.json b/npm/packs/prismjs/package.json index 0e83b34e7f..4fd469f4dc 100644 --- a/npm/packs/prismjs/package.json +++ b/npm/packs/prismjs/package.json @@ -1,12 +1,12 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/prismjs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/clipboard": "~10.1.0-rc.2", - "@abp/core": "~10.1.0-rc.2", + "@abp/clipboard": "~10.1.0", + "@abp/core": "~10.1.0", "prismjs": "^1.30.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/qrcode/package.json b/npm/packs/qrcode/package.json index ad766dc992..c62be35b29 100644 --- a/npm/packs/qrcode/package.json +++ b/npm/packs/qrcode/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/qrcode", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.1.0-rc.2" + "@abp/core": "~10.1.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/select2/package.json b/npm/packs/select2/package.json index caf990f633..cf27666b02 100644 --- a/npm/packs/select2/package.json +++ b/npm/packs/select2/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/select2", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~10.1.0-rc.2", + "@abp/core": "~10.1.0", "select2": "^4.0.13" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/signalr/package.json b/npm/packs/signalr/package.json index c22f2b18b2..7a0024790f 100644 --- a/npm/packs/signalr/package.json +++ b/npm/packs/signalr/package.json @@ -1,11 +1,11 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/signalr", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~10.1.0-rc.2", + "@abp/core": "~10.1.0", "@microsoft/signalr": "~9.0.6" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/slugify/package.json b/npm/packs/slugify/package.json index 9d596d6589..3331b28587 100644 --- a/npm/packs/slugify/package.json +++ b/npm/packs/slugify/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/slugify", "publishConfig": { "access": "public" diff --git a/npm/packs/star-rating-svg/package.json b/npm/packs/star-rating-svg/package.json index 00531dcdec..99d9e6e7d3 100644 --- a/npm/packs/star-rating-svg/package.json +++ b/npm/packs/star-rating-svg/package.json @@ -1,11 +1,11 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/star-rating-svg", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~10.1.0-rc.2", + "@abp/jquery": "~10.1.0", "star-rating-svg": "^3.5.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/sweetalert2/package.json b/npm/packs/sweetalert2/package.json index 236fa38a7e..19fa99ed97 100644 --- a/npm/packs/sweetalert2/package.json +++ b/npm/packs/sweetalert2/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/sweetalert2", "publishConfig": { "access": "public" @@ -10,7 +10,7 @@ "directory": "npm/packs/sweetalert2" }, "dependencies": { - "@abp/core": "~10.1.0-rc.2", + "@abp/core": "~10.1.0", "sweetalert2": "^11.23.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/timeago/package.json b/npm/packs/timeago/package.json index 22f0d3ced5..84d3e7564e 100644 --- a/npm/packs/timeago/package.json +++ b/npm/packs/timeago/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/timeago", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~10.1.0-rc.2", + "@abp/jquery": "~10.1.0", "timeago": "^1.6.7" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/toastr/package.json b/npm/packs/toastr/package.json index c18fcd70e9..dd4c63be1b 100644 --- a/npm/packs/toastr/package.json +++ b/npm/packs/toastr/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/toastr", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~10.1.0-rc.2", + "@abp/jquery": "~10.1.0", "toastr": "^2.1.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/tui-editor/package.json b/npm/packs/tui-editor/package.json index 1d18b7aab0..c7110e52a7 100644 --- a/npm/packs/tui-editor/package.json +++ b/npm/packs/tui-editor/package.json @@ -1,12 +1,12 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/tui-editor", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~10.1.0-rc.2", - "@abp/prismjs": "~10.1.0-rc.2" + "@abp/jquery": "~10.1.0", + "@abp/prismjs": "~10.1.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/uppy/package.json b/npm/packs/uppy/package.json index 6443c16bf9..12874ee518 100644 --- a/npm/packs/uppy/package.json +++ b/npm/packs/uppy/package.json @@ -1,11 +1,11 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/uppy", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~10.1.0-rc.2", + "@abp/core": "~10.1.0", "uppy": "^5.1.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/utils/package.json b/npm/packs/utils/package.json index 9a059db2d8..6c2606a397 100644 --- a/npm/packs/utils/package.json +++ b/npm/packs/utils/package.json @@ -1,6 +1,6 @@ { "name": "@abp/utils", - "version": "10.1.0-rc.2", + "version": "10.1.0", "scripts": { "prepublishOnly": "yarn install --ignore-scripts && node prepublish.js", "ng": "ng", diff --git a/npm/packs/vee-validate/package.json b/npm/packs/vee-validate/package.json index 30c837454b..1dd191b619 100644 --- a/npm/packs/vee-validate/package.json +++ b/npm/packs/vee-validate/package.json @@ -1,11 +1,11 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/vee-validate", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/vue": "~10.1.0-rc.2", + "@abp/vue": "~10.1.0", "vee-validate": "~3.4.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/npm/packs/virtual-file-explorer/package.json b/npm/packs/virtual-file-explorer/package.json index 0672075f5b..46975b6bd8 100644 --- a/npm/packs/virtual-file-explorer/package.json +++ b/npm/packs/virtual-file-explorer/package.json @@ -1,12 +1,12 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/virtual-file-explorer", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/clipboard": "~10.1.0-rc.2", - "@abp/prismjs": "~10.1.0-rc.2" + "@abp/clipboard": "~10.1.0", + "@abp/prismjs": "~10.1.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io", diff --git a/npm/packs/vue/package.json b/npm/packs/vue/package.json index fb878bd9cf..5ab9881b41 100644 --- a/npm/packs/vue/package.json +++ b/npm/packs/vue/package.json @@ -1,5 +1,5 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/vue", "publishConfig": { "access": "public" diff --git a/npm/packs/zxcvbn/package.json b/npm/packs/zxcvbn/package.json index 882d8db35f..0118f27ac1 100644 --- a/npm/packs/zxcvbn/package.json +++ b/npm/packs/zxcvbn/package.json @@ -1,11 +1,11 @@ { - "version": "10.1.0-rc.2", + "version": "10.1.0", "name": "@abp/zxcvbn", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~10.1.0-rc.2", + "@abp/core": "~10.1.0", "zxcvbn": "^4.4.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", diff --git a/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip b/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip index 5b64147a89..d795a676a5 100644 Binary files a/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip and b/source-code/Volo.Abp.Account.SourceCode/Volo.Abp.Account.SourceCode.zip differ diff --git a/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip b/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip index 0919ab4bab..07fe6574bb 100644 Binary files a/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip and b/source-code/Volo.Abp.AuditLogging.SourceCode/Volo.Abp.AuditLogging.SourceCode.zip differ diff --git a/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip b/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip index 8322813f0e..0ab637656e 100644 Binary files a/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip and b/source-code/Volo.Abp.BackgroundJobs.SourceCode/Volo.Abp.BackgroundJobs.SourceCode.zip differ diff --git a/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip b/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip index edac4d8f20..c2c2e76e19 100644 Binary files a/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip and b/source-code/Volo.Abp.BlobStoring.Database.SourceCode/Volo.Abp.BlobStoring.Database.SourceCode.zip differ diff --git a/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip b/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip index fcc3980ea7..1d9dc2fdb0 100644 Binary files a/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip and b/source-code/Volo.Abp.FeatureManagement.SourceCode/Volo.Abp.FeatureManagement.SourceCode.zip differ diff --git a/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip b/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip index 30d07ea91a..9d122a27ab 100644 Binary files a/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip and b/source-code/Volo.Abp.Identity.SourceCode/Volo.Abp.Identity.SourceCode.zip differ diff --git a/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip b/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip index 19dc79216c..12fcfb894f 100644 Binary files a/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip and b/source-code/Volo.Abp.IdentityServer.SourceCode/Volo.Abp.IdentityServer.SourceCode.zip differ diff --git a/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip b/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip index 3a79b434bc..633edf1b46 100644 Binary files a/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip and b/source-code/Volo.Abp.OpenIddict.SourceCode/Volo.Abp.OpenIddict.SourceCode.zip differ diff --git a/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip b/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip index 570d22f3a9..30f15f37dc 100644 Binary files a/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip and b/source-code/Volo.Abp.PermissionManagement.SourceCode/Volo.Abp.PermissionManagement.SourceCode.zip differ diff --git a/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip b/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip index 469b0b5584..3a6daf0ca1 100644 Binary files a/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip and b/source-code/Volo.Abp.SettingManagement.SourceCode/Volo.Abp.SettingManagement.SourceCode.zip differ diff --git a/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip b/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip index 44d7739eff..42bb65ff6b 100644 Binary files a/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip and b/source-code/Volo.Abp.TenantManagement.SourceCode/Volo.Abp.TenantManagement.SourceCode.zip differ diff --git a/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip b/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip index 1925c724ea..b14876c3ac 100644 Binary files a/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip and b/source-code/Volo.Abp.Users.SourceCode/Volo.Abp.Users.SourceCode.zip differ diff --git a/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip b/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip index 56f1cd2acf..4a9689cd37 100644 Binary files a/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip and b/source-code/Volo.Abp.VirtualFileExplorer.SourceCode/Volo.Abp.VirtualFileExplorer.SourceCode.zip differ diff --git a/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip b/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip index 6081d1e39b..0d559a17cc 100644 Binary files a/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip and b/source-code/Volo.Blogging.SourceCode/Volo.Blogging.SourceCode.zip differ diff --git a/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip b/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip index c508876724..7a517888bd 100644 Binary files a/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip and b/source-code/Volo.CmsKit.SourceCode/Volo.CmsKit.SourceCode.zip differ diff --git a/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip b/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip index d80581ad13..1a0ada00f2 100644 Binary files a/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip and b/source-code/Volo.Docs.SourceCode/Volo.Docs.SourceCode.zip differ diff --git a/templates/app-nolayers/angular/angular.json b/templates/app-nolayers/angular/angular.json index 0a99a4c08a..81d536178a 100644 --- a/templates/app-nolayers/angular/angular.json +++ b/templates/app-nolayers/angular/angular.json @@ -163,17 +163,7 @@ } }, "test": { - "builder": "@angular/build:karma", - "options": { - "browser": "src/test.ts", - "polyfills": ["src/polyfills.ts"], - "tsConfig": "tsconfig.spec.json", - "karmaConfig": "karma.conf.js", - "inlineStyleLanguage": "scss", - "assets": ["src/favicon.ico", "src/assets"], - "styles": ["src/styles.scss"], - "scripts": [] - } + "builder": "@angular/build:unit-test" }, "lint": { "builder": "@angular-eslint/builder:lint", diff --git a/templates/app-nolayers/angular/karma.conf.js b/templates/app-nolayers/angular/karma.conf.js deleted file mode 100644 index b06ddef227..0000000000 --- a/templates/app-nolayers/angular/karma.conf.js +++ /dev/null @@ -1,44 +0,0 @@ -// Karma configuration file, see link for more information -// https://karma-runner.github.io/1.0/config/configuration-file.html - -module.exports = function (config) { - config.set({ - basePath: '', - frameworks: ['jasmine', '@angular-devkit/build-angular'], - plugins: [ - require('karma-jasmine'), - require('karma-chrome-launcher'), - require('karma-jasmine-html-reporter'), - require('karma-coverage'), - - ], - client: { - jasmine: { - // you can add configuration options for Jasmine here - // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html - // for example, you can disable the random execution with `random: false` - // or set a specific seed with `seed: 4321` - }, - clearContext: false // leave Jasmine Spec Runner output visible in browser - }, - jasmineHtmlReporter: { - suppressAll: true // removes the duplicated traces - }, - coverageReporter: { - dir: require('path').join(__dirname, './coverage/MyProjectName'), - subdir: '.', - reporters: [ - { type: 'html' }, - { type: 'text-summary' } - ] - }, - reporters: ['progress', 'kjhtml'], - port: 9876, - colors: true, - logLevel: config.LOG_INFO, - autoWatch: true, - browsers: ['Chrome'], - singleRun: false, - restartOnFileChange: true - }); -}; diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index b22f9965da..3394244b1e 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -12,15 +12,15 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~10.1.0-rc.2", - "@abp/ng.components": "~10.1.0-rc.2", - "@abp/ng.core": "~10.1.0-rc.2", - "@abp/ng.identity": "~10.1.0-rc.2", - "@abp/ng.oauth": "~10.1.0-rc.2", - "@abp/ng.setting-management": "~10.1.0-rc.2", - "@abp/ng.tenant-management": "~10.1.0-rc.2", - "@abp/ng.theme.lepton-x": "~5.1.0-rc.2", - "@abp/ng.theme.shared": "~10.1.0-rc.2", + "@abp/ng.account": "~10.1.0", + "@abp/ng.components": "~10.1.0", + "@abp/ng.core": "~10.1.0", + "@abp/ng.identity": "~10.1.0", + "@abp/ng.oauth": "~10.1.0", + "@abp/ng.setting-management": "~10.1.0", + "@abp/ng.tenant-management": "~10.1.0", + "@abp/ng.theme.lepton-x": "~5.1.0", + "@abp/ng.theme.shared": "~10.1.0", "@angular/animations": "~21.0.0", "@angular/aria": "~21.1.0", "@angular/common": "~21.0.0", @@ -37,7 +37,7 @@ "zone.js": "~0.15.0" }, "devDependencies": { - "@abp/ng.schematics": "~10.1.0-rc.2", + "@abp/ng.schematics": "~10.1.0", "@angular-eslint/builder": "~21.0.0", "@angular-eslint/eslint-plugin": "~21.0.0", "@angular-eslint/eslint-plugin-template": "~21.0.0", @@ -47,17 +47,12 @@ "@angular/cli": "~21.0.0", "@angular/compiler-cli": "~21.0.0", "@angular/language-service": "~21.0.0", - "@types/jasmine": "~3.6.0", "@types/node": "^12.11.1", "@typescript-eslint/eslint-plugin": "7.16.0", "@typescript-eslint/parser": "7.16.0", "eslint": "^8.0.0", - "jasmine-core": "~4.0.0", - "karma": "~6.4.4", - "karma-chrome-launcher": "~3.1.0", - "karma-coverage": "~2.1.0", - "karma-jasmine": "~4.0.0", - "karma-jasmine-html-reporter": "^1.7.0", - "typescript": "~5.9.0" + "jsdom": "^27.1.0", + "typescript": "~5.9.0", + "vitest": "^4.0.0" } } \ No newline at end of file diff --git a/templates/app-nolayers/angular/src/app/home/home.component.spec.ts b/templates/app-nolayers/angular/src/app/home/home.component.spec.ts index 9fb41df29a..ea07d9ad36 100644 --- a/templates/app-nolayers/angular/src/app/home/home.component.spec.ts +++ b/templates/app-nolayers/angular/src/app/home/home.component.spec.ts @@ -1,54 +1,52 @@ import { CoreTestingModule } from '@abp/ng.core/testing'; import { ThemeSharedTestingModule } from '@abp/ng.theme.shared/testing'; -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NgxValidateCoreModule } from '@ngx-validate/core'; import { HomeComponent } from './home.component'; -import { OAuthService } from 'angular-oauth2-oidc'; import { AuthService } from '@abp/ng.core'; +import { vi } from 'vitest'; describe('HomeComponent', () => { let fixture: ComponentFixture; - const mockOAuthService = jasmine.createSpyObj('OAuthService', ['hasValidAccessToken']); - const mockAuthService = jasmine.createSpyObj('AuthService', ['navigateToLogin']); - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [HomeComponent], + let mockAuthService: { isAuthenticated: boolean; navigateToLogin: ReturnType }; + + beforeEach(async () => { + mockAuthService = { + isAuthenticated: false, + navigateToLogin: vi.fn(), + }; + + await TestBed.configureTestingModule({ imports: [ CoreTestingModule.withConfig(), ThemeSharedTestingModule.withConfig(), NgxValidateCoreModule, + HomeComponent, ], providers: [ - /* mock providers here */ - { - provide: OAuthService, - useValue: mockOAuthService, - }, { provide: AuthService, useValue: mockAuthService, }, ], }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(HomeComponent); - fixture.detectChanges(); }); it('should be initiated', () => { + fixture = TestBed.createComponent(HomeComponent); + fixture.detectChanges(); expect(fixture.componentInstance).toBeTruthy(); }); describe('when login state is true', () => { - beforeAll(() => { - mockOAuthService.hasValidAccessToken.and.returnValue(true); + beforeEach(() => { + mockAuthService.isAuthenticated = true; + fixture = TestBed.createComponent(HomeComponent); + fixture.detectChanges(); }); it('hasLoggedIn should be true', () => { - expect(fixture.componentInstance.hasLoggedIn).toBeTrue(); - expect(mockOAuthService.hasValidAccessToken).toHaveBeenCalled(); + expect(fixture.componentInstance.hasLoggedIn).toBe(true); }); it('button should not be exists', () => { diff --git a/templates/app-nolayers/angular/src/test.ts b/templates/app-nolayers/angular/src/test.ts deleted file mode 100644 index 3b701bbfa0..0000000000 --- a/templates/app-nolayers/angular/src/test.ts +++ /dev/null @@ -1,13 +0,0 @@ -// This file is required by karma.conf.js and loads recursively all the .spec and framework files -import 'zone.js/testing'; -import { getTestBed } from '@angular/core/testing'; -import { - BrowserDynamicTestingModule, - platformBrowserDynamicTesting, -} from '@angular/platform-browser-dynamic/testing'; - -// First, initialize the Angular testing environment. -getTestBed().initTestEnvironment( - BrowserDynamicTestingModule, - platformBrowserDynamicTesting() -); diff --git a/templates/app-nolayers/angular/tsconfig.app.json b/templates/app-nolayers/angular/tsconfig.app.json index 82d91dc4a4..264f459bf8 100644 --- a/templates/app-nolayers/angular/tsconfig.app.json +++ b/templates/app-nolayers/angular/tsconfig.app.json @@ -1,15 +1,15 @@ -/* To learn more about this file see: https://angular.io/config/tsconfig. */ +/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */ +/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */ { "extends": "./tsconfig.json", "compilerOptions": { "outDir": "./out-tsc/app", "types": [] }, - "files": [ - "src/main.ts", - "src/polyfills.ts" - ], "include": [ - "src/**/*.d.ts" + "src/**/*.ts" + ], + "exclude": [ + "src/**/*.spec.ts" ] } diff --git a/templates/app-nolayers/angular/tsconfig.spec.json b/templates/app-nolayers/angular/tsconfig.spec.json index 092345b02e..d38370633f 100644 --- a/templates/app-nolayers/angular/tsconfig.spec.json +++ b/templates/app-nolayers/angular/tsconfig.spec.json @@ -1,18 +1,15 @@ -/* To learn more about this file see: https://angular.io/config/tsconfig. */ +/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */ +/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */ { "extends": "./tsconfig.json", "compilerOptions": { "outDir": "./out-tsc/spec", "types": [ - "jasmine" + "vitest/globals" ] }, - "files": [ - "src/test.ts", - "src/polyfills.ts" - ], "include": [ - "src/**/*.spec.ts", - "src/**/*.d.ts" + "src/**/*.d.ts", + "src/**/*.spec.ts" ] } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json index 3369e91103..53a9e4698e 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.components.server.leptonxlitetheme": "~5.1.0-rc.2", - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0-rc.2" + "@abp/aspnetcore.components.server.leptonxlitetheme": "~5.1.0", + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json index 05b853bd30..d02d9cbfcf 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0-rc.2", - "@abp/aspnetcore.components.server.leptonxlitetheme": "~5.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0", + "@abp/aspnetcore.components.server.leptonxlitetheme": "~5.1.0" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json index ca7fd1e83f..082139a2d1 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json index ca7fd1e83f..082139a2d1 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json index ca7fd1e83f..082139a2d1 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json index ca7fd1e83f..082139a2d1 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json index ca7fd1e83f..082139a2d1 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json index ca7fd1e83f..082139a2d1 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0" } } diff --git a/templates/app/angular/angular.json b/templates/app/angular/angular.json index 0a99a4c08a..81d536178a 100644 --- a/templates/app/angular/angular.json +++ b/templates/app/angular/angular.json @@ -163,17 +163,7 @@ } }, "test": { - "builder": "@angular/build:karma", - "options": { - "browser": "src/test.ts", - "polyfills": ["src/polyfills.ts"], - "tsConfig": "tsconfig.spec.json", - "karmaConfig": "karma.conf.js", - "inlineStyleLanguage": "scss", - "assets": ["src/favicon.ico", "src/assets"], - "styles": ["src/styles.scss"], - "scripts": [] - } + "builder": "@angular/build:unit-test" }, "lint": { "builder": "@angular-eslint/builder:lint", diff --git a/templates/app/angular/karma.conf.js b/templates/app/angular/karma.conf.js deleted file mode 100644 index b06ddef227..0000000000 --- a/templates/app/angular/karma.conf.js +++ /dev/null @@ -1,44 +0,0 @@ -// Karma configuration file, see link for more information -// https://karma-runner.github.io/1.0/config/configuration-file.html - -module.exports = function (config) { - config.set({ - basePath: '', - frameworks: ['jasmine', '@angular-devkit/build-angular'], - plugins: [ - require('karma-jasmine'), - require('karma-chrome-launcher'), - require('karma-jasmine-html-reporter'), - require('karma-coverage'), - - ], - client: { - jasmine: { - // you can add configuration options for Jasmine here - // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html - // for example, you can disable the random execution with `random: false` - // or set a specific seed with `seed: 4321` - }, - clearContext: false // leave Jasmine Spec Runner output visible in browser - }, - jasmineHtmlReporter: { - suppressAll: true // removes the duplicated traces - }, - coverageReporter: { - dir: require('path').join(__dirname, './coverage/MyProjectName'), - subdir: '.', - reporters: [ - { type: 'html' }, - { type: 'text-summary' } - ] - }, - reporters: ['progress', 'kjhtml'], - port: 9876, - colors: true, - logLevel: config.LOG_INFO, - autoWatch: true, - browsers: ['Chrome'], - singleRun: false, - restartOnFileChange: true - }); -}; diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index af7f564bc8..a65c45973c 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -12,15 +12,15 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~10.1.0-rc.2", - "@abp/ng.components": "~10.1.0-rc.2", - "@abp/ng.core": "~10.1.0-rc.2", - "@abp/ng.identity": "~10.1.0-rc.2", - "@abp/ng.oauth": "~10.1.0-rc.2", - "@abp/ng.setting-management": "~10.1.0-rc.2", - "@abp/ng.tenant-management": "~10.1.0-rc.2", - "@abp/ng.theme.lepton-x": "~5.1.0-rc.2", - "@abp/ng.theme.shared": "~10.1.0-rc.2", + "@abp/ng.account": "~10.1.0", + "@abp/ng.components": "~10.1.0", + "@abp/ng.core": "~10.1.0", + "@abp/ng.identity": "~10.1.0", + "@abp/ng.oauth": "~10.1.0", + "@abp/ng.setting-management": "~10.1.0", + "@abp/ng.tenant-management": "~10.1.0", + "@abp/ng.theme.lepton-x": "~5.1.0", + "@abp/ng.theme.shared": "~10.1.0", "@angular/animations": "~21.0.0", "@angular/aria": "~21.1.0", "@angular/common": "~21.0.0", @@ -37,7 +37,7 @@ "zone.js": "~0.15.0" }, "devDependencies": { - "@abp/ng.schematics": "~10.1.0-rc.2", + "@abp/ng.schematics": "~10.1.0", "@angular-eslint/builder": "~21.0.0", "@angular-eslint/eslint-plugin": "~21.0.0", "@angular-eslint/eslint-plugin-template": "~21.0.0", @@ -47,17 +47,12 @@ "@angular/cli": "~21.0.0", "@angular/compiler-cli": "~21.0.0", "@angular/language-service": "~21.0.0", - "@types/jasmine": "~3.6.0", "@types/node": "~20.11.0", "@typescript-eslint/eslint-plugin": "7.16.0", "@typescript-eslint/parser": "7.16.0", "eslint": "^8.0.0", - "jasmine-core": "~4.0.0", - "karma": "~6.4.4", - "karma-chrome-launcher": "~3.1.0", - "karma-coverage": "~2.1.0", - "karma-jasmine": "~4.0.0", - "karma-jasmine-html-reporter": "^1.7.0", - "typescript": "~5.9.3" + "jsdom": "^27.1.0", + "typescript": "~5.9.3", + "vitest": "^4.0.0" } -} \ No newline at end of file +} \ No newline at end of file diff --git a/templates/app/angular/src/app/home/home.component.html b/templates/app/angular/src/app/home/home.component.html index 83f1f9619e..e3ffd708c1 100644 --- a/templates/app/angular/src/app/home/home.component.html +++ b/templates/app/angular/src/app/home/home.component.html @@ -1,5 +1,4 @@
    -
    diff --git a/templates/app/angular/src/app/home/home.component.spec.ts b/templates/app/angular/src/app/home/home.component.spec.ts index 2243bfca92..4efbb17f0d 100644 --- a/templates/app/angular/src/app/home/home.component.spec.ts +++ b/templates/app/angular/src/app/home/home.component.spec.ts @@ -1,98 +1,88 @@ import { CoreTestingModule } from "@abp/ng.core/testing"; import { ThemeSharedTestingModule } from "@abp/ng.theme.shared/testing"; -import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing"; +import { ComponentFixture, TestBed } from "@angular/core/testing"; import { NgxValidateCoreModule } from "@ngx-validate/core"; import { HomeComponent } from "./home.component"; -import { OAuthService } from 'angular-oauth2-oidc'; import { AuthService } from '@abp/ng.core'; +import { vi } from 'vitest'; describe("HomeComponent", () => { let fixture: ComponentFixture; - const mockOAuthService = jasmine.createSpyObj('OAuthService', ['hasValidAccessToken']) - const mockAuthService = jasmine.createSpyObj('AuthService', ['navigateToLogin']) - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [], - imports: [ - CoreTestingModule.withConfig(), - ThemeSharedTestingModule.withConfig(), - NgxValidateCoreModule, - HomeComponent - ], - providers: [ - /* mock providers here */ - { - provide: OAuthService, - useValue: mockOAuthService - }, - { - provide: AuthService, - useValue: mockAuthService - } - ], - }).compileComponents(); - }) - ); - - beforeEach(() => { - fixture = TestBed.createComponent(HomeComponent); - fixture.detectChanges(); + let mockAuthService: { isAuthenticated: boolean; navigateToLogin: ReturnType }; + + beforeEach(async () => { + mockAuthService = { + isAuthenticated: false, + navigateToLogin: vi.fn() + }; + + await TestBed.configureTestingModule({ + imports: [ + CoreTestingModule.withConfig(), + ThemeSharedTestingModule.withConfig(), + NgxValidateCoreModule, + HomeComponent + ], + providers: [ + { + provide: AuthService, + useValue: mockAuthService + } + ], + }).compileComponents(); }); it("should be initiated", () => { + fixture = TestBed.createComponent(HomeComponent); + fixture.detectChanges(); expect(fixture.componentInstance).toBeTruthy(); }); - - describe('when login state is true', () => { - beforeAll(() => { - mockOAuthService.hasValidAccessToken.and.returnValue(true) + beforeEach(() => { + mockAuthService.isAuthenticated = true; + fixture = TestBed.createComponent(HomeComponent); + fixture.detectChanges(); }); it("hasLoggedIn should be true", () => { - - expect(fixture.componentInstance.hasLoggedIn).toBeTrue(); - expect(mockOAuthService.hasValidAccessToken).toHaveBeenCalled() - }) + expect(fixture.componentInstance.hasLoggedIn).toBe(true); + }); it("button should not be exists", () => { - const element = fixture.nativeElement - const button = element.querySelector('[role="button"]') - expect(button).toBeNull() - }) - - }) + const element = fixture.nativeElement; + const button = element.querySelector('[role="button"]'); + expect(button).toBeNull(); + }); + }); describe('when login state is false', () => { - beforeAll(() => { - mockOAuthService.hasValidAccessToken.and.returnValue(false) + beforeEach(() => { + mockAuthService.isAuthenticated = false; + fixture = TestBed.createComponent(HomeComponent); + fixture.detectChanges(); }); it("hasLoggedIn should be false", () => { - - expect(fixture.componentInstance.hasLoggedIn).toBeFalse(); - expect(mockOAuthService.hasValidAccessToken).toHaveBeenCalled() - }) + expect(fixture.componentInstance.hasLoggedIn).toBe(false); + }); it("button should be exists", () => { - const element = fixture.nativeElement - const button = element.querySelector('[role="button"]') - expect(button).toBeDefined() - }) - describe('when button clicked', () => { + const element = fixture.nativeElement; + const button = element.querySelector('[role="button"]'); + expect(button).toBeDefined(); + }); + describe('when button clicked', () => { beforeEach(() => { - const element = fixture.nativeElement - const button = element.querySelector('[role="button"]') - button.click() + const element = fixture.nativeElement; + const button = element.querySelector('[role="button"]'); + button.click(); }); it("navigateToLogin have been called", () => { - expect(mockAuthService.navigateToLogin).toHaveBeenCalled() - }) - }) - }) - + expect(mockAuthService.navigateToLogin).toHaveBeenCalled(); + }); + }); + }); }); diff --git a/templates/app/angular/src/app/home/home.component.ts b/templates/app/angular/src/app/home/home.component.ts index ee6bd838c9..68e7b4db97 100644 --- a/templates/app/angular/src/app/home/home.component.ts +++ b/templates/app/angular/src/app/home/home.component.ts @@ -1,13 +1,13 @@ -import {AuthService, LocalizationPipe} from '@abp/ng.core'; +import { AuthService, LocalizationPipe } from '@abp/ng.core'; import { Component, inject } from '@angular/core'; -import {NgTemplateOutlet} from "@angular/common"; -import {DynamicFormComponent, FormFieldConfig} from "@abp/ng.components/dynamic-form"; +import { NgTemplateOutlet } from '@angular/common'; +import { DynamicFormComponent, FormFieldConfig } from '@abp/ng.components/dynamic-form'; @Component({ selector: 'app-home', templateUrl: './home.component.html', styleUrls: ['./home.component.scss'], - imports: [NgTemplateOutlet, LocalizationPipe, DynamicFormComponent] + imports: [NgTemplateOutlet, LocalizationPipe, DynamicFormComponent], }) export class HomeComponent { private authService = inject(AuthService); @@ -22,10 +22,10 @@ export class HomeComponent { required: true, validators: [ { type: 'required', message: 'First name is required' }, - { type: 'minLength', value: 2, message: 'Minimum 2 characters required' } + { type: 'minLength', value: 2, message: 'Minimum 2 characters required' }, ], gridSize: 6, - order: 1 + order: 1, }, { key: 'lastName', @@ -33,11 +33,9 @@ export class HomeComponent { label: 'Last Name', placeholder: 'Enter last name', required: true, - validators: [ - { type: 'required', message: 'Last name is required' } - ], + validators: [{ type: 'required', message: 'Last name is required' }], gridSize: 12, - order: 3 + order: 3, }, { key: 'email', @@ -47,25 +45,25 @@ export class HomeComponent { required: true, validators: [ { type: 'required', message: 'Email is required' }, - { type: 'email', message: 'Please enter a valid email' } + { type: 'email', message: 'Please enter a valid email' }, ], gridSize: 6, - order: 2 + order: 2, }, { key: 'userType', type: 'select', label: 'User Type', required: true, - options: [ - { key: 'admin', value: 'Administrator' }, - { key: 'user', value: 'Regular User' }, - { key: 'guest', value: 'Guest User' } - ], - validators: [ - { type: 'required', message: 'Please select user type' } - ], - order: 4 + options: { + defaultValues: [ + { key: 'admin', value: 'Administrator' }, + { key: 'user', value: 'Regular User' }, + { key: 'guest', value: 'Guest User' }, + ], + }, + validators: [{ type: 'required', message: 'Please select user type' }], + order: 4, }, { key: 'adminNotes', @@ -77,11 +75,11 @@ export class HomeComponent { dependsOn: 'userType', condition: 'equals', value: 'admin', - action: 'show' - } + action: 'show', + }, ], - order: 5 - } + order: 5, + }, ]; get hasLoggedIn(): boolean { diff --git a/templates/app/angular/src/test.ts b/templates/app/angular/src/test.ts deleted file mode 100644 index 3b701bbfa0..0000000000 --- a/templates/app/angular/src/test.ts +++ /dev/null @@ -1,13 +0,0 @@ -// This file is required by karma.conf.js and loads recursively all the .spec and framework files -import 'zone.js/testing'; -import { getTestBed } from '@angular/core/testing'; -import { - BrowserDynamicTestingModule, - platformBrowserDynamicTesting, -} from '@angular/platform-browser-dynamic/testing'; - -// First, initialize the Angular testing environment. -getTestBed().initTestEnvironment( - BrowserDynamicTestingModule, - platformBrowserDynamicTesting() -); diff --git a/templates/app/angular/tsconfig.app.json b/templates/app/angular/tsconfig.app.json index 82d91dc4a4..264f459bf8 100644 --- a/templates/app/angular/tsconfig.app.json +++ b/templates/app/angular/tsconfig.app.json @@ -1,15 +1,15 @@ -/* To learn more about this file see: https://angular.io/config/tsconfig. */ +/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */ +/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */ { "extends": "./tsconfig.json", "compilerOptions": { "outDir": "./out-tsc/app", "types": [] }, - "files": [ - "src/main.ts", - "src/polyfills.ts" - ], "include": [ - "src/**/*.d.ts" + "src/**/*.ts" + ], + "exclude": [ + "src/**/*.spec.ts" ] } diff --git a/templates/app/angular/tsconfig.spec.json b/templates/app/angular/tsconfig.spec.json index 092345b02e..d38370633f 100644 --- a/templates/app/angular/tsconfig.spec.json +++ b/templates/app/angular/tsconfig.spec.json @@ -1,18 +1,15 @@ -/* To learn more about this file see: https://angular.io/config/tsconfig. */ +/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */ +/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */ { "extends": "./tsconfig.json", "compilerOptions": { "outDir": "./out-tsc/spec", "types": [ - "jasmine" + "vitest/globals" ] }, - "files": [ - "src/test.ts", - "src/polyfills.ts" - ], "include": [ - "src/**/*.spec.ts", - "src/**/*.d.ts" + "src/**/*.d.ts", + "src/**/*.spec.ts" ] } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json index f8c0f62c92..1dfdde8988 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-authserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json index 05b853bd30..d02d9cbfcf 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0-rc.2", - "@abp/aspnetcore.components.server.leptonxlitetheme": "~5.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0", + "@abp/aspnetcore.components.server.leptonxlitetheme": "~5.1.0" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json index 05b853bd30..d02d9cbfcf 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0-rc.2", - "@abp/aspnetcore.components.server.leptonxlitetheme": "~5.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0", + "@abp/aspnetcore.components.server.leptonxlitetheme": "~5.1.0" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/package.json index 05b853bd30..d02d9cbfcf 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0-rc.2", - "@abp/aspnetcore.components.server.leptonxlitetheme": "~5.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0", + "@abp/aspnetcore.components.server.leptonxlitetheme": "~5.1.0" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/package.json index 05b853bd30..d02d9cbfcf 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0-rc.2", - "@abp/aspnetcore.components.server.leptonxlitetheme": "~5.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0", + "@abp/aspnetcore.components.server.leptonxlitetheme": "~5.1.0" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json index ca7fd1e83f..082139a2d1 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json index ca7fd1e83f..082139a2d1 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json index ca7fd1e83f..082139a2d1 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~5.1.0" } } diff --git a/templates/module/angular/angular.json b/templates/module/angular/angular.json index 8c1b576257..62b319d275 100644 --- a/templates/module/angular/angular.json +++ b/templates/module/angular/angular.json @@ -28,12 +28,7 @@ "defaultConfiguration": "production" }, "test": { - "builder": "@angular/build:karma", - "options": { - "main": "projects/my-project-name/src/test.ts", - "tsConfig": "projects/my-project-name/tsconfig.spec.json", - "karmaConfig": "projects/my-project-name/karma.conf.js" - } + "builder": "@angular/build:unit-test" }, "lint": { "builder": "@angular-eslint/builder:lint", @@ -157,25 +152,7 @@ } }, "test": { - "builder": "@angular/build:karma", - "options": { - "browser": "projects/dev-app/src/test.ts", - "polyfills": ["projects/dev-app/src/polyfills.ts"], - "tsConfig": "projects/dev-app/tsconfig.spec.json", - "karmaConfig": "projects/dev-app/karma.conf.js", - "inlineStyleLanguage": "scss", - "assets": ["projects/dev-app/src/favicon.ico", "projects/dev-app/src/assets"], - "styles": [ - "node_modules/bootstrap/dist/css/bootstrap.min.css", - "node_modules/@fortawesome/fontawesome-free/css/all.min.css", - "node_modules/@fortawesome/fontawesome-free/css/v4-shims.min.css", - "node_modules/@swimlane/ngx-datatable/index.css", - "node_modules/@swimlane/ngx-datatable/assets/icons.css", - "node_modules/@swimlane/ngx-datatable/themes/material.css", - "projects/dev-app/src/styles.scss" - ], - "scripts": [] - } + "builder": "@angular/build:unit-test" }, "lint": { "builder": "@angular-eslint/builder:lint", diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index 2edba4edac..cd399387f1 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -13,15 +13,15 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~10.1.0-rc.2", - "@abp/ng.components": "~10.1.0-rc.2", - "@abp/ng.core": "~10.1.0-rc.2", - "@abp/ng.identity": "~10.1.0-rc.2", - "@abp/ng.oauth": "~10.1.0-rc.2", - "@abp/ng.setting-management": "~10.1.0-rc.2", - "@abp/ng.tenant-management": "~10.1.0-rc.2", - "@abp/ng.theme.basic": "~10.1.0-rc.2", - "@abp/ng.theme.shared": "~10.1.0-rc.2", + "@abp/ng.account": "~10.1.0", + "@abp/ng.components": "~10.1.0", + "@abp/ng.core": "~10.1.0", + "@abp/ng.identity": "~10.1.0", + "@abp/ng.oauth": "~10.1.0", + "@abp/ng.setting-management": "~10.1.0", + "@abp/ng.tenant-management": "~10.1.0", + "@abp/ng.theme.basic": "~10.1.0", + "@abp/ng.theme.shared": "~10.1.0", "@angular/animations": "~21.0.0", "@angular/aria": "~21.1.0", "@angular/common": "~21.0.0", @@ -37,7 +37,7 @@ "zone.js": "~0.15.0" }, "devDependencies": { - "@abp/ng.schematics": "~10.1.0-rc.2", + "@abp/ng.schematics": "~10.1.0", "@angular-eslint/builder": "~21.0.0", "@angular-eslint/eslint-plugin": "~21.0.0", "@angular-eslint/eslint-plugin-template": "~21.0.0", @@ -47,19 +47,14 @@ "@angular/cli": "~21.0.0", "@angular/compiler-cli": "~21.0.0", "@angular/language-service": "~21.0.0", - "@types/jasmine": "~3.6.0", "@types/node": "^12.11.1", "@typescript-eslint/eslint-plugin": "7.16.0", "@typescript-eslint/parser": "7.16.0", "eslint": "^8.0.0", - "jasmine-core": "~4.0.0", - "karma": "~6.4.4", - "karma-chrome-launcher": "~3.1.0", - "karma-coverage": "~2.1.0", - "karma-jasmine": "~4.0.0", - "karma-jasmine-html-reporter": "^1.7.0", + "jsdom": "^27.1.0", "ng-packagr": "~21.0.0", "symlink": "^2.0.0", - "typescript": "~5.9.0" + "typescript": "~5.9.0", + "vitest": "^4.0.0" } } \ No newline at end of file diff --git a/templates/module/angular/projects/dev-app/karma.conf.js b/templates/module/angular/projects/dev-app/karma.conf.js deleted file mode 100644 index eee6000f3a..0000000000 --- a/templates/module/angular/projects/dev-app/karma.conf.js +++ /dev/null @@ -1,44 +0,0 @@ -// Karma configuration file, see link for more information -// https://karma-runner.github.io/1.0/config/configuration-file.html - -module.exports = function (config) { - config.set({ - basePath: '', - frameworks: ['jasmine', '@angular-devkit/build-angular'], - plugins: [ - require('karma-jasmine'), - require('karma-chrome-launcher'), - require('karma-jasmine-html-reporter'), - require('karma-coverage'), - - ], - client: { - jasmine: { - // you can add configuration options for Jasmine here - // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html - // for example, you can disable the random execution with `random: false` - // or set a specific seed with `seed: 4321` - }, - clearContext: false // leave Jasmine Spec Runner output visible in browser - }, - jasmineHtmlReporter: { - suppressAll: true // removes the duplicated traces - }, - coverageReporter: { - dir: require('path').join(__dirname, '../../coverage/dev-app'), - subdir: '.', - reporters: [ - { type: 'html' }, - { type: 'text-summary' } - ] - }, - reporters: ['progress', 'kjhtml'], - port: 9876, - colors: true, - logLevel: config.LOG_INFO, - autoWatch: true, - browsers: ['Chrome'], - singleRun: false, - restartOnFileChange: true - }); -}; diff --git a/templates/module/angular/projects/dev-app/src/test.ts b/templates/module/angular/projects/dev-app/src/test.ts deleted file mode 100644 index 7632e27a11..0000000000 --- a/templates/module/angular/projects/dev-app/src/test.ts +++ /dev/null @@ -1,14 +0,0 @@ -// This file is required by karma.conf.js and loads recursively all the .spec and framework files - -import 'zone.js/testing'; -import { getTestBed } from '@angular/core/testing'; -import { - BrowserDynamicTestingModule, - platformBrowserDynamicTesting -} from '@angular/platform-browser-dynamic/testing'; - -// First, initialize the Angular testing environment. -getTestBed().initTestEnvironment( - BrowserDynamicTestingModule, - platformBrowserDynamicTesting() -); diff --git a/templates/module/angular/projects/dev-app/tsconfig.app.json b/templates/module/angular/projects/dev-app/tsconfig.app.json index 809c09ca71..742c48812c 100644 --- a/templates/module/angular/projects/dev-app/tsconfig.app.json +++ b/templates/module/angular/projects/dev-app/tsconfig.app.json @@ -1,14 +1,15 @@ +/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */ +/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */ { "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "../../out-tsc/app", "types": [] }, - "files": [ - "src/main.ts", - "src/polyfills.ts" - ], "include": [ - "src/**/*.d.ts" + "src/**/*.ts" + ], + "exclude": [ + "src/**/*.spec.ts" ] } diff --git a/templates/module/angular/projects/dev-app/tsconfig.spec.json b/templates/module/angular/projects/dev-app/tsconfig.spec.json index a8ce1d396b..ff7db766ac 100644 --- a/templates/module/angular/projects/dev-app/tsconfig.spec.json +++ b/templates/module/angular/projects/dev-app/tsconfig.spec.json @@ -1,18 +1,16 @@ +/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */ +/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */ { "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "../../out-tsc/spec", "types": [ - "jasmine", + "vitest/globals", "node" ] }, - "files": [ - "src/test.ts", - "src/polyfills.ts" - ], "include": [ - "src/**/*.spec.ts", - "src/**/*.d.ts" + "src/**/*.d.ts", + "src/**/*.spec.ts" ] } diff --git a/templates/module/angular/projects/my-project-name/karma.conf.js b/templates/module/angular/projects/my-project-name/karma.conf.js deleted file mode 100644 index 4fa9d617e5..0000000000 --- a/templates/module/angular/projects/my-project-name/karma.conf.js +++ /dev/null @@ -1,44 +0,0 @@ -// Karma configuration file, see link for more information -// https://karma-runner.github.io/1.0/config/configuration-file.html - -module.exports = function (config) { - config.set({ - basePath: '', - frameworks: ['jasmine', '@angular-devkit/build-angular'], - plugins: [ - require('karma-jasmine'), - require('karma-chrome-launcher'), - require('karma-jasmine-html-reporter'), - require('karma-coverage'), - - ], - client: { - jasmine: { - // you can add configuration options for Jasmine here - // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html - // for example, you can disable the random execution with `random: false` - // or set a specific seed with `seed: 4321` - }, - clearContext: false // leave Jasmine Spec Runner output visible in browser - }, - jasmineHtmlReporter: { - suppressAll: true // removes the duplicated traces - }, - coverageReporter: { - dir: require('path').join(__dirname, '../../coverage/my-project-name'), - subdir: '.', - reporters: [ - { type: 'html' }, - { type: 'text-summary' } - ] - }, - reporters: ['progress', 'kjhtml'], - port: 9876, - colors: true, - logLevel: config.LOG_INFO, - autoWatch: true, - browsers: ['Chrome'], - singleRun: false, - restartOnFileChange: true - }); -}; diff --git a/templates/module/angular/projects/my-project-name/package.json b/templates/module/angular/projects/my-project-name/package.json index 5b2413bd3d..1084134e47 100644 --- a/templates/module/angular/projects/my-project-name/package.json +++ b/templates/module/angular/projects/my-project-name/package.json @@ -4,8 +4,8 @@ "peerDependencies": { "@angular/common": "~19.1.0", "@angular/core": "~19.1.0", - "@abp/ng.core": "~10.1.0-rc.2", - "@abp/ng.theme.shared": "~10.1.0-rc.2" + "@abp/ng.core": "~10.1.0", + "@abp/ng.theme.shared": "~10.1.0" }, "dependencies": { "tslib": "^2.1.0" diff --git a/templates/module/angular/projects/my-project-name/src/lib/my-project-name.component.spec.ts b/templates/module/angular/projects/my-project-name/src/lib/my-project-name.component.spec.ts index 4d6aae3ac8..6176f4d6c6 100644 --- a/templates/module/angular/projects/my-project-name/src/lib/my-project-name.component.spec.ts +++ b/templates/module/angular/projects/my-project-name/src/lib/my-project-name.component.spec.ts @@ -1,17 +1,19 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MyProjectNameComponent } from './components/my-project-name.component'; import { MyProjectNameService } from '@my-company-name/my-project-name'; import { of } from 'rxjs'; +import { vi } from 'vitest'; describe('MyProjectNameComponent', () => { let component: MyProjectNameComponent; let fixture: ComponentFixture; - const mockMyProjectNameService = jasmine.createSpyObj('MyProjectNameService', { - sample: of([]), - }); - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [MyProjectNameComponent], + const mockMyProjectNameService = { + sample: vi.fn().mockReturnValue(of([])), + }; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [MyProjectNameComponent], providers: [ { provide: MyProjectNameService, @@ -19,7 +21,7 @@ describe('MyProjectNameComponent', () => { }, ], }).compileComponents(); - })); + }); beforeEach(() => { fixture = TestBed.createComponent(MyProjectNameComponent); diff --git a/templates/module/angular/projects/my-project-name/src/lib/my-project-name.service.spec.ts b/templates/module/angular/projects/my-project-name/src/lib/my-project-name.service.spec.ts index ec7aeb6c68..0782f6c0b6 100644 --- a/templates/module/angular/projects/my-project-name/src/lib/my-project-name.service.spec.ts +++ b/templates/module/angular/projects/my-project-name/src/lib/my-project-name.service.spec.ts @@ -1,10 +1,14 @@ import { TestBed } from '@angular/core/testing'; import { MyProjectNameService } from './services/my-project-name.service'; import { RestService } from '@abp/ng.core'; +import { vi } from 'vitest'; describe('MyProjectNameService', () => { let service: MyProjectNameService; - const mockRestService = jasmine.createSpyObj('RestService', ['request']); + const mockRestService = { + request: vi.fn(), + }; + beforeEach(() => { TestBed.configureTestingModule({ providers: [ diff --git a/templates/module/angular/projects/my-project-name/src/test.ts b/templates/module/angular/projects/my-project-name/src/test.ts deleted file mode 100644 index e63a876062..0000000000 --- a/templates/module/angular/projects/my-project-name/src/test.ts +++ /dev/null @@ -1,15 +0,0 @@ -// This file is required by karma.conf.js and loads recursively all the .spec and framework files - -import 'zone.js'; -import 'zone.js/testing'; -import { getTestBed } from '@angular/core/testing'; -import { - BrowserDynamicTestingModule, - platformBrowserDynamicTesting -} from '@angular/platform-browser-dynamic/testing'; - -// First, initialize the Angular testing environment. -getTestBed().initTestEnvironment( - BrowserDynamicTestingModule, - platformBrowserDynamicTesting() -); diff --git a/templates/module/angular/projects/my-project-name/tsconfig.spec.json b/templates/module/angular/projects/my-project-name/tsconfig.spec.json index 715dd0a5d2..d63beb540b 100644 --- a/templates/module/angular/projects/my-project-name/tsconfig.spec.json +++ b/templates/module/angular/projects/my-project-name/tsconfig.spec.json @@ -1,17 +1,15 @@ -/* To learn more about this file see: https://angular.io/config/tsconfig. */ +/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */ +/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */ { "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "../../out-tsc/spec", "types": [ - "jasmine" + "vitest/globals" ] }, - "files": [ - "src/test.ts" - ], "include": [ - "**/*.spec.ts", - "**/*.d.ts" + "**/*.d.ts", + "**/*.spec.ts" ] } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json index 214f77a570..7be3a2f0a3 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-authserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json index 11a6338595..41d2a4c885 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0-rc.2", - "@abp/aspnetcore.components.server.basictheme": "~10.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0", + "@abp/aspnetcore.components.server.basictheme": "~10.1.0" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json index 52a1fc6c21..e544c427a0 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json index 52a1fc6c21..e544c427a0 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.1.0" } }