Skip to content

Commit 5b49d9a

Browse files
authored
Merge pull request #963 from arun-s-aot/release/8.0.0
[Release] Release v8.0.0-rc image updations
2 parents 619b8d8 + 4106df6 commit 5b49d9a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1555
-757
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v8.0.0-alpha
1+
v8.0.0-rc

forms-flow-admin/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

forms-flow-admin/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@formsflow/admin",
3-
"version": "8.0.0-alpha",
3+
"version": "8.0.0-rc",
44
"scripts": {
55
"start": "webpack serve",
66
"start:standalone": "webpack serve --env standalone",

forms-flow-admin/src/components/roles/roles.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,15 @@ const Roles = React.memo((props: any) => {
121121
React.useEffect(() => {
122122
fetchPermissions(
123123
(data) => {
124-
setPermissionData(data);
124+
// Filter out manage_bundles, manage_integrations, and manage_templates permissions
125+
// Hide because v8 out of scope - will be restored later
126+
const filteredData = data.filter(
127+
(permission) =>
128+
permission.name !== "manage_bundles" &&
129+
permission.name !== "manage_integrations" &&
130+
permission.name !== "manage_templates"
131+
);
132+
setPermissionData(filteredData);
125133
},
126134
(err) => {
127135
setError(err);

forms-flow-components/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

forms-flow-components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@formsflow/components",
3-
"version": "8.0.0-alpha",
3+
"version": "8.0.0-rc",
44
"scripts": {
55
"start": "webpack serve",
66
"start:standalone": "webpack serve --env standalone",

forms-flow-components/src/components/CustomComponents/CustomTextArea.tsx

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ interface CustomTextAreaProps {
1111
rows?: number;
1212
maxLength?: number;
1313
className?: string;
14+
icon?: React.ReactNode;
15+
onIconClick?: () => void;
1416
}
1517

1618
export const CustomTextArea: FC<CustomTextAreaProps> = ({
@@ -23,10 +25,19 @@ export const CustomTextArea: FC<CustomTextAreaProps> = ({
2325
rows = 4,
2426
maxLength,
2527
className = "",
28+
icon,
29+
onIconClick,
2630
}) => {
2731
const { t } = useTranslation();
2832
const inputId = `${dataTestId}-textarea`; // unique id per instance
29-
const containerClass = `text-area-container${disabled ? " text-area-disabled" : ""}${className ? ` ${className}` : ""}`;
33+
const containerClass = [
34+
"text-area-container",
35+
disabled ? "text-area-disabled" : "",
36+
icon ? "text-area-with-icon" : "",
37+
className,
38+
]
39+
.filter(Boolean)
40+
.join(" ");
3041

3142
return (
3243
<div className={containerClass}>
@@ -50,6 +61,27 @@ export const CustomTextArea: FC<CustomTextAreaProps> = ({
5061
rows={rows}
5162
{...(maxLength ? { maxLength } : {})}
5263
/>
64+
{icon && (
65+
<div
66+
className={`text-area-icon ${onIconClick ? "text-area-icon-clickable" : ""}`}
67+
onClick={onIconClick}
68+
role={onIconClick ? "button" : undefined}
69+
tabIndex={onIconClick ? 0 : undefined}
70+
onKeyDown={
71+
onIconClick
72+
? (e) => {
73+
if (e.key === "Enter" || e.key === " ") {
74+
e.preventDefault();
75+
onIconClick();
76+
}
77+
}
78+
: undefined
79+
}
80+
aria-label={onIconClick ? "Icon button" : undefined}
81+
>
82+
{icon}
83+
</div>
84+
)}
5385
</div>
5486
);
5587
};

forms-flow-components/src/components/CustomComponents/CustomTextInput.tsx

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ interface CustomTextInputProps {
1111
onBlur?: React.FocusEventHandler<HTMLInputElement>;
1212
maxLength?: number;
1313
minLength?: number;
14+
icon?: React.ReactNode;
15+
onIconClick?: () => void;
1416
}
1517

1618
export const CustomTextInput: FC<CustomTextInputProps> = ({
@@ -23,12 +25,14 @@ export const CustomTextInput: FC<CustomTextInputProps> = ({
2325
onBlur,
2426
maxLength,
2527
minLength,
28+
icon,
29+
onIconClick,
2630
}) => {
2731
const { t } = useTranslation();
2832
const inputId = `${dataTestId}-input`; // unique id
2933

3034
return (
31-
<div className="text-input-container">
35+
<div className={`text-input-container ${icon ? "text-input-with-icon" : ""}`}>
3236
{/* Hidden label for accessibility */}
3337
{/* <label htmlFor={inputId} className="sr-only">
3438
{ariaLabel || t(placeholder)}
@@ -48,6 +52,23 @@ export const CustomTextInput: FC<CustomTextInputProps> = ({
4852
maxLength={maxLength}
4953
minLength={minLength}
5054
/>
55+
{icon && (
56+
<div
57+
className={`text-input-icon ${onIconClick ? "text-input-icon-clickable" : ""}`}
58+
onClick={onIconClick}
59+
role={onIconClick ? "button" : undefined}
60+
tabIndex={onIconClick ? 0 : undefined}
61+
onKeyDown={onIconClick ? (e) => {
62+
if (e.key === "Enter" || e.key === " ") {
63+
e.preventDefault();
64+
onIconClick();
65+
}
66+
} : undefined}
67+
aria-label={onIconClick ? "Icon button" : undefined}
68+
>
69+
{icon}
70+
</div>
71+
)}
5172
</div>
5273
);
5374
};

0 commit comments

Comments
 (0)