@saasquatch/mint-components 1.12.0-1 → 1.12.0-11

package/dist/collection/collection-manifest.json

@@ -110,8 +110,8 @@
     "./components/sqm-user-name/sqm-user-name.js",
     "./components/sqm-widget-verification/sqm-widget-verification-internal.js",
     "./components/sqm-widget-verification/sqm-widget-verification.js",
-    "./components/sqm-widget-verification/sqm-email-verification/sqm-email-verification.js",
     "./components/sqm-widget-verification/sqm-code-verification/sqm-code-verification.js",
+    "./components/sqm-widget-verification/sqm-email-verification/sqm-email-verification.js",
     "./components/tax-and-cash/sqm-payout-details-card/sqm-payout-details-card.js",
     "./components/tax-and-cash/sqm-tax-and-cash/sqm-tax-and-cash.js"
   ],

package/dist/collection/components/sqm-big-stat/useBigStat.js

@@ -709,9 +709,12 @@ const payoutBalanceQuery = () => {
       query payoutBalance {
         viewer: viewer {
           ... on User {
-            publisher {
-              payoutsAccount {
-                balance
+            id
+            impactConnection {
+              publisher {
+                payoutsAccount {
+                  balance
+                }
               }
             }
           }

package/dist/collection/components/sqm-payout-button-scroll/PayoutButtonScroll.stories.js

@@ -3,7 +3,6 @@ export default {
   title: "Components/Payout Scroll Button",
 };
 const defaultProps = {
-  payoutSettingsComplete: false,
+  payoutSettingsComplete: true,
 };
-export const Default = () => (h("sqm-payout-button-scroll", { demoData: { states: defaultProps } }));
 export const CompletedTaxForm = () => (h("sqm-payout-button-scroll", { demoData: { states: { ...defaultProps, payoutSettingsComplete: true } } }));

package/dist/collection/components/sqm-payout-button-scroll/sqm-payout-button-scroll-view.js

@@ -7,6 +7,7 @@ const style = {
   PayoutButtonDescription: {
     color: "var(--sl-color-neutral-500)",
     fontSize: "var(--sl-font-size-small)",
+    margin: "0",
   },
 };
 const sheet = createStyleSheet(style);

package/dist/collection/components/sqm-payout-button-scroll/sqm-payout-button-scroll.js

@@ -8,7 +8,14 @@ import deepmerge from "deepmerge";
  */
 export class PayoutButtonScroll {
   constructor() {
+    /**
+     * @uiName Payout button text
+     */
     this.payoutButtonText = "Payouts & Tax Settings";
+    /**
+     * Description text under payout button
+     * @uiName Payout button description text
+     */
     this.payoutButtonDescription = "Check your payout settings to see when you’ll get paid out next";
     this.ignored = true;
     withHooks(this);
@@ -35,7 +42,10 @@ export class PayoutButtonScroll {
       "required": false,
       "optional": false,
       "docs": {
-        "tags": [],
+        "tags": [{
+            "text": "Payout button text",
+            "name": "uiName"
+          }],
         "text": ""
       },
       "attribute": "payout-button-text",
@@ -53,8 +63,11 @@ export class PayoutButtonScroll {
       "required": false,
       "optional": false,
       "docs": {
-        "tags": [],
-        "text": ""
+        "tags": [{
+            "text": "Payout button description text",
+            "name": "uiName"
+          }],
+        "text": "Description text under payout button"
       },
       "attribute": "payout-button-description",
       "reflect": false,

package/dist/collection/components/sqm-widget-verification/sqm-code-verification/WidgetCodeVerification.stories.js

@@ -3,12 +3,19 @@ export default {
   title: "Components/Widget Code Verification",
 };
 const defaultProps = {
+  initialiseLoading: false,
   email: "testemail@example.com",
   loading: false,
   verifyFailed: false,
-  codeResent: false,
+  emailResent: false,
 };
 export const Default = () => (h("sqm-code-verification", { demoData: { states: defaultProps } }));
+export const InitialLoading = () => (h("sqm-code-verification", { demoData: {
+    states: {
+      ...defaultProps,
+      initialiseLoading: true,
+    },
+  } }));
 export const Loading = () => (h("sqm-code-verification", { demoData: {
     states: {
       ...defaultProps,
@@ -18,7 +25,7 @@ export const Loading = () => (h("sqm-code-verification", { demoData: {
 export const CodeResent = () => (h("sqm-code-verification", { demoData: {
     states: {
       ...defaultProps,
-      codeResent: true,
+      emailResent: true,
     },
   } }));
 export const VerificationFailed = () => (h("sqm-code-verification", { demoData: {

package/dist/collection/components/sqm-widget-verification/sqm-code-verification/sqm-code-verification-view.js

@@ -85,7 +85,16 @@ export function WidgetCodeVerificationView(props) {
     id: "resendCodeText",
     defaultMessage: text.resendCodeText,
   }, {
-    resendCodeLink: (h("a", { href: text.resendCodeLink, target: "_blank", style: { textDecoration: "none" } }, text.resendCodeLabel)),
+    resendCodeLink: (h("a", { href: "", style: { textDecoration: "none" }, onClick: (e) => {
+        e.preventDefault();
+        callbacks.resendEmail();
+      } }, text.resendCodeLabel)),
+  });
+  const codeResentSuccessfully = intl.formatMessage({
+    id: "codeResentSuccessfully",
+    defaultMessage: text.codeResentSuccessfullyText,
+  }, {
+    email: states.email,
   });
   const inputClass = states.verifyFailed
     ? sheet.classes.CodeInputError
@@ -96,11 +105,14 @@ export function WidgetCodeVerificationView(props) {
       styleString),
     h("div", { class: sheet.classes.Wrapper },
       h("div", { class: sheet.classes.HeaderContainer },
-        h(TextSpanView, { type: "p" }, states.verifyFailed
-          ? text.reverifyCodeHeaderText
-          : text.verifyCodeHeaderText)),
-      states.codeResent && (h("sqm-form-message", { type: "success", exportparts: "successalert-icon" },
-        h("b", null, text.codeResentSuccessfullyText))),
+        h(TextSpanView, { type: "p" }, intl.formatMessage({
+          id: `emailHeaderText`,
+          defaultMessage: states.verifyFailed
+            ? text.reverifyCodeHeaderText
+            : text.verifyCodeHeaderText,
+        }, { email: states.email }))),
+      states.emailResent && (h("sqm-form-message", { type: "success", exportparts: "successalert-icon" },
+        h("b", null, codeResentSuccessfully))),
       h("div", { class: sheet.classes.InputsContainer },
         h("div", { ref: refs.codeWrapperRef, class: sheet.classes.CodeInputContainer },
           h("sl-input", { class: inputClass, name: "code" }),
@@ -110,9 +122,7 @@ export function WidgetCodeVerificationView(props) {
           h("sl-input", { class: inputClass, name: "code" }),
           h("sl-input", { class: inputClass, name: "code" })),
         states.verifyFailed && (h("p", { class: sheet.classes.ErrorText }, text.invalidCodeText)),
-        h("sl-button", { class: sheet.classes.ContinueButton, onClick: callbacks.submitCode, loading: states.loading, exportparts: "base: primarybutton-base", type: "primary" }, text.verifyText)),
+        h("sl-button", { class: sheet.classes.ContinueButton, onClick: callbacks.submitCode, disabled: states.loading || states.initialiseLoading, loading: states.loading || states.initialiseLoading, exportparts: "base: primarybutton-base", type: "primary" }, text.verifyText)),
       h("div", { class: sheet.classes.FooterContainer },
-        h(TextSpanView, { type: "p" }, resendCodeText),
-        h(TextSpanView, { type: "p" },
-          h("a", { href: "/", style: { textDecoration: "none" } }, text.useDifferentEmailText))))));
+        h(TextSpanView, { type: "p" }, resendCodeText)))));
 }

package/dist/collection/components/sqm-widget-verification/sqm-code-verification/sqm-code-verification.js

@@ -1,16 +1,17 @@
-import { isDemo } from "@saasquatch/component-boilerplate";
-import { withHooks } from "@saasquatch/stencil-hooks";
+import { isDemo, useSetParent } from "@saasquatch/component-boilerplate";
+import { useState, withHooks } from "@saasquatch/stencil-hooks";
 import { Component, h, Prop } from "@stencil/core";
 import deepmerge from "deepmerge";
 import { getProps } from "../../../utils/utils";
 import { WidgetCodeVerificationView, } from "./sqm-code-verification-view";
 import { useWidgetCodeVerification } from "./useCodeVerification";
+import { VERIFICATION_PARENT_NAMESPACE } from "../keys";
 export class WidgetCodeVerification {
   constructor() {
     /**
      * @uiName Verify code widget header text
      */
-    this.verifyCodeHeaderText = "Enter the code sent to email@example.com from our referral provider, impact.com.";
+    this.verifyCodeHeaderText = "Enter the code sent to {email} from our referral provider, impact.com.";
     /**
      * @uiName Reverify code widget header text
      */
@@ -25,27 +26,16 @@ export class WidgetCodeVerification {
      * @uiName Resend code label
      */
     this.resendCodeLabel = "Resend code";
-    /**
-     * The link that appears in the resend code link
-     * @uiName Resend code link
-     */
-    // AL: TODO connect route to resend verification code
-    this.resendCodeLink = "/resend-code";
     /**
      * Link text displayed under verify button
      * @uiName Resend code text
      */
     this.codeResentSuccessfullyText = "Another code has been sent to {email}";
-    /**
-     * Link text displayed under the verify button
-     * @uiName Use different email text
-     */
-    this.useDifferentEmailText = "Use a different email";
     /**
      * Error text displayed under verification input
      * @uiName Invalid code text
      */
-    this.invalidCodeText = " Please check your code and try again. If you’re still having trouble, try resending your code.";
+    this.invalidCodeText = "Please check your code and try again. If you’re still having trouble, try resending your code.";
     /**
      * @uiName Verify code button text
      */
@@ -89,7 +79,7 @@ export class WidgetCodeVerification {
       },
       "attribute": "verify-code-header-text",
       "reflect": false,
-      "defaultValue": "\"Enter the code sent to email@example.com from our referral provider, impact.com.\""
+      "defaultValue": "\"Enter the code sent to {email} from our referral provider, impact.com.\""
     },
     "reverifyCodeHeaderText": {
       "type": "string",
@@ -154,27 +144,6 @@ export class WidgetCodeVerification {
       "reflect": false,
       "defaultValue": "\"Resend code\""
     },
-    "resendCodeLink": {
-      "type": "string",
-      "mutable": false,
-      "complexType": {
-        "original": "string",
-        "resolved": "string",
-        "references": {}
-      },
-      "required": false,
-      "optional": false,
-      "docs": {
-        "tags": [{
-            "text": "Resend code link",
-            "name": "uiName"
-          }],
-        "text": "The link that appears in the resend code link"
-      },
-      "attribute": "resend-code-link",
-      "reflect": false,
-      "defaultValue": "\"/resend-code\""
-    },
     "codeResentSuccessfullyText": {
       "type": "string",
       "mutable": false,
@@ -196,27 +165,6 @@ export class WidgetCodeVerification {
       "reflect": false,
       "defaultValue": "\"Another code has been sent to {email}\""
     },
-    "useDifferentEmailText": {
-      "type": "string",
-      "mutable": false,
-      "complexType": {
-        "original": "string",
-        "resolved": "string",
-        "references": {}
-      },
-      "required": false,
-      "optional": false,
-      "docs": {
-        "tags": [{
-            "text": "Use different email text",
-            "name": "uiName"
-          }],
-        "text": "Link text displayed under the verify button"
-      },
-      "attribute": "use-different-email-text",
-      "reflect": false,
-      "defaultValue": "\"Use a different email\""
-    },
     "invalidCodeText": {
       "type": "string",
       "mutable": false,
@@ -236,7 +184,7 @@ export class WidgetCodeVerification {
       },
       "attribute": "invalid-code-text",
       "reflect": false,
-      "defaultValue": "\" Please check your code and try again. If you\u2019re still having trouble, try resending your code.\""
+      "defaultValue": "\"Please check your code and try again. If you\u2019re still having trouble, try resending your code.\""
     },
     "verifyText": {
       "type": "string",
@@ -285,7 +233,7 @@ export class WidgetCodeVerification {
       "mutable": false,
       "complexType": {
         "original": "DemoData<WidgetCodeVerificationViewProps>",
-        "resolved": "{ states?: { loading: boolean; email: string; verifyFailed?: boolean; codeResent?: boolean; }; refs?: { codeWrapperRef: any; }; }",
+        "resolved": "{ states?: { initialiseLoading: boolean; loading: boolean; email: string; verifyFailed?: boolean; emailResent: boolean; }; refs?: { codeWrapperRef: any; }; }",
         "references": {
           "DemoData": {
             "location": "import",
@@ -309,21 +257,44 @@ export class WidgetCodeVerification {
           }],
         "text": ""
       }
+    },
+    "onVerification": {
+      "type": "unknown",
+      "mutable": false,
+      "complexType": {
+        "original": "(token: string) => any",
+        "resolved": "(token: string) => any",
+        "references": {}
+      },
+      "required": false,
+      "optional": true,
+      "docs": {
+        "tags": [{
+            "text": undefined,
+            "name": "undocumented"
+          }],
+        "text": ""
+      }
     }
   }; }
 }
 function useDemoWidgetCodeVerification(props) {
+  const [emailResent, setEmailResent] = useState(false);
+  const setVerifiedContext = useSetParent(VERIFICATION_PARENT_NAMESPACE);
   return deepmerge({
     states: {
       loading: false,
-      email: "",
-      verifyFailed: false,
+      email: "test@example.com",
+      emailResent,
+      resendError: true,
+      verifyFailed: true,
     },
     refs: {
       codeWrapperRef: () => { },
     },
     callbacks: {
-      submitCode: async () => { },
+      resendEmail: async () => setEmailResent(true),
+      submitCode: async () => setVerifiedContext(true),
     },
     text: props.getTextProps(),
   }, props.demoData || {}, { arrayMerge: (_, a) => a });

package/dist/collection/components/sqm-widget-verification/sqm-code-verification/useCodeVerification.js

@@ -1,12 +1,14 @@
 import { useMutation, useParent, useParentValue, useUserIdentity, } from "@saasquatch/component-boilerplate";
 import { useEffect, useHost, useState } from "@saasquatch/stencil-hooks";
-import { SHOW_CODE_NAMESPACE, VERIFICATION_EMAIL_NAMESPACE, VERIFICATION_EVENT_KEY, } from "../keys";
-import { useVerificationEmailMutation } from "../sqm-email-verification/useEmailVerification";
 import { gql } from "graphql-request";
-// TODO: Move to component-boilerplate
+import { SHOW_CODE_NAMESPACE, VERIFICATION_EMAIL_NAMESPACE, } from "../keys";
+import { useVerificationEmail } from "../useVerificationEmail";
 export const VerifyEmailWithCodeMutation = gql `
-  mutation verifyUserEmail($user: UserIdInput!, $code: String!) {
-    verifyUserEmail(user: $user, code: $code) {
+  mutation submitImpactPublisherEmail2FACode(
+    $user: UserIdInput!
+    $code: String!
+  ) {
+    submitImpactPublisherEmail2FACode(user: $user, code: $code) {
       verifiedEmail
       accessKey
     }
@@ -43,9 +45,8 @@ export function useWidgetCodeVerification(props) {
   const [emailResent, setEmailResent] = useState(false);
   const [codeRef, setCodeRef] = useState(null);
   const [validationError, setValidationError] = useState(false);
-  // TODO: Need to handle error states for these errors
-  const [verifyUser, { loading: verifyLoading, errors: verifyErrors }] = useCodeVerificationMutation();
-  const [request, { loading: resendLoading, data, errors: resendErrors }] = useVerificationEmailMutation();
+  const [emailError, setEmailError] = useState(false);
+  const { initialized, send: [sendEmail, { loading: sendLoading, errors: sendErrors }], verify: [verifyEmail, { loading: verifyLoading, errors: verifyErrors }], } = useVerificationEmail();
   useEffect(() => {
     if (!codeRef)
       return;
@@ -61,7 +62,7 @@ export function useWidgetCodeVerification(props) {
         }
       });
       element.addEventListener("input", (e) => {
-        const input = e.target.value;
+        const input = e.data;
         if (!input)
           return;
         if (idx === codeElements.length - 1) {
@@ -71,8 +72,10 @@ export function useWidgetCodeVerification(props) {
         if (input.length > 1) {
           const rest = input.slice(1);
           e.target.value = input.slice(0, 1);
-          codeElements[idx + 1].value = rest;
-          codeElements[idx + 1].dispatchEvent(new Event("input"));
+          codeElements[idx + 1].dispatchEvent(new InputEvent("input", {
+            inputType: "insertFromPaste",
+            data: rest,
+          }));
         }
         codeElements[idx + 1].focus();
       });
@@ -83,14 +86,16 @@ export function useWidgetCodeVerification(props) {
     setValidationError(false);
   };
   const resendEmail = async () => {
-    // TODO: Error checks, depends on what mutation is set up as
-    const result = await request();
-    if (emailSent) {
-      setEmailResent(true);
-      setTimeout(() => {
-        setEmailResent(false);
-      }, 500);
+    // UI should only allow this to be called if initialized, but checking just in case
+    if (!initialized)
+      return;
+    const result = await sendEmail();
+    if (!result) {
+      setEmailError(true);
+      return;
     }
+    if (emailSent)
+      setEmailResent(true);
     setEmailSent(true);
   };
   const submitCode = async () => {
@@ -104,16 +109,13 @@ export function useWidgetCodeVerification(props) {
     codeElements.forEach((element) => {
       code = `${code}${element.value}`;
     });
+    // UI should only allow this to be called if initialized, but checking just in case
+    if (!initialized)
+      return;
     setValidationError(false);
-    // Only 123456 passes for a valid code rn
-    const res = await verifyUser(code);
-    if (res) {
-      const event = new CustomEvent(VERIFICATION_EVENT_KEY, {
-        detail: { token: res.verifyUserEmail.accessKey },
-        composed: true,
-        bubbles: true,
-      });
-      host.dispatchEvent(event);
+    const res = await verifyEmail(code);
+    if (res === null || res === void 0 ? void 0 : res.success) {
+      props.onVerification(res.accessKey);
       reset();
     }
     else {
@@ -121,10 +123,15 @@ export function useWidgetCodeVerification(props) {
     }
   };
   useEffect(() => {
+    // Wait for mutations to be determined from user lookup
+    if (!initialized)
+      return;
     // email should already exist if user has completed email-verification
     if (!email)
       resendEmail();
-  }, []);
+    else
+      setEmailSent(true);
+  }, [initialized]);
   return {
     refs: {
       codeWrapperRef: setCodeRef,
@@ -132,7 +139,9 @@ export function useWidgetCodeVerification(props) {
     states: {
       email,
       emailResent,
-      loading: verifyLoading || resendLoading,
+      resendError: sendErrors || verifyErrors,
+      initialiseLoading: !initialized,
+      loading: sendLoading || verifyLoading,
       verifyFailed: !!validationError,
     },
     callbacks: {

package/dist/collection/components/sqm-widget-verification/sqm-email-verification/WidgetEmailVerification.stories.js

@@ -4,19 +4,39 @@ export default {
 };
 const defaultProps = {
   email: "",
-  error: "",
+  error: false,
   loading: false,
+  initialLoading: false,
+  sendCodeError: false,
 };
 export const Default = () => (h("sqm-email-verification", { demoData: {} }));
+export const EmailIsPrefilled = () => (h("sqm-email-verification", { demoData: {
+    states: {
+      ...defaultProps,
+      email: "test@example.com",
+    },
+  } }));
 export const Loading = () => (h("sqm-email-verification", { demoData: {
+    states: {
+      ...defaultProps,
+      initialLoading: true,
+    },
+  } }));
+export const SaveLoading = () => (h("sqm-email-verification", { demoData: {
     states: {
       ...defaultProps,
       loading: true,
     },
   } }));
-export const Error = () => (h("sqm-email-verification", { demoData: {
+export const InvalidEmail = () => (h("sqm-email-verification", { demoData: {
+    states: {
+      ...defaultProps,
+      error: true,
+    },
+  } }));
+export const SendCodeError = () => (h("sqm-email-verification", { demoData: {
     states: {
       ...defaultProps,
-      error: "Email is invalid",
+      sendCodeError: true,
     },
   } }));

package/dist/collection/components/sqm-widget-verification/sqm-email-verification/sqm-email-verification-view.js

@@ -15,6 +15,16 @@ const style = {
     flexDirection: "column",
     maxWidth: "320px",
   },
+  ErrorAlertContainer: {
+    "&::part(base)": {
+      backgroundColor: "var(--sl-color-red-100)",
+      borderTop: "none",
+    },
+    "&::part(message)": {
+      display: "flex",
+      flexDirection: "column",
+    },
+  },
   ContinueButton: {
     width: "100%",
     maxWidth: "100px",
@@ -63,15 +73,18 @@ export function WidgetEmailVerificationView(props) {
     h("style", { type: "text/css" },
       vanillaStyle,
       styleString),
-    states.loading ? (renderLoadingSkeleton()) : (h("div", { class: sheet.classes.Wrapper },
-      " ",
+    states.sendCodeError && (h("sl-alert", { exportparts: "base: alert-base, icon:alert-icon", type: "danger", class: sheet.classes.ErrorAlertContainer, open: true },
+      h("sl-icon", { slot: "icon", name: "exclamation-octagon" }),
+      h("b", null, text.sendCodeErrorHeader),
+      text.sendCodeErrorDescription)),
+    states.initialLoading ? (renderLoadingSkeleton()) : (h("div", { class: sheet.classes.Wrapper },
       h(TextSpanView, { type: "p" }, text.verifyEmailHeaderText),
       h("sl-form", { "onSl-submit": callbacks.submitEmail },
         h("div", { class: sheet.classes.InputsContainer },
-          h("sl-input", Object.assign({ exportparts: "label: input-label, base: input-base", label: text.emailLabel, value: states.email, type: "email", id: "email", name: "email", required: true }, (states.error
+          h("sl-input", Object.assign({ exportparts: "label: input-label, base: input-base", label: text.emailLabel, value: states.email || "", type: "email", id: "email", name: "email", disabled: !!states.email || states.loading }, (states.error
             ? {
               class: sheet.classes.ErrorInput,
-              helpText: "Please enter a valid email",
+              helpText: text.emailValidationErrorText,
             }
             : {}))),
           h("sl-button", { submit: true, class: sheet.classes.ContinueButton, loading: states.loading, exportparts: "base: primarybutton-base", type: "primary" }, text.sendCodeText)))))));