From 44d853c14db10a18c7c8b91057deaf6a5cc2b192 Mon Sep 17 00:00:00 2001
From: Adam DeHaven <2229946+adamdehaven@users.noreply.github.com>
Date: Thu, 16 Nov 2023 15:41:01 -0500
Subject: [PATCH] feat(*): upgrade to kongponents alpha [KHCP-9642] (#1399)
---
package.json | 2 +-
src/assets/styles/_elements.scss | 35 ++++-------
src/components/AcceptInvitationForm.vue | 1 +
src/components/ChangePasswordForm.vue | 4 +-
src/components/ForgotPasswordForm.vue | 2 +
src/components/LoginForm.vue | 8 ++-
src/components/RegisterForm.vue | 1 +
src/components/ResetPasswordForm.vue | 1 +
yarn.lock | 78 ++++++++++++++-----------
9 files changed, 68 insertions(+), 64 deletions(-)
diff --git a/package.json b/package.json
index c733c8b3c..c20e75f84 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
"@digitalroute/cz-conventional-changelog-for-jira": "^8.0.1",
"@evilmartians/lefthook": "^1.5.2",
"@kong/design-tokens": "^1.11.9",
- "@kong/kongponents": "^8.126.2",
+ "@kong/kongponents": "^9.0.0-alpha.54",
"@rushstack/eslint-patch": "^1.5.1",
"@semantic-release/changelog": "^6.0.3",
"@semantic-release/git": "^10.0.1",
diff --git a/src/assets/styles/_elements.scss b/src/assets/styles/_elements.scss
index 39766e738..b1a7a9f3c 100644
--- a/src/assets/styles/_elements.scss
+++ b/src/assets/styles/_elements.scss
@@ -13,7 +13,7 @@
}
.kong-auth-register-region {
- margin-bottom: var(--kui-space-60, $kui-space-60);
+ margin-bottom: var(--kui-space-70, $kui-space-70);
.k-select {
width: 100% !important;
@@ -26,12 +26,11 @@
}
.register-alert {
- margin-top: var(--kui-space-60, $kui-space-60);
+ margin-top: var(--kui-space-70, $kui-space-70);
}
.register-submit {
- justify-content: center !important;
- margin-top: var(--kui-space-90, $kui-space-90);
+ margin-top: var(--kui-space-70, $kui-space-70);
width: 100% !important;
}
}
@@ -51,12 +50,11 @@
.login-seo-button,
.login-button {
- justify-content: center !important;
width: 100% !important;
}
.login-button {
- margin-top: var(--kui-space-90, $kui-space-90);
+ margin-top: var(--kui-space-40, $kui-space-40);
}
.forgot-password-link {
@@ -102,10 +100,8 @@
justify-content: end;
.k-button {
- justify-content: center !important;
-
&:first-of-type {
- margin-right: var(--kui-space-20, $kui-space-20);
+ margin-right: var(--kui-space-70, $kui-space-70);
}
}
}
@@ -113,7 +109,6 @@
.kong-auth-reset-password-form {
.reset-password-submit {
- justify-content: center !important;
width: 100% !important;
}
}
@@ -123,13 +118,8 @@
line-height: var(--kui-line-height-40, $kui-line-height-40);
}
- .forgot-password-return-to-login-btn {
- justify-content: center !important;
- width: 100% !important;
- }
-
+ .forgot-password-return-to-login-btn,
.forgot-password-submit {
- justify-content: center !important;
width: 100% !important;
}
@@ -147,17 +137,15 @@
font-size: var(--kui-font-size-60, $kui-font-size-60);
font-weight: var(--kui-font-weight-semibold, $kui-font-weight-semibold);
line-height: var(--kui-line-height-60, $kui-line-height-60);
- margin-bottom: var(--kui-space-90, $kui-space-90);
+ margin-bottom: var(--kui-space-70, $kui-space-70);
}
.accept-invitation-submit {
- justify-content: center !important;
- margin-top: var(--kui-space-90, $kui-space-90) !important;
width: 100% !important;
}
.invitation-form-error {
- margin-bottom: var(--kui-space-60, $kui-space-60);
+ margin-bottom: var(--kui-space-70, $kui-space-70);
}
}
@@ -243,12 +231,11 @@ a {
}
.kong-auth-input {
- margin-bottom: var(--kui-space-60, $kui-space-60);
- width: 100% !important;
+ margin-bottom: var(--kui-space-70, $kui-space-70);
}
.form-error {
- margin: var(--kui-space-60, $kui-space-60) var(--kui-space-0, $kui-space-0);
+ margin: var(--kui-space-70, $kui-space-70) var(--kui-space-0, $kui-space-0);
}
input.hidden-input {
@@ -263,7 +250,7 @@ input.hidden-input {
color: var(--kui-color-text-neutral, $kui-color-text-neutral);
font-size: var(--kui-font-size-30, $kui-font-size-30);
- .k-checkbox-label {
+ .k-label.checkbox-label {
display: inline;
}
}
diff --git a/src/components/AcceptInvitationForm.vue b/src/components/AcceptInvitationForm.vue
index ed9024a85..41655ffee 100644
--- a/src/components/AcceptInvitationForm.vue
+++ b/src/components/AcceptInvitationForm.vue
@@ -86,6 +86,7 @@
class="accept-invitation-submit"
data-testid="kong-auth-accept-invitation-submit"
:disabled="btnDisabled"
+ size="large"
type="submit"
>
diff --git a/src/components/ChangePasswordForm.vue b/src/components/ChangePasswordForm.vue
index 98cc5624a..438a866e5 100644
--- a/src/components/ChangePasswordForm.vue
+++ b/src/components/ChangePasswordForm.vue
@@ -67,9 +67,10 @@
{{ messages.changePassword.cancelText }}
@@ -81,6 +82,7 @@
appearance="primary"
data-testid="kong-auth-change-password-submit"
:disabled="btnDisabled"
+ size="large"
type="submit"
>
diff --git a/src/components/ForgotPasswordForm.vue b/src/components/ForgotPasswordForm.vue
index 6c5a25412..f329d5972 100644
--- a/src/components/ForgotPasswordForm.vue
+++ b/src/components/ForgotPasswordForm.vue
@@ -14,6 +14,7 @@
appearance="primary"
class="forgot-password-return-to-login-btn"
data-testid="kong-auth-forgot-password-return-to-login-btn"
+ size="large"
@click.prevent="$emit('click-login-link')"
>{{ loginLinkText }}
@@ -50,6 +51,7 @@
class="forgot-password-submit"
data-testid="kong-auth-forgot-password-submit"
:disabled="btnDisabled"
+ size="large"
type="submit"
>
diff --git a/src/components/LoginForm.vue b/src/components/LoginForm.vue
index 3d0e54fee..d172838a1 100644
--- a/src/components/LoginForm.vue
+++ b/src/components/LoginForm.vue
@@ -11,11 +11,12 @@
@@ -85,7 +86,7 @@
autocomplete="username"
class="kong-auth-input"
data-testid="kong-auth-login-email"
- :has-error="currentState.matches('error') && error && fieldsHaveError ? true : false"
+ :error="currentState.matches('error') && error && fieldsHaveError ? true : false"
:label="`${messages.inputLabels.email}`"
required
type="email"
@@ -98,7 +99,7 @@
autocomplete="current-password"
class="kong-auth-input"
data-testid="kong-auth-login-password"
- :has-error="currentState.matches('error') && error && fieldsHaveError ? true : false"
+ :error="currentState.matches('error') && error && fieldsHaveError ? true : false"
:label="`${messages.inputLabels.password}`"
required
type="password"
@@ -118,6 +119,7 @@
class="login-button"
data-testid="kong-auth-login-submit"
:disabled="loginBtnDisabled"
+ size="large"
type="submit"
>
diff --git a/src/components/RegisterForm.vue b/src/components/RegisterForm.vue
index f0b65a268..65b0270a3 100644
--- a/src/components/RegisterForm.vue
+++ b/src/components/RegisterForm.vue
@@ -147,6 +147,7 @@
class="register-submit"
data-testid="kong-auth-register-submit"
:disabled="btnDisabled"
+ size="large"
type="submit"
>
diff --git a/src/components/ResetPasswordForm.vue b/src/components/ResetPasswordForm.vue
index 770c6a29b..20ce297e3 100644
--- a/src/components/ResetPasswordForm.vue
+++ b/src/components/ResetPasswordForm.vue
@@ -50,6 +50,7 @@
class="reset-password-submit"
data-testid="kong-auth-reset-password-submit"
:disabled="btnDisabled"
+ size="large"
type="submit"
>
diff --git a/yarn.lock b/yarn.lock
index 0cad90a7a..8f6908e89 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -609,20 +609,22 @@
resolved "https://registry.yarnpkg.com/@kong/icons/-/icons-1.8.0.tgz#3fb6423fec31be4cc27af94f2912f52aee4f9077"
integrity sha512-ynO3GXaJTh4yoJMZ7XeTbA+ZHvlrteleI+rWNGUbEr726Tw/jgHLdT6wZ1YWR65cA38FN0Q96vEX/7+6ExwaHA==
-"@kong/kongponents@^8.126.2":
- version "8.126.2"
- resolved "https://registry.yarnpkg.com/@kong/kongponents/-/kongponents-8.126.2.tgz#dcf337aeb8a7d623b03b0af8f4936d7a030e09a5"
- integrity sha512-isTzDHB/21O+hMq+tMRH5A3WyOVC5FZqLs1YrfW8zb6VX9Xm1tmtVHO0Qtfo2DpMs2c9rNdl/yBa1vijkOSkHA==
+"@kong/kongponents@^9.0.0-alpha.54":
+ version "9.0.0-alpha.54"
+ resolved "https://registry.yarnpkg.com/@kong/kongponents/-/kongponents-9.0.0-alpha.54.tgz#c96721495c718719b3d7e3925e80b053cd21e479"
+ integrity sha512-mZ3qlsywpDskIoGvcPX+bxFD3F8guy3T57SOhdtL6v2XOPClvVgHVSwVY7/mxP2nB1ygrWoqnDc7GtvSq5EpmA==
dependencies:
+ "@kong/icons" "^1.8.0"
+ "@popperjs/core" "^2.11.8"
date-fns "^2.30.0"
date-fns-tz "^2.0.0"
- focus-trap "^7.5.2"
- focus-trap-vue "^4.0.2"
+ focus-trap "^7.5.4"
+ focus-trap-vue "^4.0.3"
popper.js "^1.16.1"
sortablejs "^1.15.0"
swrv "^1.0.4"
- uuid "^9.0.0"
- v-calendar "3.0.0-alpha.8"
+ uuid "^9.0.1"
+ v-calendar "^3.0.3"
vue-draggable-next "^2.2.1"
"@nodelib/fs.scandir@2.1.5":
@@ -940,10 +942,10 @@
"@pnpm/network.ca-file" "^1.0.1"
config-chain "^1.1.11"
-"@popperjs/core@2.4.0":
- version "2.4.0"
- resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.4.0.tgz#0e1bdf8d021e7ea58affade33d9d607e11365915"
- integrity sha512-NMrDy6EWh9TPdSRiHmHH2ye1v5U0gBD7pRYwSwJvomx7Bm4GG04vu63dYiVzebLOx2obPpJugew06xVP0Nk7hA==
+"@popperjs/core@^2.11.8":
+ version "2.11.8"
+ resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
+ integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
"@rushstack/eslint-patch@^1.5.1":
version "1.5.1"
@@ -1143,6 +1145,11 @@
resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
+"@types/resize-observer-browser@^0.1.7":
+ version "0.1.10"
+ resolved "https://registry.yarnpkg.com/@types/resize-observer-browser/-/resize-observer-browser-0.1.10.tgz#06a172fa24ef44dafc7e061b7043cc1e5489bf78"
+ integrity sha512-pLLF6KJzPPKqJI8rJSTwsesjGKLLHlBSFDEPadYwILI4l7fwEL0juPlFT+exg7DHWxnEMG31t2yyZHDtqJrblA==
+
"@types/retry@0.12.0":
version "0.12.0"
resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
@@ -2640,11 +2647,6 @@ dashdash@^1.12.0:
dependencies:
assert-plus "^1.0.0"
-date-fns-tz@^1.0.12:
- version "1.3.8"
- resolved "https://registry.yarnpkg.com/date-fns-tz/-/date-fns-tz-1.3.8.tgz#083e3a4e1f19b7857fa0c18deea6c2bc46ded7b9"
- integrity sha512-qwNXUFtMHTTU6CFSFjoJ80W8Fzzp24LntbjFFBgL/faqds4e5mo9mftoRLgr3Vi1trISsg4awSpYVsOQCRnapQ==
-
date-fns-tz@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/date-fns-tz/-/date-fns-tz-2.0.0.tgz#1b14c386cb8bc16fc56fe333d4fc34ae1d1099d5"
@@ -3728,15 +3730,15 @@ flatted@^3.2.9:
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf"
integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==
-focus-trap-vue@^4.0.2:
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/focus-trap-vue/-/focus-trap-vue-4.0.2.tgz#c9cc4976b2625d5290a8263b4edea542559fdb1a"
- integrity sha512-2iQN2xKCSCzyhcD90VpueQcTIAhaCRxxo67fkz7RSqLmEd16QKjfGslCr3KxvBx0LfpVN9j0IAyKKuJKw3Intg==
+focus-trap-vue@^4.0.3:
+ version "4.0.3"
+ resolved "https://registry.yarnpkg.com/focus-trap-vue/-/focus-trap-vue-4.0.3.tgz#c13f19d94e666c5144498793e93e51e0c46c2660"
+ integrity sha512-cIX5rybkCAlNZ4IHYJ3nCFIsipDDljJHHjtTO2IgYWkVYg7X9ipUVdab3HzYp88kmHgMwjcB71LYnXRRsF6ZqQ==
-focus-trap@^7.5.2:
- version "7.5.2"
- resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-7.5.2.tgz#e5ee678d10a18651f2591ffb66c949fb098d57cf"
- integrity sha512-p6vGNNWLDGwJCiEjkSK6oERj/hEyI9ITsSwIUICBoKLlWiTWXJRfQibCwcoi50rTZdbi87qDtUlMCmQwsGSgPw==
+focus-trap@^7.5.4:
+ version "7.5.4"
+ resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-7.5.4.tgz#6c4e342fe1dae6add9c2aa332a6e7a0bbd495ba2"
+ integrity sha512-N7kHdlgsO/v+iD/dMoJKtsSqs5Dz/dXZVebRgJw23LDk+jMi/974zyiOYDziY2JPp8xivq9BmUGwIJMiuSBi7w==
dependencies:
tabbable "^6.2.0"
@@ -7741,21 +7743,22 @@ uuid@^8.3.2:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
-uuid@^9.0.0:
- version "9.0.0"
- resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
- integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
+uuid@^9.0.1:
+ version "9.0.1"
+ resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
+ integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
-v-calendar@3.0.0-alpha.8:
- version "3.0.0-alpha.8"
- resolved "https://registry.yarnpkg.com/v-calendar/-/v-calendar-3.0.0-alpha.8.tgz#3bc8c69f4788fb527c39706f41fd2a502a17c827"
- integrity sha512-T23H5UbK0EomrwArlF/jrT2LFbV/lu+Bp9JroZ1paN6rPoaMyvE+HrLxvAmUgi+pODrdTURDMzM3+WPgeFKEBQ==
+v-calendar@^3.0.3:
+ version "3.1.2"
+ resolved "https://registry.yarnpkg.com/v-calendar/-/v-calendar-3.1.2.tgz#fb47320a5469973454f030d850134eebcd2307eb"
+ integrity sha512-QDWrnp4PWCpzUblctgo4T558PrHgHzDtQnTeUNzKxfNf29FkCeFpwGd9bKjAqktaa2aJLcyRl45T5ln1ku34kg==
dependencies:
- "@popperjs/core" "2.4.0"
"@types/lodash" "^4.14.165"
+ "@types/resize-observer-browser" "^0.1.7"
date-fns "^2.16.1"
- date-fns-tz "^1.0.12"
+ date-fns-tz "^2.0.0"
lodash "^4.17.20"
+ vue-screen-utils "^1.0.0-beta.13"
v8-compile-cache-lib@^3.0.1:
version "3.0.1"
@@ -7834,6 +7837,11 @@ vue-router@^4.2.5:
dependencies:
"@vue/devtools-api" "^6.5.0"
+vue-screen-utils@^1.0.0-beta.13:
+ version "1.0.0-beta.13"
+ resolved "https://registry.yarnpkg.com/vue-screen-utils/-/vue-screen-utils-1.0.0-beta.13.tgz#0c739e19f6ffbffab63184aba7b6d710b6a63681"
+ integrity sha512-EJ/8TANKhFj+LefDuOvZykwMr3rrLFPLNb++lNBqPOpVigT2ActRg6icH9RFQVm4nHwlHIHSGm5OY/Clar9yIg==
+
vue-template-compiler@^2.7.14:
version "2.7.14"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz#4545b7dfb88090744c1577ae5ac3f964e61634b1"