Date: Fri, 21 Jul 2023 15:36:49 -0500
Subject: [PATCH 26/92] feat: text copy modal (TUP-535:2.1.3)
---
libs/tup-components/src/mfa/MfaQRPanel.tsx | 39 ++++++++++++++++------
1 file changed, 29 insertions(+), 10 deletions(-)
diff --git a/libs/tup-components/src/mfa/MfaQRPanel.tsx b/libs/tup-components/src/mfa/MfaQRPanel.tsx
index 2f6cc68c1..2a9648362 100644
--- a/libs/tup-components/src/mfa/MfaQRPanel.tsx
+++ b/libs/tup-components/src/mfa/MfaQRPanel.tsx
@@ -1,6 +1,11 @@
import React from 'react';
import { useMfaPairTotp } from '@tacc/tup-hooks';
-import { Button, LoadingSpinner, SectionMessage } from '@tacc/core-components';
+import {
+ Button,
+ LoadingSpinner,
+ SectionMessage,
+ TextCopyModal,
+} from '@tacc/core-components';
import { TicketCreateModal } from '../tickets';
import styles from './Mfa.module.css';
@@ -28,19 +33,33 @@ const MfaQRPanel: React.FC = () => {
{!data && isLoading && }
{data && }
- {data && data.otpkey && (
+ {(
+ // {data && data.otpkey && (
- Can't scan QR code? {data.otpkey.value_b32}
(
- navigator.clipboard.writeText(data.otpkey.value_b32)}
+ Can't scan QR code?{' '}
+
+ Enter this code into an approved{' '}
+
+ MFA pairing app
+
+ .
+ >
+ }
>
- copy to clipboard
-
- )
+ View Alternative Verification Code
+
)}
- {data && !data.otpkey && (
+ {false && data && !data.otpkey && (
Can't scan QR code?{' '}
Submit a ticket.
From d4e1bd0a14b8ba186098044fdd06c740c4346b35 Mon Sep 17 00:00:00 2001
From: Wesley Bomar
Date: Fri, 21 Jul 2023 15:53:28 -0500
Subject: [PATCH 27/92] chore: uninstall react-copy-to-clipboard
---
package-lock.json | 48 -----------------------------------------------
package.json | 1 -
2 files changed, 49 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 55f8812ae..11312d189 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,6 @@
"js-cookie": "^3.0.1",
"lodash": "^4.17.21",
"react": "18.2.0",
- "react-copy-to-clipboard": "^5.1.0",
"react-dom": "18.2.0",
"react-dropzone": "^14.2.3",
"react-resize-detector": "^7.1.2",
@@ -9278,14 +9277,6 @@
"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
"dev": true
},
- "node_modules/copy-to-clipboard": {
- "version": "3.3.3",
- "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz",
- "integrity": "sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==",
- "dependencies": {
- "toggle-selection": "^1.0.6"
- }
- },
"node_modules/copy-webpack-plugin": {
"version": "10.2.4",
"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz",
@@ -21194,18 +21185,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/react-copy-to-clipboard": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.1.0.tgz",
- "integrity": "sha512-k61RsNgAayIJNoy9yDsYzDe/yAZAzEbEgcz3DZMhF686LEyukcE1hzurxe85JandPUG+yTfGVFzuEw3xt8WP/A==",
- "dependencies": {
- "copy-to-clipboard": "^3.3.1",
- "prop-types": "^15.8.1"
- },
- "peerDependencies": {
- "react": "^15.3.0 || 16 || 17 || 18"
- }
- },
"node_modules/react-dom": {
"version": "18.2.0",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
@@ -23824,11 +23803,6 @@
"node": ">=8.0"
}
},
- "node_modules/toggle-selection": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz",
- "integrity": "sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ=="
- },
"node_modules/toidentifier": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
@@ -32357,14 +32331,6 @@
"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
"dev": true
},
- "copy-to-clipboard": {
- "version": "3.3.3",
- "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz",
- "integrity": "sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==",
- "requires": {
- "toggle-selection": "^1.0.6"
- }
- },
"copy-webpack-plugin": {
"version": "10.2.4",
"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz",
@@ -41129,15 +41095,6 @@
"loose-envify": "^1.1.0"
}
},
- "react-copy-to-clipboard": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.1.0.tgz",
- "integrity": "sha512-k61RsNgAayIJNoy9yDsYzDe/yAZAzEbEgcz3DZMhF686LEyukcE1hzurxe85JandPUG+yTfGVFzuEw3xt8WP/A==",
- "requires": {
- "copy-to-clipboard": "^3.3.1",
- "prop-types": "^15.8.1"
- }
- },
"react-dom": {
"version": "18.2.0",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
@@ -43143,11 +43100,6 @@
"is-number": "^7.0.0"
}
},
- "toggle-selection": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz",
- "integrity": "sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ=="
- },
"toidentifier": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
diff --git a/package.json b/package.json
index e74ae04c3..b23b258aa 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,6 @@
"js-cookie": "^3.0.1",
"lodash": "^4.17.21",
"react": "18.2.0",
- "react-copy-to-clipboard": "^5.1.0",
"react-dom": "18.2.0",
"react-dropzone": "^14.2.3",
"react-resize-detector": "^7.1.2",
From 6152efaf21488d4a5d8efcdb8a8bd3ea0a62213c Mon Sep 17 00:00:00 2001
From: Wesley Bomar
Date: Mon, 24 Jul 2023 13:26:35 -0500
Subject: [PATCH 28/92] feat: install @tacc/core-styles 2.14.0
---
apps/tup-ui/src/main.global.css | 2 +-
package-lock.json | 71 ++++++++++++++++-----------------
package.json | 2 +-
3 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/apps/tup-ui/src/main.global.css b/apps/tup-ui/src/main.global.css
index 883648de7..15e72dfbb 100644
--- a/apps/tup-ui/src/main.global.css
+++ b/apps/tup-ui/src/main.global.css
@@ -1,7 +1,7 @@
/* To use new c-nav component not yet in TACC/Core-CMS core-styles.base.css */
/* TODO: Remove when TACC/Core-CMS loads TACC/Core-Styles v2.13+ */
/* CAVEAT: Duplicates older, unchanged, global c-nav styles */
-@import url("https://unpkg.com/@tacc/core-styles@2.13.0/dist/components/c-nav.css");
+@import url("https://unpkg.com/@tacc/core-styles@2.14.0/dist/components/c-nav.css");
/* To overwrite @tacc/core-styles CEPv2 spacing */
:root {
diff --git a/package-lock.json b/package-lock.json
index 11312d189..444453ae8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41,7 +41,7 @@
"@nrwl/vite": "^15.6.3",
"@nrwl/web": "15.6.3",
"@nrwl/workspace": "15.6.3",
- "@tacc/core-styles": "^2.6.2",
+ "@tacc/core-styles": "^2.14.0",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "13.4.0",
"@testing-library/user-event": "^14.4.3",
@@ -5703,9 +5703,9 @@
}
},
"node_modules/@tacc/core-styles": {
- "version": "2.6.2",
- "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.6.2.tgz",
- "integrity": "sha512-0JjPjbcmSvYg7z2zRWIq3Yhj2I0L8fz+6L66AV8HVQUJ/7fDG1vC34mGR0q+l36kFT3KYCTA2+XOyOhxnc/C3w==",
+ "version": "2.14.0",
+ "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.14.0.tgz",
+ "integrity": "sha512-AXJIF9tOdUsiGdOehNntbN3OeuycKlE/cUjJCnG65kWkmryEUhcytSUZF29Xd7xXCvmNwr6qlCOSVNU39POlhA==",
"dev": true,
"bin": {
"core-styles": "src/cli.js"
@@ -5723,7 +5723,6 @@
"postcss": "^8.4.18",
"postcss-banner": "^4.0.1",
"postcss-cli": "^10.0.0",
- "postcss-env-function": "^4.0.6",
"postcss-extend": "^1.0.5",
"postcss-import": "^15.0.0",
"postcss-preset-env": "^7.8.3",
@@ -19463,9 +19462,9 @@
}
},
"node_modules/postcss-cli/node_modules/fast-glob": {
- "version": "3.2.12",
- "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
- "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+ "version": "3.3.1",
+ "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
+ "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
"dev": true,
"peer": true,
"dependencies": {
@@ -19480,15 +19479,15 @@
}
},
"node_modules/postcss-cli/node_modules/globby": {
- "version": "13.1.3",
- "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz",
- "integrity": "sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==",
+ "version": "13.2.2",
+ "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
+ "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
"dev": true,
"peer": true,
"dependencies": {
"dir-glob": "^3.0.1",
- "fast-glob": "^3.2.11",
- "ignore": "^5.2.0",
+ "fast-glob": "^3.3.0",
+ "ignore": "^5.2.4",
"merge2": "^1.4.1",
"slash": "^4.0.0"
},
@@ -19543,9 +19542,9 @@
}
},
"node_modules/postcss-cli/node_modules/slash": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/slash/-/slash-5.0.0.tgz",
- "integrity": "sha512-n6KkmvKS0623igEVj3FF0OZs1gYYJ0o0Hj939yc1fyxl2xt+xYpLnzJB6xBSqOfV9ZFLEWodBBN/heZJahuIJQ==",
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
+ "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
"dev": true,
"peer": true,
"engines": {
@@ -19556,9 +19555,9 @@
}
},
"node_modules/postcss-cli/node_modules/yaml": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.1.tgz",
- "integrity": "sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==",
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
+ "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",
"dev": true,
"peer": true,
"engines": {
@@ -29562,9 +29561,9 @@
}
},
"@tacc/core-styles": {
- "version": "2.6.2",
- "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.6.2.tgz",
- "integrity": "sha512-0JjPjbcmSvYg7z2zRWIq3Yhj2I0L8fz+6L66AV8HVQUJ/7fDG1vC34mGR0q+l36kFT3KYCTA2+XOyOhxnc/C3w==",
+ "version": "2.14.0",
+ "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.14.0.tgz",
+ "integrity": "sha512-AXJIF9tOdUsiGdOehNntbN3OeuycKlE/cUjJCnG65kWkmryEUhcytSUZF29Xd7xXCvmNwr6qlCOSVNU39POlhA==",
"dev": true,
"requires": {}
},
@@ -39978,9 +39977,9 @@
},
"dependencies": {
"fast-glob": {
- "version": "3.2.12",
- "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
- "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+ "version": "3.3.1",
+ "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
+ "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
"dev": true,
"peer": true,
"requires": {
@@ -39992,15 +39991,15 @@
}
},
"globby": {
- "version": "13.1.3",
- "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz",
- "integrity": "sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==",
+ "version": "13.2.2",
+ "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
+ "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
"dev": true,
"peer": true,
"requires": {
"dir-glob": "^3.0.1",
- "fast-glob": "^3.2.11",
- "ignore": "^5.2.0",
+ "fast-glob": "^3.3.0",
+ "ignore": "^5.2.4",
"merge2": "^1.4.1",
"slash": "^4.0.0"
},
@@ -40026,16 +40025,16 @@
}
},
"slash": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/slash/-/slash-5.0.0.tgz",
- "integrity": "sha512-n6KkmvKS0623igEVj3FF0OZs1gYYJ0o0Hj939yc1fyxl2xt+xYpLnzJB6xBSqOfV9ZFLEWodBBN/heZJahuIJQ==",
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
+ "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
"dev": true,
"peer": true
},
"yaml": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.1.tgz",
- "integrity": "sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==",
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
+ "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",
"dev": true,
"peer": true
}
diff --git a/package.json b/package.json
index b23b258aa..5c8416604 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
"@nrwl/vite": "^15.6.3",
"@nrwl/web": "15.6.3",
"@nrwl/workspace": "15.6.3",
- "@tacc/core-styles": "^2.6.2",
+ "@tacc/core-styles": "^2.14.0",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "13.4.0",
"@testing-library/user-event": "^14.4.3",
From 48efbdfa41302b891d4dd63721c438ac6f7d7e7e Mon Sep 17 00:00:00 2001
From: Wesley Bomar
Date: Mon, 24 Jul 2023 14:46:32 -0500
Subject: [PATCH 29/92] refactor: FieldWrapper mirror FeildWrapperFormik
Make FieldWrapper look like FeildWrapperFormik.
Lets FieldWrapper be used independent of Formik.
---
.../src/lib/FieldWrapper/FieldWrapper.css | 14 ------
.../FieldWrapper.module.css} | 0
.../src/lib/FieldWrapper/FieldWrapper.tsx | 47 +++++++++----------
.../FieldWrapperFormik/FieldWrapperFormik.tsx | 8 +++-
4 files changed, 29 insertions(+), 40 deletions(-)
delete mode 100644 libs/core-wrappers/src/lib/FieldWrapper/FieldWrapper.css
rename libs/core-wrappers/src/lib/{FieldWrapperFormik/FieldWrapperFormik.module.css => FieldWrapper/FieldWrapper.module.css} (100%)
diff --git a/libs/core-wrappers/src/lib/FieldWrapper/FieldWrapper.css b/libs/core-wrappers/src/lib/FieldWrapper/FieldWrapper.css
deleted file mode 100644
index 75e38538f..000000000
--- a/libs/core-wrappers/src/lib/FieldWrapper/FieldWrapper.css
+++ /dev/null
@@ -1,14 +0,0 @@
-.form-field__label {
- font-weight: bold;
-}
-
-.form-field__help {
- font-style: italic;
- font-weight: 400;
-}
-
-.form-field__validation-error {
- font-size: 0.8rem;
- color: #eb6e6e;
- padding-top: 5px;
-}
diff --git a/libs/core-wrappers/src/lib/FieldWrapperFormik/FieldWrapperFormik.module.css b/libs/core-wrappers/src/lib/FieldWrapper/FieldWrapper.module.css
similarity index 100%
rename from libs/core-wrappers/src/lib/FieldWrapperFormik/FieldWrapperFormik.module.css
rename to libs/core-wrappers/src/lib/FieldWrapper/FieldWrapper.module.css
diff --git a/libs/core-wrappers/src/lib/FieldWrapper/FieldWrapper.tsx b/libs/core-wrappers/src/lib/FieldWrapper/FieldWrapper.tsx
index dc5c430c1..2758528ea 100644
--- a/libs/core-wrappers/src/lib/FieldWrapper/FieldWrapper.tsx
+++ b/libs/core-wrappers/src/lib/FieldWrapper/FieldWrapper.tsx
@@ -1,45 +1,44 @@
import React from 'react';
-import { FormGroup, Label, FormText, Badge } from 'reactstrap';
-import './FieldWrapper.css';
+import { Badge } from 'reactstrap';
+
+import styles from './FieldWrapper.module.css';
export type FieldWrapperProps = {
+ name?: string;
label: string;
required?: boolean;
- description: React.ReactNode;
+ className?: string;
+ description?: React.ReactNode;
error?: string;
- children?: React.ReactNode;
};
-const FieldWrapper: React.FC = ({
+const FieldWrapper: React.FC> = ({
+ name,
label,
required,
description,
children,
+ className,
error,
}) => (
-
-
- {label}{' '}
+
+
+ {label}
{required ? (
-
- Required
+
+ Required
) : null}
-
+
{children}
- {error ? (
-
{error}
- ) : (
- description && (
-
- {description}
-
- )
+ {error && (
+
)}
-
+
+ {description}
+
+
);
export default FieldWrapper;
diff --git a/libs/core-wrappers/src/lib/FieldWrapperFormik/FieldWrapperFormik.tsx b/libs/core-wrappers/src/lib/FieldWrapperFormik/FieldWrapperFormik.tsx
index a402cf386..1d712464e 100644
--- a/libs/core-wrappers/src/lib/FieldWrapperFormik/FieldWrapperFormik.tsx
+++ b/libs/core-wrappers/src/lib/FieldWrapperFormik/FieldWrapperFormik.tsx
@@ -1,11 +1,14 @@
import React from 'react';
import { ErrorMessage } from 'formik';
import { Badge } from 'reactstrap';
-import styles from './FieldWrapperFormik.module.css';
+
+import styles from '../FieldWrapper/FieldWrapper.module.css';
+
export type FieldWrapperProps = {
name: string;
label: string;
required?: boolean;
+ className?: string;
description?: React.ReactNode;
};
const FieldWrapper: React.FC> = ({
@@ -13,10 +16,11 @@ const FieldWrapper: React.FC> = ({
label,
required,
description,
+ className,
children,
}) => {
return (
-
+
{label}
{required && (
From dd6c8e3ec110b693eca436fa4b98bc0a71bca28e Mon Sep 17 00:00:00 2001
From: Wesley Bomar
Date: Mon, 24 Jul 2023 14:48:42 -0500
Subject: [PATCH 30/92] feat: style text copy modal (TUP-535:2.1.3)
---
apps/tup-ui/src/main.global.css | 4 ++++
.../src/lib/TextCopyField/TextCopyField.tsx | 9 ++++++---
.../lib/TextCopyModal/TextCopyModal.module.css | 3 +++
.../src/lib/TextCopyModal/TextCopyModal.tsx | 17 +++++++++--------
4 files changed, 22 insertions(+), 11 deletions(-)
create mode 100644 libs/core-components/src/lib/TextCopyModal/TextCopyModal.module.css
diff --git a/apps/tup-ui/src/main.global.css b/apps/tup-ui/src/main.global.css
index 15e72dfbb..e1650f166 100644
--- a/apps/tup-ui/src/main.global.css
+++ b/apps/tup-ui/src/main.global.css
@@ -3,6 +3,10 @@
/* CAVEAT: Duplicates older, unchanged, global c-nav styles */
@import url("https://unpkg.com/@tacc/core-styles@2.14.0/dist/components/c-nav.css");
+/* To use s-affixed-input-wrapper which had been unused outside TACC/Core-CMS */
+/* TODO: Remove when TACC/Core-CMS loads TACC/Core-Styles v2.14+ */
+@import url("@tacc/core-styles/dist/trumps/s-affixed-input-wrapper.css");
+
/* To overwrite @tacc/core-styles CEPv2 spacing */
:root {
/* TACC/Core-Styles/blob/823b7b9/src/lib/_imports/settings/space.css */
diff --git a/libs/core-components/src/lib/TextCopyField/TextCopyField.tsx b/libs/core-components/src/lib/TextCopyField/TextCopyField.tsx
index 6118b70cf..a87c7acff 100644
--- a/libs/core-components/src/lib/TextCopyField/TextCopyField.tsx
+++ b/libs/core-components/src/lib/TextCopyField/TextCopyField.tsx
@@ -7,10 +7,12 @@ import styles from './TextCopyField.module.css';
type TextCopyFieldProps = {
value: string,
placeholder?: string,
+ className?: string,
+ buttonClassName?: string,
ButtonWrapper?: React.FC,
};
-const TextCopyField: React.FC = ({ value, placeholder, ButtonWrapper })=> {
+const TextCopyField: React.FC = ({ value, placeholder, className, buttonClassName, ButtonWrapper })=> {
/* WARNING: Must match CSS `--transition-duration` */
const transitionDuration = 0.15; // second(s)
const stateDuration = 1; // second(s)
@@ -40,7 +42,8 @@ const TextCopyField: React.FC = ({ value, placeholder, Butto
= ({ value, placeholder, Butto
type="text"
onChange={onChange}
value={value}
- className={styles['input']}
+ className={className}
placeholder={placeholder}
data-testid="input"
readOnly
diff --git a/libs/core-components/src/lib/TextCopyModal/TextCopyModal.module.css b/libs/core-components/src/lib/TextCopyModal/TextCopyModal.module.css
new file mode 100644
index 000000000..2a30e4004
--- /dev/null
+++ b/libs/core-components/src/lib/TextCopyModal/TextCopyModal.module.css
@@ -0,0 +1,3 @@
+.modal-body {
+ padding: calc(var(--global-space--section-gap) / 2);
+}
diff --git a/libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx b/libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx
index fc5cf103b..b0184bb8d 100644
--- a/libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx
+++ b/libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx
@@ -1,9 +1,10 @@
import React, { useState } from 'react';
import { Modal, ModalHeader, ModalBody } from 'reactstrap';
-import { Formik } from 'formik';
-import { FieldWrapperFormik as FieldWrapper } from '@tacc/core-wrappers';
+import { FieldWrapper } from '@tacc/core-wrappers';
import { Button, TextCopyField } from '@tacc/core-components';
+import styles from './TextCopyModal.module.css';
+
const TextCopyModal: React.FC<
React.PropsWithChildren<{
display: 'secondary' | 'link';
@@ -35,7 +36,7 @@ const TextCopyModal: React.FC<
{title}
-
-
+
+
+
>
From 0cf3f6e0027bdac772cd7d71b18e4c52a6fd7f47 Mon Sep 17 00:00:00 2001
From: Wesley Bomar
Date: Mon, 24 Jul 2023 15:20:20 -0500
Subject: [PATCH 31/92] npx nx format:write
---
.../src/lib/TextCopyField/TextCopyField.tsx | 70 +++++++++++--------
.../src/lib/TextCopyModal/TextCopyModal.tsx | 9 +--
.../src/lib/FieldWrapper/FieldWrapper.tsx | 8 +--
.../FieldWrapperFormik/FieldWrapperFormik.tsx | 4 +-
libs/tup-components/src/mfa/MfaQRPanel.tsx | 6 +-
5 files changed, 53 insertions(+), 44 deletions(-)
diff --git a/libs/core-components/src/lib/TextCopyField/TextCopyField.tsx b/libs/core-components/src/lib/TextCopyField/TextCopyField.tsx
index a87c7acff..20c2ac293 100644
--- a/libs/core-components/src/lib/TextCopyField/TextCopyField.tsx
+++ b/libs/core-components/src/lib/TextCopyField/TextCopyField.tsx
@@ -5,14 +5,20 @@ import Button from '../Button';
import styles from './TextCopyField.module.css';
type TextCopyFieldProps = {
- value: string,
- placeholder?: string,
- className?: string,
- buttonClassName?: string,
- ButtonWrapper?: React.FC,
+ value: string;
+ placeholder?: string;
+ className?: string;
+ buttonClassName?: string;
+ ButtonWrapper?: React.FC;
};
-const TextCopyField: React.FC = ({ value, placeholder, className, buttonClassName, ButtonWrapper })=> {
+const TextCopyField: React.FC = ({
+ value,
+ placeholder,
+ className,
+ buttonClassName,
+ ButtonWrapper,
+}) => {
/* WARNING: Must match CSS `--transition-duration` */
const transitionDuration = 0.15; // second(s)
const stateDuration = 1; // second(s)
@@ -38,30 +44,34 @@ const TextCopyField: React.FC = ({ value, placeholder, class
event.preventDefault();
};
- const CopyButton = () => {return (
-
- Copy
-
- )};
- const CopyField = () => {return (
-
- )};
+ const CopyButton = () => {
+ return (
+
+ Copy
+
+ );
+ };
+ const CopyField = () => {
+ return (
+
+ );
+ };
return (
<>
diff --git a/libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx b/libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx
index b0184bb8d..8bfb8dfc4 100644
--- a/libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx
+++ b/libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx
@@ -39,17 +39,14 @@ const TextCopyModal: React.FC<
size="md"
className="modal-dialog-centered"
>
-
+
{title}
{tokenType === 'sms' && (
@@ -42,15 +44,6 @@ const MfaValidationPanel: React.FC<{ tokenType: 'totp' | 'sms' }> = ({
Get Help
)}
- {error && (
-
- Error validating MFA token: error.message
-
- )}
>
);
};
From 7d401abf96d994f634148f4a5fd19dc49ea91337 Mon Sep 17 00:00:00 2001
From: Wesley Bomar
Date: Mon, 24 Jul 2023 16:57:52 -0500
Subject: [PATCH 39/92] chore: rename `qr-code-message` to `mfa-message`
---
libs/tup-components/src/mfa/Mfa.module.css | 2 +-
libs/tup-components/src/mfa/MfaQRPanel.tsx | 4 ++--
libs/tup-components/src/mfa/MfaValidationPanel.tsx | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libs/tup-components/src/mfa/Mfa.module.css b/libs/tup-components/src/mfa/Mfa.module.css
index 646698a94..d2ca76a15 100644
--- a/libs/tup-components/src/mfa/Mfa.module.css
+++ b/libs/tup-components/src/mfa/Mfa.module.css
@@ -83,7 +83,7 @@ li.pairing-separator {
position: relative;
width: max-content; /* to not let wide child change parent width */
}
- .qr-code-message {
+ .mfa-message {
/* To position message beneath both paring steps */
position: absolute;
top: 100%;
diff --git a/libs/tup-components/src/mfa/MfaQRPanel.tsx b/libs/tup-components/src/mfa/MfaQRPanel.tsx
index d1296565e..2d0d780ce 100644
--- a/libs/tup-components/src/mfa/MfaQRPanel.tsx
+++ b/libs/tup-components/src/mfa/MfaQRPanel.tsx
@@ -61,7 +61,7 @@ const MfaQRPanel: React.FC = () => {
{data && data.otpkey && (
-
+
Can't scan QR code?{' '}
{
)}
{data && !data.otpkey && (
-
+
Can't scan QR code?{' '}
Submit a ticket.
diff --git a/libs/tup-components/src/mfa/MfaValidationPanel.tsx b/libs/tup-components/src/mfa/MfaValidationPanel.tsx
index fcf033316..e9e9866a5 100644
--- a/libs/tup-components/src/mfa/MfaValidationPanel.tsx
+++ b/libs/tup-components/src/mfa/MfaValidationPanel.tsx
@@ -39,7 +39,7 @@ const MfaValidationPanel: React.FC<{ tokenType: 'totp' | 'sms' }> = ({
{tokenType === 'sms' && (
-
+
Didn't receive a message within 5 minutes?{' '}
Get Help
From ce524d646488d35c1f8748d14589ffdf7ed34a70 Mon Sep 17 00:00:00 2001
From: Wesley Bomar
Date: Mon, 24 Jul 2023 17:29:16 -0500
Subject: [PATCH 40/92] chore: remove unused `ButtonWrapper`
---
libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx | 4 ----
1 file changed, 4 deletions(-)
diff --git a/libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx b/libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx
index 8bfb8dfc4..c66e1d1e2 100644
--- a/libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx
+++ b/libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx
@@ -24,10 +24,6 @@ const TextCopyModal: React.FC<
);
- const ButtonWrapper: React.FC = ({ children }) => {
- return {children}
;
- };
-
return (
<>
toggle()}>
From 17a3d0de321bb1883c1892d0c5400ac39212f6c7 Mon Sep 17 00:00:00 2001
From: Wesley Bomar
Date: Mon, 24 Jul 2023 17:34:17 -0500
Subject: [PATCH 41/92] chore: load sibling core-components from rel. path
---
libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx b/libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx
index c66e1d1e2..2fc6b2b2b 100644
--- a/libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx
+++ b/libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx
@@ -1,7 +1,7 @@
import React, { useState } from 'react';
import { Modal, ModalHeader, ModalBody } from 'reactstrap';
import { FieldWrapper } from '@tacc/core-wrappers';
-import { Button, TextCopyField } from '@tacc/core-components';
+import { Button, TextCopyField } from '../../';
import styles from './TextCopyModal.module.css';
From cfb2977612b12078861397b08cc7e06429c65844 Mon Sep 17 00:00:00 2001
From: Wesley Bomar
Date: Mon, 24 Jul 2023 18:03:40 -0500
Subject: [PATCH 42/92] chore: remove unused `SectionMessage` import
---
libs/tup-components/src/mfa/MfaQRPanel.tsx | 1 -
1 file changed, 1 deletion(-)
diff --git a/libs/tup-components/src/mfa/MfaQRPanel.tsx b/libs/tup-components/src/mfa/MfaQRPanel.tsx
index 2d0d780ce..a757aed66 100644
--- a/libs/tup-components/src/mfa/MfaQRPanel.tsx
+++ b/libs/tup-components/src/mfa/MfaQRPanel.tsx
@@ -3,7 +3,6 @@ import { useMfaPairTotp } from '@tacc/tup-hooks';
import {
Button,
LoadingSpinner,
- SectionMessage,
TextCopyModal,
} from '@tacc/core-components';
import { FieldWrapper } from '@tacc/core-wrappers';
From 1b7aad9c04de2588138fbbe2b3e6447236803a26 Mon Sep 17 00:00:00 2001
From: Wesley Bomar
Date: Mon, 24 Jul 2023 18:10:42 -0500
Subject: [PATCH 43/92] fix: resolve "circular dependency"
I.E. Moved FieldWrapper to core-components.
Error: https://github.com/TACC/tup-ui/actions/runs/5650505534/job/15306952950?pr=270
Docs: https://nx.dev/recipes/other/resolve-circular-dependencies
---
libs/core-components/src/index.ts | 1 +
.../src/lib/FieldWrapper/FieldWrapper.module.css | 0
.../src/lib/FieldWrapper/FieldWrapper.tsx | 0
.../src/lib/FieldWrapper/index.ts | 0
libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx | 2 +-
libs/core-wrappers/src/index.ts | 1 -
6 files changed, 2 insertions(+), 2 deletions(-)
rename libs/{core-wrappers => core-components}/src/lib/FieldWrapper/FieldWrapper.module.css (100%)
rename libs/{core-wrappers => core-components}/src/lib/FieldWrapper/FieldWrapper.tsx (100%)
rename libs/{core-wrappers => core-components}/src/lib/FieldWrapper/index.ts (100%)
diff --git a/libs/core-components/src/index.ts b/libs/core-components/src/index.ts
index 047524da1..c29a722a5 100644
--- a/libs/core-components/src/index.ts
+++ b/libs/core-components/src/index.ts
@@ -6,6 +6,7 @@ export { default as InlineMessage } from './lib/InlineMessage';
export { default as SectionMessage } from './lib/SectionMessage';
export { default as LoadingSpinner } from './lib/LoadingSpinner';
export { default as DescriptionList } from './lib/DescriptionList';
+export { default as FieldWrapper } from './lib/FieldWrapper';
export { default as Message } from './lib/Message';
export { default as Paginator } from './lib/Paginator';
export { default as Pill } from './lib/Pill';
diff --git a/libs/core-wrappers/src/lib/FieldWrapper/FieldWrapper.module.css b/libs/core-components/src/lib/FieldWrapper/FieldWrapper.module.css
similarity index 100%
rename from libs/core-wrappers/src/lib/FieldWrapper/FieldWrapper.module.css
rename to libs/core-components/src/lib/FieldWrapper/FieldWrapper.module.css
diff --git a/libs/core-wrappers/src/lib/FieldWrapper/FieldWrapper.tsx b/libs/core-components/src/lib/FieldWrapper/FieldWrapper.tsx
similarity index 100%
rename from libs/core-wrappers/src/lib/FieldWrapper/FieldWrapper.tsx
rename to libs/core-components/src/lib/FieldWrapper/FieldWrapper.tsx
diff --git a/libs/core-wrappers/src/lib/FieldWrapper/index.ts b/libs/core-components/src/lib/FieldWrapper/index.ts
similarity index 100%
rename from libs/core-wrappers/src/lib/FieldWrapper/index.ts
rename to libs/core-components/src/lib/FieldWrapper/index.ts
diff --git a/libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx b/libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx
index 2fc6b2b2b..ef7d7c9ad 100644
--- a/libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx
+++ b/libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx
@@ -1,6 +1,6 @@
import React, { useState } from 'react';
import { Modal, ModalHeader, ModalBody } from 'reactstrap';
-import { FieldWrapper } from '@tacc/core-wrappers';
+import { FieldWrapper } from '@tacc/core-components';
import { Button, TextCopyField } from '../../';
import styles from './TextCopyModal.module.css';
diff --git a/libs/core-wrappers/src/index.ts b/libs/core-wrappers/src/index.ts
index 765d4fc22..a525b0f18 100644
--- a/libs/core-wrappers/src/index.ts
+++ b/libs/core-wrappers/src/index.ts
@@ -4,7 +4,6 @@ export { default as QueryWrapper } from './lib/QueryWrapper';
export { default as SubmitWrapper } from './lib/SubmitWrapper';
export { default as Wizard, useWizard, WizardNavigation } from './lib/Wizard';
export type WizardStep = WizardStepType;
-export { default as FieldWrapper } from './lib/FieldWrapper';
export {
FieldWrapperFormik,
FormikInput,
From e306285c64f9aa2e5156005b2bba6c29f0a1370d Mon Sep 17 00:00:00 2001
From: Wesley Bomar
Date: Mon, 24 Jul 2023 18:13:17 -0500
Subject: [PATCH 44/92] nx format:write
---
libs/tup-components/src/mfa/MfaQRPanel.tsx | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/libs/tup-components/src/mfa/MfaQRPanel.tsx b/libs/tup-components/src/mfa/MfaQRPanel.tsx
index a757aed66..84f7c4f9c 100644
--- a/libs/tup-components/src/mfa/MfaQRPanel.tsx
+++ b/libs/tup-components/src/mfa/MfaQRPanel.tsx
@@ -1,10 +1,6 @@
import React from 'react';
import { useMfaPairTotp } from '@tacc/tup-hooks';
-import {
- Button,
- LoadingSpinner,
- TextCopyModal,
-} from '@tacc/core-components';
+import { Button, LoadingSpinner, TextCopyModal } from '@tacc/core-components';
import { FieldWrapper } from '@tacc/core-wrappers';
import { TicketCreateModal } from '../tickets';
import styles from './Mfa.module.css';
From ee0466517485bb62ad0e09c6cfc50fd81704e6f4 Mon Sep 17 00:00:00 2001
From: Wesley Bomar
Date: Mon, 24 Jul 2023 18:16:27 -0500
Subject: [PATCH 45/92] fix: loose ends after "circular dependency" fix
---
.../src/lib/TextCopyModal/TextCopyModal.tsx | 3 +--
libs/tup-components/src/mfa/MfaQRPanel.tsx | 8 ++++++--
libs/tup-components/src/mfa/MfaSmsPanel.tsx | 3 +--
libs/tup-components/src/mfa/MfaValidationPanel.tsx | 3 +--
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx b/libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx
index ef7d7c9ad..3bf59be6d 100644
--- a/libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx
+++ b/libs/core-components/src/lib/TextCopyModal/TextCopyModal.tsx
@@ -1,7 +1,6 @@
import React, { useState } from 'react';
import { Modal, ModalHeader, ModalBody } from 'reactstrap';
-import { FieldWrapper } from '@tacc/core-components';
-import { Button, TextCopyField } from '../../';
+import { Button, FieldWrapper, TextCopyField } from '../../';
import styles from './TextCopyModal.module.css';
diff --git a/libs/tup-components/src/mfa/MfaQRPanel.tsx b/libs/tup-components/src/mfa/MfaQRPanel.tsx
index 84f7c4f9c..f216fe8bc 100644
--- a/libs/tup-components/src/mfa/MfaQRPanel.tsx
+++ b/libs/tup-components/src/mfa/MfaQRPanel.tsx
@@ -1,7 +1,11 @@
import React from 'react';
import { useMfaPairTotp } from '@tacc/tup-hooks';
-import { Button, LoadingSpinner, TextCopyModal } from '@tacc/core-components';
-import { FieldWrapper } from '@tacc/core-wrappers';
+import {
+ Button,
+ FieldWrapper,
+ LoadingSpinner,
+ TextCopyModal,
+} from '@tacc/core-components';
import { TicketCreateModal } from '../tickets';
import styles from './Mfa.module.css';
diff --git a/libs/tup-components/src/mfa/MfaSmsPanel.tsx b/libs/tup-components/src/mfa/MfaSmsPanel.tsx
index 5ef667244..2c8096620 100644
--- a/libs/tup-components/src/mfa/MfaSmsPanel.tsx
+++ b/libs/tup-components/src/mfa/MfaSmsPanel.tsx
@@ -1,7 +1,6 @@
import React, { useState } from 'react';
import { useMfaPairSms } from '@tacc/tup-hooks';
-import { Button } from '@tacc/core-components';
-import { FieldWrapper } from '@tacc/core-wrappers';
+import { Button, FieldWrapper } from '@tacc/core-components';
import styles from './Mfa.module.css';
import { TicketCreateModal } from '../tickets';
diff --git a/libs/tup-components/src/mfa/MfaValidationPanel.tsx b/libs/tup-components/src/mfa/MfaValidationPanel.tsx
index e9e9866a5..862608595 100644
--- a/libs/tup-components/src/mfa/MfaValidationPanel.tsx
+++ b/libs/tup-components/src/mfa/MfaValidationPanel.tsx
@@ -1,7 +1,6 @@
import React, { useState } from 'react';
import { useMfaVerify } from '@tacc/tup-hooks';
-import { Button } from '@tacc/core-components';
-import { FieldWrapper } from '@tacc/core-wrappers';
+import { Button, FieldWrapper } from '@tacc/core-components';
import TicketCreateModal from '../tickets/TicketCreateModal';
import styles from './Mfa.module.css';
From 864279a1cd21b2ed4b97bfe0b1446fed7d07a062 Mon Sep 17 00:00:00 2001
From: Wesley Bomar
Date: Mon, 24 Jul 2023 18:55:01 -0500
Subject: [PATCH 46/92] fix: fieldwrapper css duplication too confusing
---
apps/tup-ui/src/main.global.css | 13 +++++++++++++
.../src/lib/FieldWrapper/FieldWrapper.module.css | 16 ----------------
.../src/lib/FieldWrapper/FieldWrapper.tsx | 8 +++-----
.../FieldWrapperFormik/FieldWrapperFormik.tsx | 8 +++-----
4 files changed, 19 insertions(+), 26 deletions(-)
delete mode 100644 libs/core-components/src/lib/FieldWrapper/FieldWrapper.module.css
diff --git a/apps/tup-ui/src/main.global.css b/apps/tup-ui/src/main.global.css
index e1650f166..89a1a88eb 100644
--- a/apps/tup-ui/src/main.global.css
+++ b/apps/tup-ui/src/main.global.css
@@ -63,3 +63,16 @@ h3 {
table {
width: 100%;
}
+
+/* Forms */
+/* TODO: Remove this after making it moot:
+ - either use c-form__star instead of (like CMS)
+ - or add c-form__badge into TACC/Core-Styles
+*/
+.has-required .badge {
+ color: white;
+ font-weight: var(--medium);
+
+ margin-left: 0.5em;
+ vertical-align: top;
+}
diff --git a/libs/core-components/src/lib/FieldWrapper/FieldWrapper.module.css b/libs/core-components/src/lib/FieldWrapper/FieldWrapper.module.css
deleted file mode 100644
index 641703485..000000000
--- a/libs/core-components/src/lib/FieldWrapper/FieldWrapper.module.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/* TODO: Replace this CSS with markup using Core-Styles classes:
- - `has-required`
- - `c-form__star`
- And test on all forms.
-*/
-/* To only use flex layout as necessary */
-/* WARNING: If label has an tag, that tag has spaces (from flex) */
-.label:has(.required-badge) {
- display: flex;
- flex-direction: row;
- gap: 1rem;
-}
-.required-badge {
- color: white;
- font-weight: var(--medium);
-}
diff --git a/libs/core-components/src/lib/FieldWrapper/FieldWrapper.tsx b/libs/core-components/src/lib/FieldWrapper/FieldWrapper.tsx
index 53f07232e..fb3b00c2e 100644
--- a/libs/core-components/src/lib/FieldWrapper/FieldWrapper.tsx
+++ b/libs/core-components/src/lib/FieldWrapper/FieldWrapper.tsx
@@ -1,8 +1,6 @@
import React from 'react';
import { Badge } from 'reactstrap';
-import styles from './FieldWrapper.module.css';
-
export type FieldWrapperProps = {
name?: string;
label: React.ReactNode;
@@ -23,18 +21,18 @@ const FieldWrapper: React.FC> = ({
-
+
{label}
{required ? (
- Required
+ Required
) : null}
{children}
{error && (
)}
{description}
diff --git a/libs/core-wrappers/src/lib/FieldWrapperFormik/FieldWrapperFormik.tsx b/libs/core-wrappers/src/lib/FieldWrapperFormik/FieldWrapperFormik.tsx
index 3a45254a7..e763f557a 100644
--- a/libs/core-wrappers/src/lib/FieldWrapperFormik/FieldWrapperFormik.tsx
+++ b/libs/core-wrappers/src/lib/FieldWrapperFormik/FieldWrapperFormik.tsx
@@ -2,8 +2,6 @@ import React from 'react';
import { ErrorMessage } from 'formik';
import { Badge } from 'reactstrap';
-import styles from '../FieldWrapper/FieldWrapper.module.css';
-
export type FieldWrapperProps = {
name: string;
label: React.ReactNode;
@@ -23,11 +21,11 @@ const FieldWrapper: React.FC> = ({
-
+
{label}
{required && (
- Required
+ Required
)}
@@ -36,7 +34,7 @@ const FieldWrapper: React.FC> = ({
{(msg) => {
return (
);
}}
From 06bf9697e98dbc43a5f2ecaa85ddeb31d924a5b8 Mon Sep 17 00:00:00 2001
From: Wesley Bomar
Date: Mon, 24 Jul 2023 19:23:19 -0500
Subject: [PATCH 47/92] chore: remove excess `` tag
---
libs/core-components/src/lib/FieldWrapper/FieldWrapper.tsx | 4 +---
.../src/lib/FieldWrapperFormik/FieldWrapperFormik.tsx | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/libs/core-components/src/lib/FieldWrapper/FieldWrapper.tsx b/libs/core-components/src/lib/FieldWrapper/FieldWrapper.tsx
index fb3b00c2e..a67b7b338 100644
--- a/libs/core-components/src/lib/FieldWrapper/FieldWrapper.tsx
+++ b/libs/core-components/src/lib/FieldWrapper/FieldWrapper.tsx
@@ -24,9 +24,7 @@ const FieldWrapper: React.FC> = ({
{label}
{required ? (
-
- Required
-
+ Required
) : null}
{children}
diff --git a/libs/core-wrappers/src/lib/FieldWrapperFormik/FieldWrapperFormik.tsx b/libs/core-wrappers/src/lib/FieldWrapperFormik/FieldWrapperFormik.tsx
index e763f557a..b4348b5f7 100644
--- a/libs/core-wrappers/src/lib/FieldWrapperFormik/FieldWrapperFormik.tsx
+++ b/libs/core-wrappers/src/lib/FieldWrapperFormik/FieldWrapperFormik.tsx
@@ -24,9 +24,7 @@ const FieldWrapper: React.FC> = ({
{label}
{required && (
-
- Required
-
+ Required
)}
{children}
From a49e17f79c0851e0963de9c7ffac964ecbfbf03e Mon Sep 17 00:00:00 2001
From: Wesley Bomar
Date: Mon, 24 Jul 2023 19:52:50 -0500
Subject: [PATCH 48/92] chore: no field wrapper desc unless desc exists
---
libs/core-components/src/lib/FieldWrapper/FieldWrapper.tsx | 2 +-
.../src/lib/FieldWrapperFormik/FieldWrapperFormik.tsx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libs/core-components/src/lib/FieldWrapper/FieldWrapper.tsx b/libs/core-components/src/lib/FieldWrapper/FieldWrapper.tsx
index a67b7b338..1bfa80af7 100644
--- a/libs/core-components/src/lib/FieldWrapper/FieldWrapper.tsx
+++ b/libs/core-components/src/lib/FieldWrapper/FieldWrapper.tsx
@@ -33,7 +33,7 @@ const FieldWrapper: React.FC> = ({
{error}
)}
- {description}
+ {description && ({description}
)}
);
diff --git a/libs/core-wrappers/src/lib/FieldWrapperFormik/FieldWrapperFormik.tsx b/libs/core-wrappers/src/lib/FieldWrapperFormik/FieldWrapperFormik.tsx
index b4348b5f7..133640009 100644
--- a/libs/core-wrappers/src/lib/FieldWrapperFormik/FieldWrapperFormik.tsx
+++ b/libs/core-wrappers/src/lib/FieldWrapperFormik/FieldWrapperFormik.tsx
@@ -37,7 +37,7 @@ const FieldWrapper: React.FC> = ({
);
}}
- {description}
+ {description && ({description}
)}
);
};
From c4fdd8733dbf491cd9566e871759a07fd7a9bc35 Mon Sep 17 00:00:00 2001
From: Wesley Bomar
Date: Mon, 24 Jul 2023 20:23:13 -0500
Subject: [PATCH 49/92] npx nx format:write
---
libs/core-components/src/lib/FieldWrapper/FieldWrapper.tsx | 6 ++----
.../src/lib/FieldWrapperFormik/FieldWrapperFormik.tsx | 6 ++----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/libs/core-components/src/lib/FieldWrapper/FieldWrapper.tsx b/libs/core-components/src/lib/FieldWrapper/FieldWrapper.tsx
index 1bfa80af7..f486c5bda 100644
--- a/libs/core-components/src/lib/FieldWrapper/FieldWrapper.tsx
+++ b/libs/core-components/src/lib/FieldWrapper/FieldWrapper.tsx
@@ -23,9 +23,7 @@ const FieldWrapper: React.FC> = ({
>
{label}
- {required ? (
- Required
- ) : null}
+ {required ? Required : null}
{children}
{error && (
@@ -33,7 +31,7 @@ const FieldWrapper: React.FC> = ({
{error}
)}
- {description && ({description}
)}
+ {description && {description}
}
);
diff --git a/libs/core-wrappers/src/lib/FieldWrapperFormik/FieldWrapperFormik.tsx b/libs/core-wrappers/src/lib/FieldWrapperFormik/FieldWrapperFormik.tsx
index 133640009..6188aaec2 100644
--- a/libs/core-wrappers/src/lib/FieldWrapperFormik/FieldWrapperFormik.tsx
+++ b/libs/core-wrappers/src/lib/FieldWrapperFormik/FieldWrapperFormik.tsx
@@ -23,9 +23,7 @@ const FieldWrapper: React.FC
> = ({
>
{label}
- {required && (
- Required
- )}
+ {required && Required }
{children}
@@ -37,7 +35,7 @@ const FieldWrapper: React.FC> = ({
);
}}
- {description && ({description}
)}
+ {description && {description}
}
);
};
From 74ed6a749860d2984f6c46e2bf8bd26ad7a5412b Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Tue, 25 Jul 2023 10:28:24 -0500
Subject: [PATCH 50/92] fix: grammar error from design
---
libs/tup-components/src/mfa/MfaQRPanel.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libs/tup-components/src/mfa/MfaQRPanel.tsx b/libs/tup-components/src/mfa/MfaQRPanel.tsx
index f216fe8bc..746b169e7 100644
--- a/libs/tup-components/src/mfa/MfaQRPanel.tsx
+++ b/libs/tup-components/src/mfa/MfaQRPanel.tsx
@@ -80,7 +80,7 @@ const MfaQRPanel: React.FC = () => {
>
}
>
- View Alternative Verification Code
+ View alternative verification code.
)}
From 83e10bf8e85410d869279c5dff889f1b55b79df8 Mon Sep 17 00:00:00 2001
From: Wesley Bomar
Date: Wed, 26 Jul 2023 10:11:17 -0500
Subject: [PATCH 51/92] chore: use installed @core-styles, not CDN
---
apps/tup-ui/src/main.global.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/tup-ui/src/main.global.css b/apps/tup-ui/src/main.global.css
index 89a1a88eb..1f61c10d6 100644
--- a/apps/tup-ui/src/main.global.css
+++ b/apps/tup-ui/src/main.global.css
@@ -1,7 +1,7 @@
/* To use new c-nav component not yet in TACC/Core-CMS core-styles.base.css */
/* TODO: Remove when TACC/Core-CMS loads TACC/Core-Styles v2.13+ */
/* CAVEAT: Duplicates older, unchanged, global c-nav styles */
-@import url("https://unpkg.com/@tacc/core-styles@2.14.0/dist/components/c-nav.css");
+@import url("@tacc/core-styles/dist/components/c-nav.css");
/* To use s-affixed-input-wrapper which had been unused outside TACC/Core-CMS */
/* TODO: Remove when TACC/Core-CMS loads TACC/Core-Styles v2.14+ */
From cfe9d9273f744451370ac930fa8ee96eec780992 Mon Sep 17 00:00:00 2001
From: Wesley Bomar
Date: Wed, 26 Jul 2023 10:28:36 -0500
Subject: [PATCH 52/92] refactor: simplify TextCopyField (no CopyField)
---
.../src/lib/TextCopyField/TextCopyField.tsx | 23 ++++++++-----------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/libs/core-components/src/lib/TextCopyField/TextCopyField.tsx b/libs/core-components/src/lib/TextCopyField/TextCopyField.tsx
index 20c2ac293..566e061fc 100644
--- a/libs/core-components/src/lib/TextCopyField/TextCopyField.tsx
+++ b/libs/core-components/src/lib/TextCopyField/TextCopyField.tsx
@@ -59,19 +59,6 @@ const TextCopyField: React.FC = ({