@aurelia-mdc-web/all 9.3.3-au2 → 9.3.5-au2

package/dist/validation/mdc-validation-result-presenter.js.map

@@ -1 +1 @@
-{"version":3,"file":"mdc-validation-result-presenter.js","sourceRoot":"","sources":["../../src/validation/mdc-validation-result-presenter.ts"],"names":[],"mappings":";;;AAGA,MAAa,4BAA4B;IACvC,qBAAqB,CAAC,KAAsB;QAC1C,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA8B,CAAC;QAEvD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;YACrD,MAAM,EAAE,GAAG,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;YACnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;gBAC3C,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAsB,CAAC;gBAC9C,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,wBAAwB,CAAC,EAAE,EAAE,aAAa,CAAC,EAAE,CAAC;oBAC3E,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;oBAC1B,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;gBACzB,CAAC;YACH,CAAC;QACH,CAAC;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;YACnD,MAAM,EAAE,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YACjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;gBAC3C,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAsB,CAAC;gBAC9C,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,wBAAwB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,CAAC;oBACxE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;oBACvB,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;gBACzB,CAAC;YACH,CAAC;QACH,CAAC;QAED,KAAK,MAAM,EAAE,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;YACjC,IAAI,MAAM,CAAC,wBAAwB,CAAC,EAAE,EAAE,cAAc,CAAC,EAAE,CAAC;gBACxD,EAAE,CAAC,YAAY,EAAE,CAAC;YACpB,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAhCD,oEAgCC","sourcesContent":["import { IValidatedElement } from '../base';\r\nimport { ValidationEvent, ValidationResultsSubscriber } from '@aurelia/validation-html';\r\n\r\nexport class MdcValidationResultPresenter implements ValidationResultsSubscriber {\r\n  handleValidationEvent(event: ValidationEvent): void {\r\n    const elements = new Map<IValidatedElement, boolean>();\r\n\r\n    for (let i = 0; i < event.removedResults.length; ++i) {\r\n      const ri = event.removedResults[i];\r\n      for (let j = 0; j < ri.targets.length; ++j) {\r\n        const el = ri.targets[j] as IValidatedElement;\r\n        if (!ri.result.valid && Object.getOwnPropertyDescriptor(el, 'removeError')) {\r\n          el.removeError(ri.result);\r\n          elements.set(el, true);\r\n        }\r\n      }\r\n    }\r\n\r\n    for (let i = 0; i < event.addedResults.length; ++i) {\r\n      const ri = event.addedResults[i];\r\n      for (let j = 0; j < ri.targets.length; ++j) {\r\n        const el = ri.targets[j] as IValidatedElement;\r\n        if (!ri.result.valid && Object.getOwnPropertyDescriptor(el, 'addError')) {\r\n          el.addError(ri.result);\r\n          elements.set(el, true);\r\n        }\r\n      }\r\n    }\r\n\r\n    for (const el of elements.keys()) {\r\n      if (Object.getOwnPropertyDescriptor(el, 'renderErrors')) {\r\n        el.renderErrors();\r\n      }\r\n    }\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"mdc-validation-result-presenter.js","sourceRoot":"","sources":["../../src/validation/mdc-validation-result-presenter.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,4BAA4B;IACvC,qBAAqB,CAAC,KAAsB;QAC1C,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA8B,CAAC;QAEvD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;YACrD,MAAM,EAAE,GAAG,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;YACnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;gBAC3C,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAsB,CAAC;gBAC9C,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,wBAAwB,CAAC,EAAE,EAAE,aAAa,CAAC,EAAE,CAAC;oBAC3E,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;oBAC1B,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;gBACzB,CAAC;YACH,CAAC;QACH,CAAC;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;YACnD,MAAM,EAAE,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YACjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;gBAC3C,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAsB,CAAC;gBAC9C,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,wBAAwB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,CAAC;oBACxE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;oBACvB,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;gBACzB,CAAC;YACH,CAAC;QACH,CAAC;QAED,KAAK,MAAM,EAAE,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;YACjC,IAAI,MAAM,CAAC,wBAAwB,CAAC,EAAE,EAAE,cAAc,CAAC,EAAE,CAAC;gBACxD,EAAE,CAAC,YAAY,EAAE,CAAC;YACpB,CAAC;QACH,CAAC;IACH,CAAC;CACF","sourcesContent":["import { IValidatedElement } from '../base';\r\nimport { ValidationEvent, ValidationResultsSubscriber } from '@aurelia/validation-html';\r\n\r\nexport class MdcValidationResultPresenter implements ValidationResultsSubscriber {\r\n  handleValidationEvent(event: ValidationEvent): void {\r\n    const elements = new Map<IValidatedElement, boolean>();\r\n\r\n    for (let i = 0; i < event.removedResults.length; ++i) {\r\n      const ri = event.removedResults[i];\r\n      for (let j = 0; j < ri.targets.length; ++j) {\r\n        const el = ri.targets[j] as IValidatedElement;\r\n        if (!ri.result.valid && Object.getOwnPropertyDescriptor(el, 'removeError')) {\r\n          el.removeError(ri.result);\r\n          elements.set(el, true);\r\n        }\r\n      }\r\n    }\r\n\r\n    for (let i = 0; i < event.addedResults.length; ++i) {\r\n      const ri = event.addedResults[i];\r\n      for (let j = 0; j < ri.targets.length; ++j) {\r\n        const el = ri.targets[j] as IValidatedElement;\r\n        if (!ri.result.valid && Object.getOwnPropertyDescriptor(el, 'addError')) {\r\n          el.addError(ri.result);\r\n          elements.set(el, true);\r\n        }\r\n      }\r\n    }\r\n\r\n    for (const el of elements.keys()) {\r\n      if (Object.getOwnPropertyDescriptor(el, 'renderErrors')) {\r\n        el.renderErrors();\r\n      }\r\n    }\r\n  }\r\n}\r\n"]}

package/dist/validation/validate.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validate = validate;
 /**
  * @param errorMessage Optional error message, not displayed if `null`
  */
-function validate(errorMessage) {
+export function validate(errorMessage) {
     return function actualDecorator(originalMethod, _) {
         return async function replacementMethod(...args) {
             if (!this.alertService) {

package/dist/validation/validate.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/validation/validate.ts"],"names":[],"mappings":";;AAWA,4BAoBC;AAvBD;;GAEG;AACH,SAAgB,QAAQ,CAAC,YAAwC;IAC/D,OAAO,SAAS,eAAe,CAAqE,cAAqD,EACvJ,CAA2E;QAC3E,OAAO,KAAK,UAAU,iBAAiB,CAAa,GAAG,IAAU;YAC/D,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;gBACvB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;YAC5D,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC/B,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;YACpE,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,CAAC;YAC1D,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;gBAClB,IAAI,YAAY,KAAK,IAAI,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;oBAC/C,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,YAAY,IAAI,8BAA8B,CAAC,CAAC;gBAChF,CAAC;gBACD,OAAO;YACT,CAAC;YACD,OAAO,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;QAC5C,CAAC,CAAC;IACJ,CAAC,CAAA;AACH,CAAC","sourcesContent":["import { IValidationController } from '@aurelia/validation-html';\nimport { AlertService } from '../alert/alert-service';\n\nexport interface IWithValidationController {\n  validationController: IValidationController;\n  alertService: AlertService;\n}\n\n/**\n * @param errorMessage Optional error message, not displayed if `null`\n */\nexport function validate(errorMessage?: string | undefined | null) {\n  return function actualDecorator<This extends IWithValidationController, Args extends any[], Return>(originalMethod: (this: This, ...args: Args) => Return,\n    _: ClassMethodDecoratorContext<This, (this: This, ...args: Args) => Return>) {\n    return async function replacementMethod(this: This, ...args: Args) {\n      if (!this.alertService) {\n        throw new Error('Did you forget to inject AlertService?');\n      }\n      if (!this.validationController) {\n        throw new Error('Did you forget to create ValidationController?');\n      }\n      const errors = await this.validationController.validate();\n      if (!errors.valid) {\n        if (errorMessage !== null && this.alertService) {\n          await this.alertService.error(errorMessage ?? 'Please fix validation errors');\n        }\n        return;\n      }\n      return originalMethod.call(this, ...args);\n    };\n  }\n}\n"]}
+{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/validation/validate.ts"],"names":[],"mappings":"AAQA;;GAEG;AACH,MAAM,UAAU,QAAQ,CAAC,YAAwC;IAC/D,OAAO,SAAS,eAAe,CAAqE,cAAqD,EACvJ,CAA2E;QAC3E,OAAO,KAAK,UAAU,iBAAiB,CAAa,GAAG,IAAU;YAC/D,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;gBACvB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;YAC5D,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC/B,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;YACpE,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,CAAC;YAC1D,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;gBAClB,IAAI,YAAY,KAAK,IAAI,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;oBAC/C,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,YAAY,IAAI,8BAA8B,CAAC,CAAC;gBAChF,CAAC;gBACD,OAAO;YACT,CAAC;YACD,OAAO,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;QAC5C,CAAC,CAAC;IACJ,CAAC,CAAA;AACH,CAAC","sourcesContent":["import { IValidationController } from '@aurelia/validation-html';\nimport { AlertService } from '../alert/alert-service';\n\nexport interface IWithValidationController {\n  validationController: IValidationController;\n  alertService: AlertService;\n}\n\n/**\n * @param errorMessage Optional error message, not displayed if `null`\n */\nexport function validate(errorMessage?: string | undefined | null) {\n  return function actualDecorator<This extends IWithValidationController, Args extends any[], Return>(originalMethod: (this: This, ...args: Args) => Return,\n    _: ClassMethodDecoratorContext<This, (this: This, ...args: Args) => Return>) {\n    return async function replacementMethod(this: This, ...args: Args) {\n      if (!this.alertService) {\n        throw new Error('Did you forget to inject AlertService?');\n      }\n      if (!this.validationController) {\n        throw new Error('Did you forget to create ValidationController?');\n      }\n      const errors = await this.validationController.validate();\n      if (!errors.valid) {\n        if (errorMessage !== null && this.alertService) {\n          await this.alertService.error(errorMessage ?? 'Please fix validation errors');\n        }\n        return;\n      }\n      return originalMethod.call(this, ...args);\n    };\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aurelia-mdc-web/all",
-  "version": "9.3.3-au2",
+  "version": "9.3.5-au2",
   "publishConfig": {
     "access": "public"
   },
@@ -43,7 +43,7 @@
   "scripts": {
     "prebuild": "rimraf dist",
     "build:ts": "tsc -p tsconfig.build.json",
-    "build:other": "copyfiles -u 1 src/**/*.html dist",
+    "build:other": "copyfiles -u 1 src/**/*.html src/**/*.scss dist",
     "build": "npm run build:ts && npm run build:other",
     "publish:au2": "npm publish --tag au2",
     "doc": "cross-env mkdirp doc && typedoc --json doc/api.json --excludeExternals --name aurelia-mdc-web-docs src/",

package/src/alert/alert-modal/i-alert-modal-payload.ts

@@ -1,9 +1,14 @@
-export class IAlertModalPayload {
-  icon: string;
-  iconColour: string;
-  caption?: string;
-  message?: string;
-  html?: string;
-  okText: string;
-  cancelText: string;
-}
+export class IAlertModalPayload {
+  icon: string;
+  iconColour: string;
+  caption?: string;
+  message?: string;
+  html?: string;
+  button1Text: string;
+  button2Text: string;
+  button1Action: string;
+  button2Action: string;
+  defaultAction: string;
+  successAction: string;
+  defensive?: boolean;
+}

package/src/alert/alert-service.ts

@@ -71,24 +71,43 @@ export class AlertService {
     const model: Partial<IAlertModalPayload> = {
       icon: 'info',
       iconColour: 'mdc-theme--primary',
-      okText: this.configuration.alert.okText,
+      button2Text: this.configuration.alert.okText,
+      button2Action: 'ok',
+      defaultAction: 'ok',
+      successAction: 'ok',
       ...message
     };
-    return await this.showModal(model) === 'ok';
+    return await this.showModal(model) === model.successAction;
   }
 
   async confirm(message: string | Partial<IAlertModalPayload>): Promise<boolean> {
     if (typeof message === 'string') {
       message = { message };
     }
-    const model: IAlertModalPayload = {
-      icon: 'help',
-      iconColour: 'mdc-theme--primary',
-      okText: this.configuration.alert.yesText,
-      cancelText: this.configuration.alert.noText,
-      ...message
-    };
-    return await this.showModal(model) === 'ok';
+    const model: IAlertModalPayload = message.defensive
+      ? {
+        icon: 'help',
+        iconColour: 'mdc-theme--primary',
+        button1Text: this.configuration.alert.yesText,
+        button1Action: 'yes',
+        button2Text: this.configuration.alert.noText,
+        button2Action: 'no',
+        defaultAction: 'no',
+        successAction: 'yes',
+        ...message
+      }
+      : {
+        icon: 'help',
+        iconColour: 'mdc-theme--primary',
+        button1Text: this.configuration.alert.noText,
+        button1Action: 'no',
+        button2Text: this.configuration.alert.yesText,
+        button2Action: 'yes',
+        defaultAction: 'yes',
+        successAction: 'yes',
+        ...message
+      };
+    return await this.showModal(model) === model.successAction;
   }
 
   async prompt(data: Partial<IPromptDialogData>): Promise<boolean> {

package/src/index.ts

@@ -172,6 +172,7 @@ export type { IMdcTextFieldHelperLineElement } from './text-field/mdc-text-field
 export { MdcValidationResultPresenter } from './validation/mdc-validation-result-presenter';
 export type { IPromptDialogData } from './alert/prompt-dialog/prompt-dialog';
 export type { IWithAlertService } from './alert/decorators/using-progress';
+export type { IWithValidationController } from './validation/validate';
 
 
 export const AllConfiguration = {