create-windy 0.2.33 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli.js +173 -17
- package/package.json +1 -1
- package/template/.agents/skills/windy-business-module/SKILL.md +10 -1
- package/template/.windy-template.json +2 -2
- package/template/AGENTS.md +9 -0
- package/template/README.md +3 -1
- package/template/apps/agent-server/Dockerfile +1 -0
- package/template/apps/agent-server/README.md +28 -5
- package/template/apps/agent-server/adk_web_agents/__init__.py +1 -0
- package/template/apps/agent-server/adk_web_agents/safe_debug/__init__.py +3 -0
- package/template/apps/agent-server/adk_web_agents/safe_debug/agent.py +40 -0
- package/template/apps/agent-server/pyproject.toml +1 -1
- package/template/apps/agent-server/src/southwind_agent_server/adk_adapter.py +191 -16
- package/template/apps/agent-server/src/southwind_agent_server/adk_failure.py +13 -0
- package/template/apps/agent-server/src/southwind_agent_server/adk_model.py +225 -0
- package/template/apps/agent-server/src/southwind_agent_server/adk_tools.py +76 -0
- package/template/apps/agent-server/src/southwind_agent_server/app.py +63 -3
- package/template/apps/agent-server/src/southwind_agent_server/contracts.py +35 -0
- package/template/apps/agent-server/src/southwind_agent_server/engine.py +2 -0
- package/template/apps/agent-server/src/southwind_agent_server/openai_engine.py +31 -3
- package/template/apps/agent-server/src/southwind_agent_server/openai_provider.py +22 -9
- package/template/apps/agent-server/src/southwind_agent_server/provider_audit.py +144 -0
- package/template/apps/agent-server/src/southwind_agent_server/provider_governance.py +227 -0
- package/template/apps/agent-server/src/southwind_agent_server/service.py +1 -0
- package/template/apps/agent-server/tests/test_adk_adapter.py +305 -0
- package/template/apps/agent-server/tests/test_adk_web_agent.py +12 -0
- package/template/apps/agent-server/tests/test_api.py +16 -1
- package/template/apps/agent-server/tests/test_openai_provider.py +79 -0
- package/template/apps/agent-server/tests/test_provider_governance.py +215 -0
- package/template/apps/server/package.json +4 -1
- package/template/apps/server/src/agent/provider-input-governance.test.ts +82 -0
- package/template/apps/server/src/agent/provider-input-governance.ts +140 -0
- package/template/apps/server/src/agent/remote-runtime.test.ts +22 -0
- package/template/apps/server/src/agent/remote-runtime.ts +1 -0
- package/template/apps/server/src/agent/run-contracts.ts +2 -0
- package/template/apps/server/src/agent/run-facade.test.ts +52 -2
- package/template/apps/server/src/agent/run-facade.ts +38 -9
- package/template/apps/server/src/agent/tool-registry.ts +2 -6
- package/template/apps/server/src/application-services.ts +50 -0
- package/template/apps/server/src/audit/drizzle-log-store.ts +25 -0
- package/template/apps/server/src/audit/search-summary.ts +2 -6
- package/template/apps/server/src/auth/credential-restriction.ts +1 -0
- package/template/apps/server/src/auth/password.ts +30 -21
- package/template/apps/server/src/auth/routes.test.ts +44 -3
- package/template/apps/server/src/auth/routes.ts +6 -1
- package/template/apps/server/src/auth/runtime.ts +4 -1
- package/template/apps/server/src/auth/service.ts +25 -7
- package/template/apps/server/src/configuration/bootstrap.ts +20 -1
- package/template/apps/server/src/configuration/definition.test.ts +71 -0
- package/template/apps/server/src/configuration/definition.ts +242 -12
- package/template/apps/server/src/configuration/drizzle-repository.ts +36 -2
- package/template/apps/server/src/configuration/repository.ts +27 -2
- package/template/apps/server/src/configuration/routes.ts +4 -1
- package/template/apps/server/src/configuration/service.test.ts +100 -0
- package/template/apps/server/src/configuration/service.ts +50 -10
- package/template/apps/server/src/data-access/scoped-repository.integration.test.ts +3 -2
- package/template/apps/server/src/data-governance/export/service.ts +2 -6
- package/template/apps/server/src/example-modules.ts +4 -1
- package/template/apps/server/src/guards.ts +18 -5
- package/template/apps/server/src/http/request-source.test.ts +85 -0
- package/template/apps/server/src/http/request-source.ts +90 -0
- package/template/apps/server/src/index.ts +45 -45
- package/template/apps/server/src/license/routes.ts +2 -0
- package/template/apps/server/src/license/runtime-service.ts +10 -11
- package/template/apps/server/src/module-bootstrap.ts +2 -2
- package/template/apps/server/src/module-host/initialize-contracts.ts +6 -0
- package/template/apps/server/src/module-host/initialize.ts +30 -44
- package/template/apps/server/src/module-host/request-context.ts +29 -23
- package/template/apps/server/src/module-host/resource-file-policies.test.ts +197 -0
- package/template/apps/server/src/module-host/resource-file-policies.ts +108 -0
- package/template/apps/server/src/module-host/route-declaration.ts +45 -0
- package/template/apps/server/src/module-host/route-installer.ts +27 -3
- package/template/apps/server/src/module-host/storage-port.test.ts +170 -1
- package/template/apps/server/src/module-host/storage-port.ts +134 -1
- package/template/apps/server/src/module-host/storage-scope.ts +89 -0
- package/template/apps/server/src/module-host/tool-handlers.test.ts +305 -0
- package/template/apps/server/src/module-host/tool-handlers.ts +38 -4
- package/template/apps/server/src/module-host/user-directory-composition.test.ts +126 -0
- package/template/apps/server/src/module-host/user-directory-port.test.ts +238 -0
- package/template/apps/server/src/module-host/user-directory-port.ts +139 -0
- package/template/apps/server/src/module-host.ts +4 -0
- package/template/apps/server/src/notification/channel-adapter.ts +46 -0
- package/template/apps/server/src/notification/delivery-policy.test.ts +59 -0
- package/template/apps/server/src/notification/delivery-policy.ts +37 -0
- package/template/apps/server/src/notification/delivery-repository.ts +198 -0
- package/template/apps/server/src/notification/delivery-worker.test.ts +87 -0
- package/template/apps/server/src/notification/delivery-worker.ts +88 -0
- package/template/apps/server/src/notification/drizzle-management.ts +180 -0
- package/template/apps/server/src/notification/drizzle-query.ts +160 -0
- package/template/apps/server/src/notification/drizzle-repository.integration.test.ts +301 -0
- package/template/apps/server/src/notification/drizzle-repository.ts +156 -90
- package/template/apps/server/src/notification/extension-routes.test.ts +119 -0
- package/template/apps/server/src/notification/extension-routes.ts +111 -0
- package/template/apps/server/src/notification/memory-delivery-repository.ts +137 -0
- package/template/apps/server/src/notification/memory-support.ts +72 -0
- package/template/apps/server/src/notification/preference-repository.ts +95 -0
- package/template/apps/server/src/notification/recipient-directory.ts +104 -0
- package/template/apps/server/src/notification/repository.test.ts +171 -0
- package/template/apps/server/src/notification/repository.ts +179 -32
- package/template/apps/server/src/notification/revision-routes.test.ts +186 -0
- package/template/apps/server/src/notification/route-support.ts +225 -0
- package/template/apps/server/src/notification/routes.test.ts +182 -0
- package/template/apps/server/src/notification/routes.ts +225 -132
- package/template/apps/server/src/notification/service.test.ts +104 -0
- package/template/apps/server/src/notification/service.ts +140 -0
- package/template/apps/server/src/notification/smtp-adapter.test.ts +65 -0
- package/template/apps/server/src/notification/smtp-adapter.ts +68 -0
- package/template/apps/server/src/persistence.integration.test.ts +41 -2
- package/template/apps/server/src/route-guards.ts +1 -0
- package/template/apps/server/src/runtime-audit-list.test.ts +39 -0
- package/template/apps/server/src/runtime-development.ts +2 -0
- package/template/apps/server/src/runtime.test.ts +23 -9
- package/template/apps/server/src/runtime.ts +39 -2
- package/template/apps/server/src/scheduler/audit.ts +2 -11
- package/template/apps/server/src/scheduler/definitions.test.ts +6 -0
- package/template/apps/server/src/scheduler/definitions.ts +7 -0
- package/template/apps/server/src/scheduler/recovery-service.ts +2 -11
- package/template/apps/server/src/scheduler/routes.ts +2 -7
- package/template/apps/server/src/search/opensearch-client.test.ts +45 -0
- package/template/apps/server/src/search/opensearch-client.ts +145 -0
- package/template/apps/server/src/search/service.ts +2 -6
- package/template/apps/server/src/settings/routes.ts +15 -3
- package/template/apps/server/src/settings/runtime.ts +10 -1
- package/template/apps/server/src/storage/runtime.ts +13 -0
- package/template/apps/server/src/system/audit-query.ts +33 -4
- package/template/apps/server/src/system/audit-routes.test.ts +58 -4
- package/template/apps/server/src/system/audit-routes.ts +6 -5
- package/template/apps/server/src/system/built-in-roles.ts +1 -0
- package/template/apps/server/src/system/department-organization.ts +320 -0
- package/template/apps/server/src/system/department-routes.test.ts +207 -48
- package/template/apps/server/src/system/department-routes.ts +114 -33
- package/template/apps/server/src/system/drizzle-repository.ts +15 -7
- package/template/apps/server/src/system/drizzle-scoped-repository.ts +5 -3
- package/template/apps/server/src/system/drizzle-system.ts +37 -9
- package/template/apps/server/src/system/drizzle-transaction-context.ts +14 -0
- package/template/apps/server/src/system/identity-route-config.ts +7 -2
- package/template/apps/server/src/system/mutation-runner.ts +23 -0
- package/template/apps/server/src/system/organization-postgres.integration.test.ts +176 -0
- package/template/apps/server/src/system/resource-access-response.ts +12 -6
- package/template/apps/server/src/system/role-department-scope-policy.ts +55 -0
- package/template/apps/server/src/system/route-helpers.ts +2 -5
- package/template/apps/server/src/system/route-types.ts +12 -3
- package/template/apps/server/src/system/routes-validation.test.ts +26 -0
- package/template/apps/server/src/system/routes.test.ts +10 -2
- package/template/apps/server/src/system/routes.ts +70 -36
- package/template/apps/server/src/system/seed.ts +7 -0
- package/template/apps/server/src/work-order/data-scope.integration.test.ts +9 -2
- package/template/apps/server/src/work-order/opensearch-index.test.ts +97 -0
- package/template/apps/server/src/work-order/opensearch-index.ts +313 -0
- package/template/apps/server/src/work-order/search-provider.ts +60 -1
- package/template/apps/server/src/work-order/service.ts +42 -10
- package/template/apps/web/src/app/error-pages.ts +9 -0
- package/template/apps/web/src/components/auth/PasswordChangeForm.vue +16 -11
- package/template/apps/web/src/components/auth/PasswordChangeForm.webtest.ts +14 -0
- package/template/apps/web/src/components/common/FormDialog.vue +16 -2
- package/template/apps/web/src/components/common/ModalLayout.webtest.ts +20 -1
- package/template/apps/web/src/composables/useGlobalSearch.ts +68 -0
- package/template/apps/web/src/composables/usePlatformSettings.ts +8 -7
- package/template/apps/web/src/layout/GlobalSearchResults.vue +58 -0
- package/template/apps/web/src/layout/NavigationSearchDialog.vue +42 -6
- package/template/apps/web/src/layout/NavigationSearchDialog.webtest.ts +71 -0
- package/template/apps/web/src/layout/NotificationMenu.vue +73 -31
- package/template/apps/web/src/layout/NotificationMenu.webtest.ts +44 -1
- package/template/apps/web/src/layout/NotificationMenuItem.vue +61 -0
- package/template/apps/web/src/layout/NotificationPreferencesDialog.vue +181 -0
- package/template/apps/web/src/layout/NotificationPreferencesDialog.webtest.ts +80 -0
- package/template/apps/web/src/lib/date-time.ts +22 -10
- package/template/apps/web/src/lib/date-time.webtest.ts +9 -1
- package/template/apps/web/src/main.ts +14 -1
- package/template/apps/web/src/pages/auth/ChangePasswordPage.vue +16 -1
- package/template/apps/web/src/pages/configuration/components/ModuleConfigVersionList.vue +1 -0
- package/template/apps/web/src/pages/configuration/components/ModuleConfigurationEditor.vue +10 -0
- package/template/apps/web/src/pages/configuration/components/ModuleConfigurationWorkbench.vue +37 -6
- package/template/apps/web/src/pages/errors/PlatformErrorPage.vue +115 -0
- package/template/apps/web/src/pages/errors/PlatformErrorPage.webtest.ts +44 -0
- package/template/apps/web/src/pages/errors/error-page-extension.ts +26 -0
- package/template/apps/web/src/pages/system/SystemNotificationsPage.vue +136 -68
- package/template/apps/web/src/pages/system/SystemNotificationsPage.webtest.ts +224 -12
- package/template/apps/web/src/pages/system/audit-log-presenter.ts +86 -0
- package/template/apps/web/src/pages/system/audit-time-range.ts +28 -0
- package/template/apps/web/src/pages/system/components/AuditActionCell.vue +10 -69
- package/template/apps/web/src/pages/system/components/AuditActionCell.webtest.ts +20 -27
- package/template/apps/web/src/pages/system/components/AuditLogDetailDialog.vue +134 -0
- package/template/apps/web/src/pages/system/components/AuditLogDetailDialog.webtest.ts +76 -0
- package/template/apps/web/src/pages/system/components/AuditLogFilters.vue +116 -52
- package/template/apps/web/src/pages/system/components/AuditLogFilters.webtest.ts +52 -15
- package/template/apps/web/src/pages/system/components/NotificationHistoryDialog.vue +129 -0
- package/template/apps/web/src/pages/system/components/NotificationManagementCard.vue +91 -0
- package/template/apps/web/src/pages/system/components/NotificationPublishDialog.vue +121 -0
- package/template/apps/web/src/pages/system/components/NotificationPublishForm.vue +162 -1
- package/template/apps/web/src/pages/system/components/SystemResourceActions.vue +68 -0
- package/template/apps/web/src/pages/system/components/SystemResourceEditor.vue +74 -0
- package/template/apps/web/src/pages/system/components/SystemResourceFilters.vue +3 -4
- package/template/apps/web/src/pages/system/components/SystemResourcePage.vue +91 -98
- package/template/apps/web/src/pages/system/components/SystemResourcePage.webtest.ts +68 -0
- package/template/apps/web/src/pages/system/components/SystemResourceTable.vue +20 -1
- package/template/apps/web/src/pages/system/components/SystemResourceTable.webtest.ts +28 -7
- package/template/apps/web/src/pages/system/components/department/DepartmentOrganizationForm.vue +210 -0
- package/template/apps/web/src/pages/system/components/department/DepartmentTransitionDialog.vue +112 -0
- package/template/apps/web/src/pages/system/components/user-account/UserAccountForm.vue +17 -4
- package/template/apps/web/src/pages/system/composables/useDepartmentTransitions.ts +79 -0
- package/template/apps/web/src/pages/system/composables/useNotificationPermissions.ts +14 -0
- package/template/apps/web/src/pages/system/composables/useSystemResource.ts +2 -0
- package/template/apps/web/src/pages/system/composables/useSystemResource.webtest.ts +15 -2
- package/template/apps/web/src/pages/system/resource-config.ts +12 -4
- package/template/apps/web/src/router/error-navigation.ts +50 -0
- package/template/apps/web/src/router/error-navigation.webtest.ts +106 -0
- package/template/apps/web/src/router/index.ts +71 -0
- package/template/apps/web/src/router/index.webtest.ts +29 -0
- package/template/apps/web/src/router/manifest-routes.webtest.ts +4 -0
- package/template/apps/web/src/router/shared-scaffold-neutrality.webtest.ts +12 -0
- package/template/apps/web/src/services/auth-api.ts +5 -0
- package/template/apps/web/src/services/http.ts +43 -6
- package/template/apps/web/src/services/http.webtest.ts +70 -0
- package/template/apps/web/src/services/notification-api.ts +85 -2
- package/template/apps/web/src/services/notification-api.webtest.ts +110 -0
- package/template/apps/web/src/services/search-api.ts +39 -0
- package/template/apps/web/src/services/system-api.ts +18 -0
- package/template/apps/web/vitest.config.ts +1 -0
- package/template/docker-compose.yml +68 -0
- package/template/docs/architecture/ai-egress.md +49 -7
- package/template/docs/architecture/ai-runtime.md +34 -6
- package/template/docs/architecture/data-scope-query-enforcement.md +4 -0
- package/template/docs/architecture/object-storage.md +22 -2
- package/template/docs/architecture/search-provider-protocol.md +38 -2
- package/template/docs/development/custom-error-pages.md +78 -0
- package/template/docs/development/custom-login-page.md +3 -3
- package/template/docs/platform/agent-runtime.md +76 -7
- package/template/docs/platform/audit-reliability.md +46 -2
- package/template/docs/platform/business-user-directory.md +82 -0
- package/template/docs/platform/module-configuration.md +13 -4
- package/template/docs/platform/notifications.md +67 -11
- package/template/docs/platform/organization-membership.md +17 -3
- package/template/docs/platform/system-crud-api.md +16 -0
- package/template/docs/platform/web-system-crud.md +6 -2
- package/template/package.json +4 -0
- package/template/packages/config/index.test.ts +45 -0
- package/template/packages/config/package.json +1 -1
- package/template/packages/config/src/platform.ts +169 -48
- package/template/packages/database/drizzle/0035_material_nightshade.sql +10 -0
- package/template/packages/database/drizzle/0036_hesitant_speed.sql +35 -0
- package/template/packages/database/drizzle/0037_absent_nick_fury.sql +2 -0
- package/template/packages/database/drizzle/0038_uneven_wasp.sql +38 -0
- package/template/packages/database/drizzle/meta/0035_snapshot.json +7331 -0
- package/template/packages/database/drizzle/meta/0036_snapshot.json +7436 -0
- package/template/packages/database/drizzle/meta/0037_snapshot.json +7457 -0
- package/template/packages/database/drizzle/meta/0038_snapshot.json +7749 -0
- package/template/packages/database/drizzle/meta/_journal.json +28 -0
- package/template/packages/database/package.json +1 -1
- package/template/packages/database/src/schema/identity.ts +7 -0
- package/template/packages/database/src/schema/notifications.ts +135 -0
- package/template/packages/database/src/schema-notification-delivery.test.ts +54 -0
- package/template/packages/database/src/schema-workflow-notification.test.ts +40 -1
- package/template/packages/modules/package.json +1 -1
- package/template/packages/modules/src/ai-operation-composition.test.ts +68 -0
- package/template/packages/modules/src/ai-operation-composition.ts +115 -0
- package/template/packages/modules/src/manifest.ts +26 -0
- package/template/packages/modules/src/provider-data-policy-composition.test.ts +74 -0
- package/template/packages/modules/src/system-api-permissions.ts +54 -0
- package/template/packages/modules/src/system-audit-actions.ts +15 -0
- package/template/packages/modules/src/system-features.ts +6 -1
- package/template/packages/modules/src/system-module-catalog.test.ts +16 -0
- package/template/packages/modules/src/system-module-catalog.ts +28 -4
- package/template/packages/modules/src/system-modules.test.ts +13 -1
- package/template/packages/modules/src/system-modules.ts +12 -0
- package/template/packages/modules/src/system-permissions.ts +11 -5
- package/template/packages/server-sdk/index.ts +11 -0
- package/template/packages/server-sdk/package.json +3 -2
- package/template/packages/server-sdk/src/ai-operation-registration.ts +2 -1
- package/template/packages/server-sdk/src/module-host.ts +8 -0
- package/template/packages/server-sdk/src/request-context.ts +2 -0
- package/template/packages/server-sdk/src/storage-port.ts +66 -0
- package/template/packages/server-sdk/src/tool-registration.ts +6 -0
- package/template/packages/server-sdk/src/user-directory-port.ts +42 -0
- package/template/packages/shared/package.json +1 -1
- package/template/packages/shared/src/audit.ts +25 -0
- package/template/packages/shared/src/module-configuration.ts +5 -0
- package/template/packages/shared/src/notification.ts +92 -1
- package/template/packages/shared/src/password.ts +7 -2
- package/template/packages/shared/src/platform-settings.ts +2 -0
- package/template/packages/storage/package.json +1 -1
- package/template/packages/storage/src/upload-service.test.ts +16 -0
- package/template/packages/storage/src/upload-service.ts +5 -1
- package/template/scripts/notification-postgres-regression.ts +27 -0
|
@@ -0,0 +1,313 @@
|
|
|
1
|
+
import type { WorkOrder } from "@southwind-ai/example-work-order";
|
|
2
|
+
import type { DataScopeQuerySpecification } from "../data-access/query-specification.js";
|
|
3
|
+
import {
|
|
4
|
+
OpenSearchClient,
|
|
5
|
+
type OpenSearchFetcher,
|
|
6
|
+
OpenSearchRequestError,
|
|
7
|
+
readOpenSearchConfig,
|
|
8
|
+
} from "../search/opensearch-client.js";
|
|
9
|
+
|
|
10
|
+
interface SearchHit {
|
|
11
|
+
_id: string;
|
|
12
|
+
_score?: number;
|
|
13
|
+
sort?: Array<string | number>;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
interface SearchResponse {
|
|
17
|
+
hits: { hits: SearchHit[] };
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
interface BulkResponse {
|
|
21
|
+
errors: boolean;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
export interface WorkOrderIndexSearchResult {
|
|
25
|
+
hits: Array<{ id: string; score?: number }>;
|
|
26
|
+
nextCursor?: string;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
export class WorkOrderOpenSearchIndex {
|
|
30
|
+
private synchronized = false;
|
|
31
|
+
private synchronizing?: Promise<void>;
|
|
32
|
+
|
|
33
|
+
constructor(
|
|
34
|
+
private readonly client: OpenSearchClient,
|
|
35
|
+
private readonly indexName: string,
|
|
36
|
+
) {}
|
|
37
|
+
|
|
38
|
+
async synchronize(
|
|
39
|
+
snapshot: () => Promise<WorkOrder[]>,
|
|
40
|
+
signal?: AbortSignal,
|
|
41
|
+
): Promise<void> {
|
|
42
|
+
if (this.synchronized) return;
|
|
43
|
+
if (!this.synchronizing) {
|
|
44
|
+
this.synchronizing = snapshot()
|
|
45
|
+
.then((items) => this.replaceAll(items, signal))
|
|
46
|
+
.then(() => {
|
|
47
|
+
this.synchronized = true;
|
|
48
|
+
})
|
|
49
|
+
.finally(() => {
|
|
50
|
+
this.synchronizing = undefined;
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
await this.synchronizing;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
async upsert(item: WorkOrder): Promise<void> {
|
|
57
|
+
if (!this.synchronized) return;
|
|
58
|
+
try {
|
|
59
|
+
if (item.status !== "active") {
|
|
60
|
+
await this.remove(item.id);
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
await this.ensureIndex();
|
|
64
|
+
await this.client.request(
|
|
65
|
+
"PUT",
|
|
66
|
+
`/${this.index()}/_doc/${encodeURIComponent(item.id)}?refresh=wait_for`,
|
|
67
|
+
document(item),
|
|
68
|
+
);
|
|
69
|
+
} catch (error) {
|
|
70
|
+
this.synchronized = false;
|
|
71
|
+
throw error;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
async remove(id: string): Promise<void> {
|
|
76
|
+
if (!this.synchronized) return;
|
|
77
|
+
try {
|
|
78
|
+
await this.client.request(
|
|
79
|
+
"DELETE",
|
|
80
|
+
`/${this.index()}/_doc/${encodeURIComponent(id)}?refresh=wait_for`,
|
|
81
|
+
undefined,
|
|
82
|
+
);
|
|
83
|
+
} catch (error) {
|
|
84
|
+
if (!(error instanceof OpenSearchRequestError && error.status === 404)) {
|
|
85
|
+
this.synchronized = false;
|
|
86
|
+
throw error;
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
async search(
|
|
92
|
+
text: string,
|
|
93
|
+
limit: number,
|
|
94
|
+
cursor: string | undefined,
|
|
95
|
+
scope: DataScopeQuerySpecification,
|
|
96
|
+
signal?: AbortSignal,
|
|
97
|
+
): Promise<WorkOrderIndexSearchResult> {
|
|
98
|
+
const response = await this.client.request<SearchResponse>(
|
|
99
|
+
"POST",
|
|
100
|
+
`/${this.index()}/_search`,
|
|
101
|
+
{
|
|
102
|
+
size: limit,
|
|
103
|
+
track_total_hits: false,
|
|
104
|
+
...(cursor ? { search_after: decodeCursor(cursor) } : {}),
|
|
105
|
+
sort: [{ _score: "desc" }, { updatedAt: "desc" }, { _id: "asc" }],
|
|
106
|
+
query: {
|
|
107
|
+
bool: {
|
|
108
|
+
must: [
|
|
109
|
+
{
|
|
110
|
+
bool: {
|
|
111
|
+
should: [
|
|
112
|
+
{
|
|
113
|
+
multi_match: {
|
|
114
|
+
query: text,
|
|
115
|
+
fields: ["title^2", "description"],
|
|
116
|
+
},
|
|
117
|
+
},
|
|
118
|
+
{
|
|
119
|
+
wildcard: {
|
|
120
|
+
"title.raw": {
|
|
121
|
+
value: `*${escapeWildcard(text)}*`,
|
|
122
|
+
case_insensitive: true,
|
|
123
|
+
boost: 2,
|
|
124
|
+
},
|
|
125
|
+
},
|
|
126
|
+
},
|
|
127
|
+
{
|
|
128
|
+
wildcard: {
|
|
129
|
+
"description.raw": {
|
|
130
|
+
value: `*${escapeWildcard(text)}*`,
|
|
131
|
+
case_insensitive: true,
|
|
132
|
+
},
|
|
133
|
+
},
|
|
134
|
+
},
|
|
135
|
+
],
|
|
136
|
+
minimum_should_match: 1,
|
|
137
|
+
},
|
|
138
|
+
},
|
|
139
|
+
],
|
|
140
|
+
filter: [{ term: { status: "active" } }, scopeFilter(scope)],
|
|
141
|
+
},
|
|
142
|
+
},
|
|
143
|
+
},
|
|
144
|
+
signal,
|
|
145
|
+
);
|
|
146
|
+
const hits = response.hits.hits;
|
|
147
|
+
const last = hits.at(-1)?.sort;
|
|
148
|
+
return {
|
|
149
|
+
hits: hits.map((hit) => ({
|
|
150
|
+
id: hit._id,
|
|
151
|
+
...(hit._score !== undefined ? { score: hit._score } : {}),
|
|
152
|
+
})),
|
|
153
|
+
...(hits.length === limit && last
|
|
154
|
+
? { nextCursor: encodeCursor(last) }
|
|
155
|
+
: {}),
|
|
156
|
+
};
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
async health(signal?: AbortSignal) {
|
|
160
|
+
const health = await this.client.health(signal);
|
|
161
|
+
return {
|
|
162
|
+
status:
|
|
163
|
+
health.status === "red"
|
|
164
|
+
? ("unavailable" as const)
|
|
165
|
+
: this.synchronized
|
|
166
|
+
? ("healthy" as const)
|
|
167
|
+
: ("degraded" as const),
|
|
168
|
+
checkedAt: new Date().toISOString(),
|
|
169
|
+
...(!this.synchronized ? { message: "OpenSearch 索引等待同步" } : {}),
|
|
170
|
+
};
|
|
171
|
+
}
|
|
172
|
+
|
|
173
|
+
private async replaceAll(items: WorkOrder[], signal?: AbortSignal) {
|
|
174
|
+
await this.ensureIndex(signal);
|
|
175
|
+
await this.client.request(
|
|
176
|
+
"POST",
|
|
177
|
+
`/${this.index()}/_delete_by_query?refresh=true&conflicts=proceed`,
|
|
178
|
+
{ query: { match_all: {} } },
|
|
179
|
+
signal,
|
|
180
|
+
);
|
|
181
|
+
const active = items.filter(({ status }) => status === "active");
|
|
182
|
+
if (!active.length) return;
|
|
183
|
+
const lines = active.flatMap((item) => [
|
|
184
|
+
JSON.stringify({ index: { _index: this.indexName, _id: item.id } }),
|
|
185
|
+
JSON.stringify(document(item)),
|
|
186
|
+
]);
|
|
187
|
+
const result = await this.client.request<BulkResponse>(
|
|
188
|
+
"POST",
|
|
189
|
+
"/_bulk?refresh=wait_for",
|
|
190
|
+
`${lines.join("\n")}\n`,
|
|
191
|
+
signal,
|
|
192
|
+
"application/x-ndjson",
|
|
193
|
+
);
|
|
194
|
+
if (result.errors) throw new Error("OpenSearch 批量索引存在失败项");
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
private async ensureIndex(signal?: AbortSignal) {
|
|
198
|
+
try {
|
|
199
|
+
await this.client.request("HEAD", `/${this.index()}`, undefined, signal);
|
|
200
|
+
} catch (error) {
|
|
201
|
+
if (!(error instanceof OpenSearchRequestError && error.status === 404)) {
|
|
202
|
+
throw error;
|
|
203
|
+
}
|
|
204
|
+
await this.client.request(
|
|
205
|
+
"PUT",
|
|
206
|
+
`/${this.index()}`,
|
|
207
|
+
{
|
|
208
|
+
settings: { number_of_shards: 1, number_of_replicas: 0 },
|
|
209
|
+
mappings: {
|
|
210
|
+
dynamic: "strict",
|
|
211
|
+
properties: {
|
|
212
|
+
title: { type: "text", fields: { raw: { type: "wildcard" } } },
|
|
213
|
+
description: {
|
|
214
|
+
type: "text",
|
|
215
|
+
fields: { raw: { type: "wildcard" } },
|
|
216
|
+
},
|
|
217
|
+
ownerId: { type: "keyword" },
|
|
218
|
+
departmentId: { type: "keyword" },
|
|
219
|
+
tenantId: { type: "keyword" },
|
|
220
|
+
status: { type: "keyword" },
|
|
221
|
+
updatedAt: { type: "date" },
|
|
222
|
+
},
|
|
223
|
+
},
|
|
224
|
+
},
|
|
225
|
+
signal,
|
|
226
|
+
);
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
private index() {
|
|
231
|
+
return encodeURIComponent(this.indexName);
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
|
|
235
|
+
export function createWorkOrderOpenSearchIndex(
|
|
236
|
+
environment: Record<string, string | undefined>,
|
|
237
|
+
fetcher: OpenSearchFetcher = fetch,
|
|
238
|
+
): WorkOrderOpenSearchIndex | undefined {
|
|
239
|
+
const config = readOpenSearchConfig(environment);
|
|
240
|
+
if (!config) return undefined;
|
|
241
|
+
const indexName =
|
|
242
|
+
environment.OPENSEARCH_WORK_ORDER_INDEX?.trim() || "windy-work-orders-v1";
|
|
243
|
+
if (!/^[a-z0-9][a-z0-9_-]{0,127}$/.test(indexName)) {
|
|
244
|
+
throw new Error("OPENSEARCH_WORK_ORDER_INDEX 格式无效");
|
|
245
|
+
}
|
|
246
|
+
return new WorkOrderOpenSearchIndex(
|
|
247
|
+
new OpenSearchClient(config, fetcher),
|
|
248
|
+
indexName,
|
|
249
|
+
);
|
|
250
|
+
}
|
|
251
|
+
|
|
252
|
+
function document(item: WorkOrder) {
|
|
253
|
+
return {
|
|
254
|
+
title: item.title,
|
|
255
|
+
description: item.description,
|
|
256
|
+
ownerId: item.ownerId,
|
|
257
|
+
departmentId: item.departmentId || "",
|
|
258
|
+
tenantId: "single-tenant",
|
|
259
|
+
status: item.status,
|
|
260
|
+
updatedAt: item.updatedAt,
|
|
261
|
+
};
|
|
262
|
+
}
|
|
263
|
+
|
|
264
|
+
function scopeFilter(
|
|
265
|
+
scope: DataScopeQuerySpecification,
|
|
266
|
+
): Record<string, unknown> {
|
|
267
|
+
if (scope.branches.some(({ kind }) => kind === "all"))
|
|
268
|
+
return { match_all: {} };
|
|
269
|
+
const should: Record<string, unknown>[] = [];
|
|
270
|
+
for (const branch of scope.branches) {
|
|
271
|
+
if (branch.kind === "tenant") {
|
|
272
|
+
should.push({ term: { tenantId: branch.tenantId } });
|
|
273
|
+
}
|
|
274
|
+
if (branch.kind === "owner") {
|
|
275
|
+
should.push({ term: { ownerId: branch.ownerId } });
|
|
276
|
+
}
|
|
277
|
+
if (branch.kind === "dimension" && branch.dimension === "departmentId") {
|
|
278
|
+
should.push({ terms: { departmentId: branch.values } });
|
|
279
|
+
}
|
|
280
|
+
}
|
|
281
|
+
return should.length
|
|
282
|
+
? { bool: { should, minimum_should_match: 1 } }
|
|
283
|
+
: { match_none: {} };
|
|
284
|
+
}
|
|
285
|
+
|
|
286
|
+
function escapeWildcard(value: string) {
|
|
287
|
+
return value
|
|
288
|
+
.replaceAll("\\", "\\\\")
|
|
289
|
+
.replaceAll("*", "\\*")
|
|
290
|
+
.replaceAll("?", "\\?");
|
|
291
|
+
}
|
|
292
|
+
|
|
293
|
+
function encodeCursor(sort: Array<string | number>) {
|
|
294
|
+
return Buffer.from(JSON.stringify(sort)).toString("base64url");
|
|
295
|
+
}
|
|
296
|
+
|
|
297
|
+
function decodeCursor(value: string): Array<string | number> {
|
|
298
|
+
try {
|
|
299
|
+
const parsed = JSON.parse(Buffer.from(value, "base64url").toString("utf8"));
|
|
300
|
+
if (
|
|
301
|
+
!Array.isArray(parsed) ||
|
|
302
|
+
parsed.length !== 3 ||
|
|
303
|
+
parsed.some(
|
|
304
|
+
(item) => typeof item !== "string" && typeof item !== "number",
|
|
305
|
+
)
|
|
306
|
+
) {
|
|
307
|
+
throw new Error();
|
|
308
|
+
}
|
|
309
|
+
return parsed;
|
|
310
|
+
} catch {
|
|
311
|
+
throw new Error("OpenSearch 搜索游标无效");
|
|
312
|
+
}
|
|
313
|
+
}
|
|
@@ -5,9 +5,12 @@ import type {
|
|
|
5
5
|
ModuleSearchQuery,
|
|
6
6
|
} from "@southwind-ai/server-sdk";
|
|
7
7
|
import { requestActorFromModule } from "../module-host/request-context.js";
|
|
8
|
+
import { DataAccessDeniedError } from "../data-access/errors.js";
|
|
9
|
+
import { platformDataActor } from "../data-access/platform-actor.js";
|
|
8
10
|
import { SearchProtocolError } from "../search/errors.js";
|
|
9
11
|
import { maskSearchText } from "../search/masking.js";
|
|
10
12
|
import type { WorkOrderService } from "./service.js";
|
|
13
|
+
import type { WorkOrderOpenSearchIndex } from "./opensearch-index.js";
|
|
11
14
|
|
|
12
15
|
export const WORK_ORDER_SEARCH_PROVIDER_KEY = "work-order.ticket.search";
|
|
13
16
|
export const WORK_ORDER_SEARCH_PROVIDER_VERSION = "0.1.0";
|
|
@@ -20,13 +23,19 @@ export class WorkOrderSearchProvider implements ModuleSearchProvider {
|
|
|
20
23
|
readonly key = WORK_ORDER_SEARCH_PROVIDER_KEY;
|
|
21
24
|
readonly providerVersion = WORK_ORDER_SEARCH_PROVIDER_VERSION;
|
|
22
25
|
|
|
23
|
-
constructor(
|
|
26
|
+
constructor(
|
|
27
|
+
private readonly requireService: () => WorkOrderService,
|
|
28
|
+
private readonly searchIndex?: WorkOrderOpenSearchIndex,
|
|
29
|
+
) {}
|
|
24
30
|
|
|
25
31
|
async search(
|
|
26
32
|
request: ModuleSearchQuery,
|
|
27
33
|
context: ModuleSearchContext,
|
|
28
34
|
): Promise<ModuleSearchPage> {
|
|
29
35
|
if (request.signal.aborted) throw new Error("search aborted");
|
|
36
|
+
if (this.searchIndex) {
|
|
37
|
+
return this.searchOpenSearch(request, context);
|
|
38
|
+
}
|
|
30
39
|
const page = parseProviderCursor(request.cursor);
|
|
31
40
|
const result = await this.requireService().list(
|
|
32
41
|
{ q: request.text, page, pageSize: request.limit },
|
|
@@ -48,11 +57,61 @@ export class WorkOrderSearchProvider implements ModuleSearchProvider {
|
|
|
48
57
|
}
|
|
49
58
|
|
|
50
59
|
async health(signal: AbortSignal) {
|
|
60
|
+
if (this.searchIndex) return this.searchIndex.health(signal);
|
|
51
61
|
return {
|
|
52
62
|
status: signal.aborted ? ("unavailable" as const) : ("healthy" as const),
|
|
53
63
|
checkedAt: new Date().toISOString(),
|
|
54
64
|
};
|
|
55
65
|
}
|
|
66
|
+
|
|
67
|
+
private async searchOpenSearch(
|
|
68
|
+
request: ModuleSearchQuery,
|
|
69
|
+
context: ModuleSearchContext,
|
|
70
|
+
): Promise<ModuleSearchPage> {
|
|
71
|
+
const service = this.requireService();
|
|
72
|
+
await this.searchIndex!.synchronize(
|
|
73
|
+
() =>
|
|
74
|
+
service.searchIndexSnapshot(
|
|
75
|
+
platformDataActor("search_work_order_index", "工单搜索索引同步"),
|
|
76
|
+
),
|
|
77
|
+
request.signal,
|
|
78
|
+
);
|
|
79
|
+
const actor = requestActorFromModule(context.actor);
|
|
80
|
+
const result = await this.searchIndex!.search(
|
|
81
|
+
request.text,
|
|
82
|
+
request.limit,
|
|
83
|
+
request.cursor,
|
|
84
|
+
await service.searchScope(actor),
|
|
85
|
+
request.signal,
|
|
86
|
+
);
|
|
87
|
+
const items = await Promise.all(
|
|
88
|
+
result.hits.map(async (hit) => {
|
|
89
|
+
try {
|
|
90
|
+
const item = await service.get(hit.id, actor);
|
|
91
|
+
return item ? { item, score: hit.score } : undefined;
|
|
92
|
+
} catch (error) {
|
|
93
|
+
if (error instanceof DataAccessDeniedError) return undefined;
|
|
94
|
+
throw error;
|
|
95
|
+
}
|
|
96
|
+
}),
|
|
97
|
+
);
|
|
98
|
+
return {
|
|
99
|
+
hits: items.flatMap((entry) =>
|
|
100
|
+
entry
|
|
101
|
+
? [
|
|
102
|
+
{
|
|
103
|
+
id: entry.item.id,
|
|
104
|
+
resourceType: "work-order",
|
|
105
|
+
maskedTitle: maskSearchText(entry.item.title),
|
|
106
|
+
maskedExcerpt: maskSearchText(entry.item.description, 8),
|
|
107
|
+
...(entry.score !== undefined ? { score: entry.score } : {}),
|
|
108
|
+
},
|
|
109
|
+
]
|
|
110
|
+
: [],
|
|
111
|
+
),
|
|
112
|
+
nextCursor: result.nextCursor,
|
|
113
|
+
};
|
|
114
|
+
}
|
|
56
115
|
}
|
|
57
116
|
|
|
58
117
|
function parseProviderCursor(value: string | undefined): number {
|
|
@@ -6,22 +6,26 @@ import type {
|
|
|
6
6
|
} from "@southwind-ai/example-work-order";
|
|
7
7
|
import { DataScopedResourceService } from "../data-access/scoped-resource.js";
|
|
8
8
|
import { departmentDescendantResolver } from "../data-access/department-tree.js";
|
|
9
|
+
import { isServerScopeContext } from "../data-access/context.js";
|
|
10
|
+
import { DataAccessDeniedError } from "../data-access/errors.js";
|
|
11
|
+
import { buildDataScopeQuerySpecification } from "../data-access/query-specification.js";
|
|
9
12
|
import type { RequestActor } from "../guards.js";
|
|
10
13
|
import type { ManagedDepartment } from "../system/entities.js";
|
|
11
14
|
import type { EntityRepository } from "../system/repository.js";
|
|
12
15
|
import type { ScopedEntityRepository } from "../data-access/scoped-repository.js";
|
|
16
|
+
import type { WorkOrderOpenSearchIndex } from "./opensearch-index.js";
|
|
13
17
|
|
|
14
18
|
export class WorkOrderService {
|
|
15
19
|
private readonly access: DataScopedResourceService<WorkOrder>;
|
|
20
|
+
private readonly descendantIds: (departmentId: string) => Promise<string[]>;
|
|
16
21
|
|
|
17
22
|
constructor(
|
|
18
23
|
private readonly repository: ScopedEntityRepository<WorkOrder>,
|
|
19
24
|
departments: EntityRepository<ManagedDepartment>,
|
|
25
|
+
private readonly searchIndex?: WorkOrderOpenSearchIndex,
|
|
20
26
|
) {
|
|
21
|
-
this.
|
|
22
|
-
|
|
23
|
-
departmentDescendantResolver(departments),
|
|
24
|
-
);
|
|
27
|
+
this.descendantIds = departmentDescendantResolver(departments);
|
|
28
|
+
this.access = new DataScopedResourceService(repository, this.descendantIds);
|
|
25
29
|
}
|
|
26
30
|
|
|
27
31
|
list(query: WorkOrderListQuery, actor: RequestActor) {
|
|
@@ -41,8 +45,8 @@ export class WorkOrderService {
|
|
|
41
45
|
return this.access.get(id, actor);
|
|
42
46
|
}
|
|
43
47
|
|
|
44
|
-
create(input: CreateWorkOrderInput, actor: RequestActor) {
|
|
45
|
-
|
|
48
|
+
async create(input: CreateWorkOrderInput, actor: RequestActor) {
|
|
49
|
+
const item = await this.access.create(
|
|
46
50
|
{
|
|
47
51
|
...input,
|
|
48
52
|
workflowStatus: "open",
|
|
@@ -52,14 +56,33 @@ export class WorkOrderService {
|
|
|
52
56
|
},
|
|
53
57
|
actor,
|
|
54
58
|
);
|
|
59
|
+
await this.updateIndex(item);
|
|
60
|
+
return item;
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
async update(id: string, input: UpdateWorkOrderInput, actor: RequestActor) {
|
|
64
|
+
const item = await this.access.update(id, input, actor);
|
|
65
|
+
if (item) await this.updateIndex(item);
|
|
66
|
+
return item;
|
|
55
67
|
}
|
|
56
68
|
|
|
57
|
-
|
|
58
|
-
|
|
69
|
+
async archive(id: string, actor: RequestActor) {
|
|
70
|
+
const item = await this.access.softDelete(id, actor);
|
|
71
|
+
if (item) await this.updateIndex(item);
|
|
72
|
+
return item;
|
|
59
73
|
}
|
|
60
74
|
|
|
61
|
-
|
|
62
|
-
return this.access.
|
|
75
|
+
searchIndexSnapshot(actor: RequestActor) {
|
|
76
|
+
return this.access.all({ status: "active" }, [], actor);
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
searchScope(actor: RequestActor) {
|
|
80
|
+
if (!isServerScopeContext(actor.scopeContext)) {
|
|
81
|
+
throw new DataAccessDeniedError();
|
|
82
|
+
}
|
|
83
|
+
return buildDataScopeQuerySpecification(actor.scopeContext, {
|
|
84
|
+
descendants: this.descendantIds,
|
|
85
|
+
});
|
|
63
86
|
}
|
|
64
87
|
|
|
65
88
|
async operationalSnapshot(
|
|
@@ -79,4 +102,13 @@ export class WorkOrderService {
|
|
|
79
102
|
).length,
|
|
80
103
|
};
|
|
81
104
|
}
|
|
105
|
+
|
|
106
|
+
private async updateIndex(item: WorkOrder): Promise<void> {
|
|
107
|
+
if (!this.searchIndex) return;
|
|
108
|
+
try {
|
|
109
|
+
await this.searchIndex.upsert(item);
|
|
110
|
+
} catch {
|
|
111
|
+
// OpenSearch 是可重建投影;写入失败不回滚已经提交的业务事实。
|
|
112
|
+
}
|
|
113
|
+
}
|
|
82
114
|
}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import PlatformErrorPage from "@/pages/errors/PlatformErrorPage.vue";
|
|
2
|
+
import { defineErrorPageComponents } from "@/pages/errors/error-page-extension";
|
|
3
|
+
|
|
4
|
+
export const errorPageComponents = defineErrorPageComponents({
|
|
5
|
+
notFound: PlatformErrorPage,
|
|
6
|
+
internal: PlatformErrorPage,
|
|
7
|
+
maintenance: PlatformErrorPage,
|
|
8
|
+
network: PlatformErrorPage,
|
|
9
|
+
});
|
|
@@ -1,12 +1,19 @@
|
|
|
1
1
|
<script setup lang="ts">
|
|
2
2
|
import { computed, shallowRef } from "vue";
|
|
3
3
|
import { KeyRoundIcon, LoaderCircleIcon } from "@lucide/vue";
|
|
4
|
-
import { PASSWORD_POLICY } from "@southwind-ai/shared";
|
|
4
|
+
import { PASSWORD_POLICY, type PasswordPolicy } from "@southwind-ai/shared";
|
|
5
5
|
import { Button } from "@/components/ui/button";
|
|
6
6
|
import { Input } from "@/components/ui/input";
|
|
7
7
|
import type { PasswordChangeInput } from "@/services/auth-api";
|
|
8
8
|
|
|
9
|
-
const props =
|
|
9
|
+
const props = withDefaults(
|
|
10
|
+
defineProps<{
|
|
11
|
+
error?: string;
|
|
12
|
+
loading?: boolean;
|
|
13
|
+
policy?: PasswordPolicy;
|
|
14
|
+
}>(),
|
|
15
|
+
{ policy: () => PASSWORD_POLICY },
|
|
16
|
+
);
|
|
10
17
|
const emit = defineEmits<{ submit: [input: PasswordChangeInput] }>();
|
|
11
18
|
|
|
12
19
|
const currentPassword = shallowRef("");
|
|
@@ -14,11 +21,11 @@ const newPassword = shallowRef("");
|
|
|
14
21
|
const confirmation = shallowRef("");
|
|
15
22
|
const newPasswordError = computed(() => {
|
|
16
23
|
if (!newPassword.value) return "";
|
|
17
|
-
if (newPassword.value.length <
|
|
18
|
-
return `新密码至少需要 ${
|
|
24
|
+
if (newPassword.value.length < props.policy.minLength) {
|
|
25
|
+
return `新密码至少需要 ${props.policy.minLength} 个字符,当前为 ${newPassword.value.length} 个。`;
|
|
19
26
|
}
|
|
20
|
-
if (newPassword.value.length >
|
|
21
|
-
return `新密码不能超过 ${
|
|
27
|
+
if (newPassword.value.length > props.policy.maxLength) {
|
|
28
|
+
return `新密码不能超过 ${props.policy.maxLength} 个字符。`;
|
|
22
29
|
}
|
|
23
30
|
if (currentPassword.value && newPassword.value === currentPassword.value) {
|
|
24
31
|
return "新密码不能与当前密码相同。";
|
|
@@ -70,8 +77,8 @@ function submit() {
|
|
|
70
77
|
v-model="newPassword"
|
|
71
78
|
type="password"
|
|
72
79
|
autocomplete="new-password"
|
|
73
|
-
:minlength="
|
|
74
|
-
:maxlength="
|
|
80
|
+
:minlength="policy.minLength"
|
|
81
|
+
:maxlength="policy.maxLength"
|
|
75
82
|
:aria-describedby="
|
|
76
83
|
newPasswordError
|
|
77
84
|
? 'new-password-help new-password-error'
|
|
@@ -82,9 +89,7 @@ function submit() {
|
|
|
82
89
|
required
|
|
83
90
|
/>
|
|
84
91
|
<p id="new-password-help" class="text-xs text-muted-foreground">
|
|
85
|
-
密码要求:{{
|
|
86
|
-
PASSWORD_POLICY.maxLength
|
|
87
|
-
}}
|
|
92
|
+
密码要求:{{ policy.minLength }}-{{ policy.maxLength }}
|
|
88
93
|
个字符,且不能与当前密码相同。
|
|
89
94
|
</p>
|
|
90
95
|
<p
|
|
@@ -40,4 +40,18 @@ describe("首次改密表单", () => {
|
|
|
40
40
|
],
|
|
41
41
|
]);
|
|
42
42
|
});
|
|
43
|
+
|
|
44
|
+
test("使用服务端下发的密码长度策略", async () => {
|
|
45
|
+
const wrapper = mount(PasswordChangeForm, {
|
|
46
|
+
props: { policy: { minLength: 16, maxLength: 32 } },
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
await wrapper.get("#current-password").setValue("initial-password");
|
|
50
|
+
await wrapper.get("#new-password").setValue("twelve-chars");
|
|
51
|
+
|
|
52
|
+
expect(wrapper.get("#new-password-help").text()).toContain("16-32");
|
|
53
|
+
expect(wrapper.get("[role='alert']").text()).toContain(
|
|
54
|
+
"至少需要 16 个字符",
|
|
55
|
+
);
|
|
56
|
+
});
|
|
43
57
|
});
|
|
@@ -24,6 +24,7 @@ const props = withDefaults(
|
|
|
24
24
|
submitDisabled?: boolean;
|
|
25
25
|
contentClass?: string;
|
|
26
26
|
preventOutsideClose?: boolean;
|
|
27
|
+
beforeClose?: () => boolean | Promise<boolean>;
|
|
27
28
|
}>(),
|
|
28
29
|
{
|
|
29
30
|
title: "编辑信息",
|
|
@@ -41,7 +42,8 @@ const emit = defineEmits<{
|
|
|
41
42
|
cancel: [];
|
|
42
43
|
}>();
|
|
43
44
|
|
|
44
|
-
function handleCancel() {
|
|
45
|
+
async function handleCancel() {
|
|
46
|
+
if (!(await canClose())) return;
|
|
45
47
|
emit("cancel");
|
|
46
48
|
open.value = false;
|
|
47
49
|
}
|
|
@@ -49,10 +51,22 @@ function handleCancel() {
|
|
|
49
51
|
function handleInteractOutside(event: { preventDefault(): void }) {
|
|
50
52
|
if (props.preventOutsideClose) event.preventDefault();
|
|
51
53
|
}
|
|
54
|
+
|
|
55
|
+
async function handleOpenChange(value: boolean) {
|
|
56
|
+
if (value) {
|
|
57
|
+
open.value = true;
|
|
58
|
+
return;
|
|
59
|
+
}
|
|
60
|
+
if (await canClose()) open.value = false;
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
async function canClose() {
|
|
64
|
+
return props.beforeClose ? await props.beforeClose() : true;
|
|
65
|
+
}
|
|
52
66
|
</script>
|
|
53
67
|
|
|
54
68
|
<template>
|
|
55
|
-
<Dialog
|
|
69
|
+
<Dialog :open="open" @update:open="handleOpenChange">
|
|
56
70
|
<DialogContent
|
|
57
71
|
:class="contentClass"
|
|
58
72
|
@interact-outside="handleInteractOutside"
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { afterEach, describe, expect, test, vi } from "vitest";
|
|
2
2
|
import { flushPromises, mount } from "@vue/test-utils";
|
|
3
3
|
import FormDialog from "./FormDialog.vue";
|
|
4
|
-
import { DialogContent } from "@/components/ui/dialog";
|
|
4
|
+
import { Dialog, DialogContent } from "@/components/ui/dialog";
|
|
5
5
|
|
|
6
6
|
afterEach(() => {
|
|
7
7
|
document.body.innerHTML = "";
|
|
@@ -51,4 +51,23 @@ describe("Modal 布局", () => {
|
|
|
51
51
|
|
|
52
52
|
expect(preventDefault).toHaveBeenCalledTimes(1);
|
|
53
53
|
});
|
|
54
|
+
|
|
55
|
+
test("关闭前置检查拒绝时保持打开,通过后才通知父组件关闭", async () => {
|
|
56
|
+
const beforeClose = vi
|
|
57
|
+
.fn<() => boolean | Promise<boolean>>()
|
|
58
|
+
.mockReturnValueOnce(false)
|
|
59
|
+
.mockReturnValueOnce(true);
|
|
60
|
+
const wrapper = mount(FormDialog, {
|
|
61
|
+
props: { open: true, beforeClose },
|
|
62
|
+
});
|
|
63
|
+
|
|
64
|
+
wrapper.getComponent(Dialog).vm.$emit("update:open", false);
|
|
65
|
+
await flushPromises();
|
|
66
|
+
expect(wrapper.emitted("update:open")).toBeUndefined();
|
|
67
|
+
|
|
68
|
+
wrapper.getComponent(Dialog).vm.$emit("update:open", false);
|
|
69
|
+
await flushPromises();
|
|
70
|
+
expect(wrapper.emitted("update:open")).toEqual([[false]]);
|
|
71
|
+
expect(beforeClose).toHaveBeenCalledTimes(2);
|
|
72
|
+
});
|
|
54
73
|
});
|