From c55b058eaac3905ac8ddb2027d9c0bd110d65d79 Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Thu, 6 Feb 2025 12:50:48 +0530 Subject: [PATCH 01/18] Added validation to fileset dialog --- .../app/metalakes/metalake/rightContent/CreateFilesetDialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js b/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js index 873876e6e91..cfd78535330 100644 --- a/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js +++ b/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js @@ -72,7 +72,7 @@ const schema = yup.object().shape({ propItems: yup.array().of( yup.object().shape({ required: yup.boolean(), - key: yup.string().required(), + key: yup.string().required().matches(/^[a-zA-Z_][a-zA-Z0-9_-]*$/, 'Valid key must start with a letter/underscore, followed by alphanumeric characters, underscores, hyphens, or dots.'), value: yup.string().when('required', { is: true, then: schema => schema.required() From 1f184a47ce70251463b2b29f3d395430d073c581 Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Mon, 10 Feb 2025 11:06:20 +0530 Subject: [PATCH 02/18] Update CreateFilesetDialog.js -"style: run prettier to fix formatting" --- .../metalake/rightContent/CreateFilesetDialog.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js b/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js index cfd78535330..baf5b7cf803 100644 --- a/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js +++ b/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js @@ -72,7 +72,13 @@ const schema = yup.object().shape({ propItems: yup.array().of( yup.object().shape({ required: yup.boolean(), - key: yup.string().required().matches(/^[a-zA-Z_][a-zA-Z0-9_-]*$/, 'Valid key must start with a letter/underscore, followed by alphanumeric characters, underscores, hyphens, or dots.'), + key: yup + .string() + .required() + .matches( + /^[a-zA-Z_][a-zA-Z0-9_-]*$/, + 'Valid key must start with a letter/underscore, followed by alphanumeric characters, underscores, hyphens, or dots.' + ), value: yup.string().when('required', { is: true, then: schema => schema.required() From 44fa13a20c2365a7a6f23582a98a3de05f4ebcbb Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Mon, 10 Feb 2025 11:03:03 +0530 Subject: [PATCH 03/18] style: run prettier to fix formatting --- .../app/metalakes/metalake/rightContent/CreateFilesetDialog.js | 1 + 1 file changed, 1 insertion(+) diff --git a/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js b/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js index baf5b7cf803..75f37280679 100644 --- a/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js +++ b/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js @@ -19,6 +19,7 @@ 'use client' + import { useState, forwardRef, useEffect, Fragment } from 'react' import { From 84fc35d23fcd0a2c1b4dbc187a2a19e284c4bb21 Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Wed, 12 Feb 2025 09:17:20 +0530 Subject: [PATCH 04/18] Updated another file --- web/web/src/lib/utils/regex.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/web/src/lib/utils/regex.js b/web/web/src/lib/utils/regex.js index 072211785b1..2f42cf0bfa2 100644 --- a/web/web/src/lib/utils/regex.js +++ b/web/web/src/lib/utils/regex.js @@ -22,4 +22,4 @@ export const nameRegex = /^\w[\w]{0,63}$/ export const nameRegexDesc = 'This field must begin with a letter or underscore, contain only alphanumeric characters or underscores, and be between 1 and 64 characters in length' -export const keyRegex = /^[a-zA-Z_][a-zA-Z0-9-_.]*$/ +export const keyRegex = /^[a-zA-Z_][a-zA-Z0-9_-]*$/ \ No newline at end of file From 7fae87baf07c7695fbd0a71c1c546cc4a467875d Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Wed, 12 Feb 2025 09:24:06 +0530 Subject: [PATCH 05/18] Updated another file --- .../app/metalakes/metalake/rightContent/CreateFilesetDialog.js | 1 + web/web/src/lib/utils/regex.js | 1 + 2 files changed, 2 insertions(+) diff --git a/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js b/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js index 75f37280679..de0377d986c 100644 --- a/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js +++ b/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js @@ -22,6 +22,7 @@ import { useState, forwardRef, useEffect, Fragment } from 'react' + import { Box, Grid, diff --git a/web/web/src/lib/utils/regex.js b/web/web/src/lib/utils/regex.js index 2f42cf0bfa2..4fb003f9e23 100644 --- a/web/web/src/lib/utils/regex.js +++ b/web/web/src/lib/utils/regex.js @@ -19,6 +19,7 @@ export const nameRegex = /^\w[\w]{0,63}$/ + export const nameRegexDesc = 'This field must begin with a letter or underscore, contain only alphanumeric characters or underscores, and be between 1 and 64 characters in length' From 63aa46ae0b636e4aac7a18fe6414b951ce680ef0 Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Wed, 12 Feb 2025 09:27:00 +0530 Subject: [PATCH 06/18] Update CreateFilesetDialog.js --- .../app/metalakes/metalake/rightContent/CreateFilesetDialog.js | 1 - 1 file changed, 1 deletion(-) diff --git a/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js b/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js index de0377d986c..75f37280679 100644 --- a/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js +++ b/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js @@ -22,7 +22,6 @@ import { useState, forwardRef, useEffect, Fragment } from 'react' - import { Box, Grid, From d403c9350b35a0fe8f42d2e580ba297a13bfe019 Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Wed, 12 Feb 2025 09:27:16 +0530 Subject: [PATCH 07/18] Update regex.js --- web/web/src/lib/utils/regex.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/web/src/lib/utils/regex.js b/web/web/src/lib/utils/regex.js index 4fb003f9e23..229aa575368 100644 --- a/web/web/src/lib/utils/regex.js +++ b/web/web/src/lib/utils/regex.js @@ -19,8 +19,7 @@ export const nameRegex = /^\w[\w]{0,63}$/ - export const nameRegexDesc = 'This field must begin with a letter or underscore, contain only alphanumeric characters or underscores, and be between 1 and 64 characters in length' -export const keyRegex = /^[a-zA-Z_][a-zA-Z0-9_-]*$/ \ No newline at end of file +export const keyRegex = /^[a-zA-Z_][a-zA-Z0-9_-]*$/ From 17028548da68b92725115b1b30eed11195fd13ce Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Wed, 12 Feb 2025 09:37:09 +0530 Subject: [PATCH 08/18] Update regex.js --- web/web/src/lib/utils/regex.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/web/src/lib/utils/regex.js b/web/web/src/lib/utils/regex.js index 229aa575368..072211785b1 100644 --- a/web/web/src/lib/utils/regex.js +++ b/web/web/src/lib/utils/regex.js @@ -22,4 +22,4 @@ export const nameRegex = /^\w[\w]{0,63}$/ export const nameRegexDesc = 'This field must begin with a letter or underscore, contain only alphanumeric characters or underscores, and be between 1 and 64 characters in length' -export const keyRegex = /^[a-zA-Z_][a-zA-Z0-9_-]*$/ +export const keyRegex = /^[a-zA-Z_][a-zA-Z0-9-_.]*$/ From ee7df628bb3e855e2a05a28209a943b8a00c242e Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Wed, 12 Feb 2025 12:10:21 +0530 Subject: [PATCH 09/18] fixed the nameregex and deccription --- web/web/src/lib/utils/regex.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/web/src/lib/utils/regex.js b/web/web/src/lib/utils/regex.js index 072211785b1..5bb652e49ba 100644 --- a/web/web/src/lib/utils/regex.js +++ b/web/web/src/lib/utils/regex.js @@ -17,9 +17,11 @@ * under the License. */ -export const nameRegex = /^\w[\w]{0,63}$/ +export const nameRegex = /^[a-zA-Z_][a-zA-Z0-9_/=-]{0,63}$/; + export const nameRegexDesc = - 'This field must begin with a letter or underscore, contain only alphanumeric characters or underscores, and be between 1 and 64 characters in length' + 'This field must begin with a letter or underscore, can contain alphanumeric characters, underscores, slashes, equal signs, or hyphens, and must be between 1 and 64 characters in length.'; + export const keyRegex = /^[a-zA-Z_][a-zA-Z0-9-_.]*$/ From d7abea51c837b02c4e546346f8775eebffb12dcf Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Wed, 12 Feb 2025 12:15:00 +0530 Subject: [PATCH 10/18] fixed the nameregex and deccription --- .../app/metalakes/metalake/rightContent/CreateFilesetDialog.js | 1 + 1 file changed, 1 insertion(+) diff --git a/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js b/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js index 75f37280679..de0377d986c 100644 --- a/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js +++ b/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js @@ -22,6 +22,7 @@ import { useState, forwardRef, useEffect, Fragment } from 'react' + import { Box, Grid, From 2b5b26051cd7497b4dcb87f553c669654cf396a2 Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Wed, 12 Feb 2025 12:16:09 +0530 Subject: [PATCH 11/18] Update CreateFilesetDialog.js --- .../app/metalakes/metalake/rightContent/CreateFilesetDialog.js | 1 - 1 file changed, 1 deletion(-) diff --git a/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js b/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js index de0377d986c..75f37280679 100644 --- a/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js +++ b/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js @@ -22,7 +22,6 @@ import { useState, forwardRef, useEffect, Fragment } from 'react' - import { Box, Grid, From 48fe3096643c6f69e4e2e84f33b64b6a2db67b17 Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Wed, 12 Feb 2025 12:21:46 +0530 Subject: [PATCH 12/18] Update CreateFilesetDialog.js --- .../metalake/rightContent/CreateFilesetDialog.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js b/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js index 75f37280679..8d94b9b604b 100644 --- a/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js +++ b/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js @@ -73,13 +73,7 @@ const schema = yup.object().shape({ propItems: yup.array().of( yup.object().shape({ required: yup.boolean(), - key: yup - .string() - .required() - .matches( - /^[a-zA-Z_][a-zA-Z0-9_-]*$/, - 'Valid key must start with a letter/underscore, followed by alphanumeric characters, underscores, hyphens, or dots.' - ), + key: yup.string().required(), value: yup.string().when('required', { is: true, then: schema => schema.required() From 2f40e14790bb08cdddfee30d9474a569a1cffa69 Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Wed, 12 Feb 2025 12:22:55 +0530 Subject: [PATCH 13/18] Update web/web/src/lib/utils/regex.js Co-authored-by: Qian Xia --- web/web/src/lib/utils/regex.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/web/src/lib/utils/regex.js b/web/web/src/lib/utils/regex.js index 5bb652e49ba..2fdb7d81104 100644 --- a/web/web/src/lib/utils/regex.js +++ b/web/web/src/lib/utils/regex.js @@ -17,7 +17,7 @@ * under the License. */ -export const nameRegex = /^[a-zA-Z_][a-zA-Z0-9_/=-]{0,63}$/; +export const nameRegex = /^\w[\w/=-]{0,63}$/ export const nameRegexDesc = From 727d70d47c4edd449424c07e6115b61b69af4228 Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Wed, 12 Feb 2025 12:23:45 +0530 Subject: [PATCH 14/18] Update CreateFilesetDialog.js --- .../app/metalakes/metalake/rightContent/CreateFilesetDialog.js | 1 - 1 file changed, 1 deletion(-) diff --git a/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js b/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js index 8d94b9b604b..873876e6e91 100644 --- a/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js +++ b/web/web/src/app/metalakes/metalake/rightContent/CreateFilesetDialog.js @@ -19,7 +19,6 @@ 'use client' - import { useState, forwardRef, useEffect, Fragment } from 'react' import { From e8e2b3fb04cdecd18dd474326c4e0a71ab54fd4f Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Wed, 12 Feb 2025 18:23:07 +0530 Subject: [PATCH 15/18] Prettier executed on the file --- web/web/src/lib/utils/regex.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web/web/src/lib/utils/regex.js b/web/web/src/lib/utils/regex.js index 2fdb7d81104..a0e12094ed5 100644 --- a/web/web/src/lib/utils/regex.js +++ b/web/web/src/lib/utils/regex.js @@ -17,11 +17,14 @@ * under the License. */ +<<<<<<< HEAD export const nameRegex = /^\w[\w/=-]{0,63}$/ +======= +export const nameRegex = /^[a-zA-Z_][a-zA-Z0-9_/=-]{0,63}$/ +>>>>>>> c35281ad5 (Prettier executed on the file) export const nameRegexDesc = - 'This field must begin with a letter or underscore, can contain alphanumeric characters, underscores, slashes, equal signs, or hyphens, and must be between 1 and 64 characters in length.'; - + 'This field must begin with a letter or underscore, can contain alphanumeric characters, underscores, slashes, equal signs, or hyphens, and must be between 1 and 64 characters in length.' export const keyRegex = /^[a-zA-Z_][a-zA-Z0-9-_.]*$/ From 988c65f3471de17b70f44dbf1fedff2f8abba666 Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Thu, 13 Feb 2025 09:56:47 +0530 Subject: [PATCH 16/18] fixed the issue --- web/web/src/lib/utils/regex.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/web/web/src/lib/utils/regex.js b/web/web/src/lib/utils/regex.js index a0e12094ed5..02ddffc3bb6 100644 --- a/web/web/src/lib/utils/regex.js +++ b/web/web/src/lib/utils/regex.js @@ -17,12 +17,7 @@ * under the License. */ -<<<<<<< HEAD -export const nameRegex = /^\w[\w/=-]{0,63}$/ - -======= export const nameRegex = /^[a-zA-Z_][a-zA-Z0-9_/=-]{0,63}$/ ->>>>>>> c35281ad5 (Prettier executed on the file) export const nameRegexDesc = 'This field must begin with a letter or underscore, can contain alphanumeric characters, underscores, slashes, equal signs, or hyphens, and must be between 1 and 64 characters in length.' From 421ed51017ad6db54b4d0e661f3c207bc84b3b23 Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Mon, 24 Feb 2025 10:11:13 +0530 Subject: [PATCH 17/18] Update regex.js --- web/web/src/lib/utils/regex.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/web/src/lib/utils/regex.js b/web/web/src/lib/utils/regex.js index 02ddffc3bb6..0dc2cd6ef3c 100644 --- a/web/web/src/lib/utils/regex.js +++ b/web/web/src/lib/utils/regex.js @@ -17,9 +17,9 @@ * under the License. */ -export const nameRegex = /^[a-zA-Z_][a-zA-Z0-9_/=-]{0,63}$/ +export const nameRegex = /^\w[\w/=-]{0,63}$/ export const nameRegexDesc = - 'This field must begin with a letter or underscore, can contain alphanumeric characters, underscores, slashes, equal signs, or hyphens, and must be between 1 and 64 characters in length.' + 'This field must start with a letter or underscore, can include alphanumeric characters, underscores, slashes (/), equal signs (=), or hyphens (-), and must be between 1 and 64 characters long.' export const keyRegex = /^[a-zA-Z_][a-zA-Z0-9-_.]*$/ From da6cea89a40ec62b715f4bf1fd5175d8057016ed Mon Sep 17 00:00:00 2001 From: Pranay Kumar Karvi Date: Mon, 24 Feb 2025 10:19:49 +0530 Subject: [PATCH 18/18] Update web/web/src/lib/utils/regex.js Co-authored-by: Qian Xia --- web/web/src/lib/utils/regex.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/web/src/lib/utils/regex.js b/web/web/src/lib/utils/regex.js index 0dc2cd6ef3c..161253367f2 100644 --- a/web/web/src/lib/utils/regex.js +++ b/web/web/src/lib/utils/regex.js @@ -20,6 +20,6 @@ export const nameRegex = /^\w[\w/=-]{0,63}$/ export const nameRegexDesc = - 'This field must start with a letter or underscore, can include alphanumeric characters, underscores, slashes (/), equal signs (=), or hyphens (-), and must be between 1 and 64 characters long.' + 'This field must start with a letter, digit, or underscore, can include alphanumeric characters, underscores, slashes (/), equal signs (=), or hyphens (-), and must be between 1 and 64 characters long.' export const keyRegex = /^[a-zA-Z_][a-zA-Z0-9-_.]*$/