From f45cde9e024d70225e8097bd786360dbe7489faf Mon Sep 17 00:00:00 2001 From: Manoj Vaibhav Date: Thu, 20 Nov 2025 19:39:05 +0530 Subject: [PATCH 1/7] X2-13325 Introduced AllowedPrivacies field for Schedule Editor --- .../ScheduleEditor/ScheduleEditor.js | 35 ++++++++++++++++++- .../ScheduleEditor/helpers/schedule.js | 1 + 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/components/ScheduleEditor/ScheduleEditor.js b/src/components/ScheduleEditor/ScheduleEditor.js index 6a44e95b3..b2ffe45fa 100644 --- a/src/components/ScheduleEditor/ScheduleEditor.js +++ b/src/components/ScheduleEditor/ScheduleEditor.js @@ -31,6 +31,16 @@ const ScheduleEditor = ({ value = {}, errors = {}, price = 0, isNew = true, onCh onChange({ ...updatedSchedule, summary: getScheduleSummary(updatedSchedule) }); }; + const handleAllowedPrivaciesChange = (privacy) => { + let updatedPrivacies = [...schedule.allowedPrivacies]; + if (updatedPrivacies.includes(privacy)) { + updatedPrivacies = updatedPrivacies.filter((p) => p !== privacy); + } else { + updatedPrivacies.push(privacy); + } + handleChange(updatedPrivacies, "allowedPrivacies"); + }; + return (
@@ -41,10 +51,33 @@ const ScheduleEditor = ({ value = {}, errors = {}, price = 0, isNew = true, onCh type="name" name="scheduleName" id="scheduleName" - placeholder="sm" placeholder="Daily" /> + +
+ handleAllowedPrivaciesChange("public")} + /> + handleAllowedPrivaciesChange("private")} + /> +
+
{isNew ? (
diff --git a/src/components/ScheduleEditor/helpers/schedule.js b/src/components/ScheduleEditor/helpers/schedule.js index 258df3efb..fbcaad091 100644 --- a/src/components/ScheduleEditor/helpers/schedule.js +++ b/src/components/ScheduleEditor/helpers/schedule.js @@ -10,5 +10,6 @@ export const getScheduleDefaultValues = () => { priceDeltaType: "", times: [], timeRanges: [], + allowedPrivacies: ["public", "private"], }; }; From 82b79c52252f47078b67fd91ca12600cddbc9680 Mon Sep 17 00:00:00 2001 From: Manoj Vaibhav Date: Thu, 27 Nov 2025 17:01:44 +0530 Subject: [PATCH 2/7] X2-13325 Updatd package.json --- package-lock.json | 4 ++-- package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0e1e4e746..0293225a9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { - "name": "xola-ui-kit", - "version": "1.4.1", + "name": "@xola/ui-kit", + "version": "1.4.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 5ff341272..0ba9fa263 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "xola-ui-kit", - "version": "1.4.1", + "name": "@xola/ui-kit", + "version": "1.4.2", "description": "Xola UI Kit", "main": "lib/index.js", "license": "MIT", From 8f1d6a64d7cba542c45d94dc79615fa61343f56e Mon Sep 17 00:00:00 2001 From: Manoj Vaibhav Date: Fri, 28 Nov 2025 11:17:45 +0530 Subject: [PATCH 3/7] X2-13325 Showing error message for allowedPrivacies --- src/components/ScheduleEditor/ScheduleEditor.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/ScheduleEditor/ScheduleEditor.js b/src/components/ScheduleEditor/ScheduleEditor.js index b2ffe45fa..9bb68df04 100644 --- a/src/components/ScheduleEditor/ScheduleEditor.js +++ b/src/components/ScheduleEditor/ScheduleEditor.js @@ -54,7 +54,11 @@ const ScheduleEditor = ({ value = {}, errors = {}, price = 0, isNew = true, onCh placeholder="Daily" /> - +
Date: Fri, 28 Nov 2025 13:17:50 +0530 Subject: [PATCH 4/7] X2-13325 Showing error --- src/components/ScheduleEditor/ScheduleEditor.js | 10 +++++----- src/components/ScheduleEditor/ScheduleEditorRow.js | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/ScheduleEditor/ScheduleEditor.js b/src/components/ScheduleEditor/ScheduleEditor.js index 9bb68df04..404c91898 100644 --- a/src/components/ScheduleEditor/ScheduleEditor.js +++ b/src/components/ScheduleEditor/ScheduleEditor.js @@ -11,6 +11,7 @@ import { getScheduleSummary } from "./helpers/scheduleSummary"; import { getScheduleDefaultValues } from "./helpers/schedule"; const ScheduleEditor = ({ value = {}, errors = {}, price = 0, isNew = true, onChange }) => { + console.log("errors", errors); value = JSON.parse(JSON.stringify(value)); if (value.dates?.length > 0) { value.dates = value.dates.map((date) => new Date(date)); @@ -54,11 +55,7 @@ const ScheduleEditor = ({ value = {}, errors = {}, price = 0, isNew = true, onCh placeholder="Daily" /> - +
handleAllowedPrivaciesChange("private")} />
+ {errors && errors.allowedPrivacies && ( + {errors.allowedPrivacies} + )}
{isNew ? ( diff --git a/src/components/ScheduleEditor/ScheduleEditorRow.js b/src/components/ScheduleEditor/ScheduleEditorRow.js index a5f486ff2..79ce02908 100644 --- a/src/components/ScheduleEditor/ScheduleEditorRow.js +++ b/src/components/ScheduleEditor/ScheduleEditorRow.js @@ -3,6 +3,7 @@ import { Col, FormFeedback, FormGroup, Input, Label } from "reactstrap"; import classNames from "classnames"; const ScheduleEditorRow = ({ label, error, htmlFor, children }) => { + console.log(error); return ( From 6c3860237df0a49c136c30d2da2b0a3cd96d15aa Mon Sep 17 00:00:00 2001 From: Manoj Vaibhav Date: Fri, 28 Nov 2025 14:25:17 +0530 Subject: [PATCH 5/7] X2-13325 Temp fix --- src/components/ScheduleEditor/ScheduleEditor.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/components/ScheduleEditor/ScheduleEditor.js b/src/components/ScheduleEditor/ScheduleEditor.js index 404c91898..653f4ee00 100644 --- a/src/components/ScheduleEditor/ScheduleEditor.js +++ b/src/components/ScheduleEditor/ScheduleEditor.js @@ -55,7 +55,11 @@ const ScheduleEditor = ({ value = {}, errors = {}, price = 0, isNew = true, onCh placeholder="Daily" /> - +
handleAllowedPrivaciesChange("private")} />
- {errors && errors.allowedPrivacies && ( + {/* {errors && errors.allowedPrivacies && ( {errors.allowedPrivacies} - )} + )} */}
{isNew ? ( From 2d8d30c8dff9fa7cb0f43e3ff44bc32160da38ab Mon Sep 17 00:00:00 2001 From: Manoj Vaibhav Date: Fri, 28 Nov 2025 15:20:52 +0530 Subject: [PATCH 6/7] X2-13325 refactor --- src/components/ScheduleEditor/ScheduleEditor.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/components/ScheduleEditor/ScheduleEditor.js b/src/components/ScheduleEditor/ScheduleEditor.js index 653f4ee00..e4014f985 100644 --- a/src/components/ScheduleEditor/ScheduleEditor.js +++ b/src/components/ScheduleEditor/ScheduleEditor.js @@ -82,9 +82,6 @@ const ScheduleEditor = ({ value = {}, errors = {}, price = 0, isNew = true, onCh onChange={(e) => handleAllowedPrivaciesChange("private")} />
- {/* {errors && errors.allowedPrivacies && ( - {errors.allowedPrivacies} - )} */}
{isNew ? ( From 1a0ddeea93d8437752f85a67fa2829dbec1b9ad2 Mon Sep 17 00:00:00 2001 From: Manoj Vaibhav Date: Fri, 28 Nov 2025 16:43:32 +0530 Subject: [PATCH 7/7] X2-13325 Removed console.log --- src/components/ScheduleEditor/ScheduleEditor.js | 1 - src/components/ScheduleEditor/ScheduleEditorRow.js | 1 - 2 files changed, 2 deletions(-) diff --git a/src/components/ScheduleEditor/ScheduleEditor.js b/src/components/ScheduleEditor/ScheduleEditor.js index e4014f985..9bb68df04 100644 --- a/src/components/ScheduleEditor/ScheduleEditor.js +++ b/src/components/ScheduleEditor/ScheduleEditor.js @@ -11,7 +11,6 @@ import { getScheduleSummary } from "./helpers/scheduleSummary"; import { getScheduleDefaultValues } from "./helpers/schedule"; const ScheduleEditor = ({ value = {}, errors = {}, price = 0, isNew = true, onChange }) => { - console.log("errors", errors); value = JSON.parse(JSON.stringify(value)); if (value.dates?.length > 0) { value.dates = value.dates.map((date) => new Date(date)); diff --git a/src/components/ScheduleEditor/ScheduleEditorRow.js b/src/components/ScheduleEditor/ScheduleEditorRow.js index 79ce02908..a5f486ff2 100644 --- a/src/components/ScheduleEditor/ScheduleEditorRow.js +++ b/src/components/ScheduleEditor/ScheduleEditorRow.js @@ -3,7 +3,6 @@ import { Col, FormFeedback, FormGroup, Input, Label } from "reactstrap"; import classNames from "classnames"; const ScheduleEditorRow = ({ label, error, htmlFor, children }) => { - console.log(error); return (