@appcorp/fusion-storybook 0.2.44 → 0.2.45

package/base-modules/admission/filter.js

@@ -32,8 +32,8 @@ export const AdmissionFilter = () => {
         label: t("filterAdmissionStatusLabel"),
         info: t("filterByAdmissionStatus"),
         options: ADMISSION_STATUS_OPTIONS.map((opt) => ({
-            id: opt.value,
-            name: admissionStatusLabelMap[opt.value] || opt.label,
+            value: opt.value,
+            label: admissionStatusLabelMap[opt.value] || opt.label,
         })),
         value: filterAdmissionStatus || "",
         onValueChange: (value) => handleChange("filterAdmissionStatus", value),

package/base-modules/admission/form.js

@@ -44,8 +44,8 @@ export const AdmissionForm = () => {
         required: true,
         onValueChange: (value) => handleChange("gender", value),
         options: GENDER_OPTIONS.map((g) => ({
-            id: g.value,
-            name: genderLabelMap[g.value] || g.label,
+            value: g.value,
+            label: genderLabelMap[g.value] || g.label,
         })),
         placeholder: t("formGenderPlaceholder"),
         searchEndpoint: ADMISSION_API_ROUTES.UNIT,
@@ -63,8 +63,8 @@ export const AdmissionForm = () => {
             .map((code) => {
             var _a;
             return ({
-                id: code.code,
-                name: `${code.code} - ${code.discountValue}${code.discountType === "PERCENTAGE" ? "%" : (_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.currency}`,
+                value: code.code,
+                label: `${code.code} - ${code.discountValue}${code.discountType === "PERCENTAGE" ? "%" : (_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.currency}`,
             });
         }),
         placeholder: t("formDiscountCodePlaceholder"),

package/base-modules/attendance/form.js

@@ -24,8 +24,8 @@ export const AttendanceForm = () => {
         label: t("formOptionStatus"),
         onValueChange: (value) => handleChange("status", value),
         options: ATTENDANCE_STATUS_OPTIONS.map((opt) => ({
-            id: opt.value,
-            name: attendanceStatusLabelMap[opt.value] || opt.label,
+            value: opt.value,
+            label: attendanceStatusLabelMap[opt.value] || opt.label,
         })),
         placeholder: t("formStatusPlaceholder"),
         required: true,

package/base-modules/attendance/more-actions.js

@@ -20,8 +20,8 @@ export const AttendanceMoreActions = ({ labelAttendanceStatus, labelCourse, labe
         label: labelCourse,
         onValueChange: (value) => setCourseId(value),
         options: [{ id: "", code: "" }].map((c) => ({
-            id: c.id,
-            name: c.code.trim(),
+            value: c.id,
+            label: c.code.trim(),
         })),
         placeholder: labelCoursePlaceholder,
         required: true,

package/base-modules/course/form.js

@@ -45,8 +45,8 @@ export const CourseForm = () => {
         options: sections === null || sections === void 0 ? void 0 : sections.map((section) => {
             var _a;
             return ({
-                id: section.id,
-                name: ((_a = section.class) === null || _a === void 0 ? void 0 : _a.code)
+                value: section.id,
+                label: ((_a = section.class) === null || _a === void 0 ? void 0 : _a.code)
                     ? `${section.class.code}-${section.name}`
                     : section.name,
             });
@@ -68,8 +68,8 @@ export const CourseForm = () => {
             handleChange("subjectLabel", ((_a = subjects === null || subjects === void 0 ? void 0 : subjects.find((s) => s.id === value)) === null || _a === void 0 ? void 0 : _a.name) || "");
         },
         options: subjects === null || subjects === void 0 ? void 0 : subjects.map((subject) => ({
-            id: subject.id,
-            name: subject.name,
+            value: subject.id,
+            label: subject.name,
         })),
         placeholder: t("formSubjectPlaceholder"),
         required: true,
@@ -92,8 +92,8 @@ export const CourseForm = () => {
                 : "");
         },
         options: teachers === null || teachers === void 0 ? void 0 : teachers.map((teacher) => ({
-            id: teacher.id,
-            name: `${teacher.firstName || ""} ${teacher.lastName || ""}`.trim() ||
+            value: teacher.id,
+            label: `${teacher.firstName || ""} ${teacher.lastName || ""}`.trim() ||
                 teacher.teacherCode ||
                 teacher.id,
         })),

package/base-modules/discount-code/form.js

@@ -34,8 +34,8 @@ export const DiscountCodeForm = () => {
         label: t("formDiscountTypeLabel"),
         onValueChange: (value) => handleChange("discountType", value),
         options: DISCOUNT_TYPE_OPTIONS.map((opt) => ({
-            id: opt.value,
-            name: discountTypeLabelMap[opt.value] || opt.label,
+            value: opt.value,
+            label: discountTypeLabelMap[opt.value] || opt.label,
         })),
         placeholder: t("formDiscountTypePlaceholder"),
         required: true,

package/base-modules/enrollment/form.js

@@ -23,7 +23,7 @@ import { useTranslations } from "next-intl";
 // COMPONENT
 // ============================================================================
 export const EnrollmentForm = () => {
-    const { state: { enabled, enrollmentDate, errors, sectionId, studentProfileId, }, handleChange, } = useEnrollmentModule();
+    const { state: { enabled, enrollmentDate, errors, sectionId, studentProfileId }, handleChange, } = useEnrollmentModule();
     const t = useTranslations("enrollment");
     const { enhancedComboboxElement: studentProfileIdCombo } = useEnhancedCombobox({
         emptyText: t("formNoStudentEmpty"),
@@ -32,8 +32,8 @@ export const EnrollmentForm = () => {
         label: t("formStudentLabel"),
         onValueChange: (value) => handleChange("studentProfileId", value),
         options: (getCachedStudentProfilesSync().items || []).map((s) => ({
-            id: s.id,
-            name: s.studentCode || s.id,
+            value: s.id,
+            label: s.studentCode || s.id,
         })),
         placeholder: t("formStudentPlaceholder"),
         required: true,
@@ -50,8 +50,8 @@ export const EnrollmentForm = () => {
         options: (getCachedSectionsSync().items || []).map((s) => {
             var _a;
             return ({
-                id: s.id,
-                name: ((_a = s.class) === null || _a === void 0 ? void 0 : _a.code) ? `${s.class.code}-${s.name}` : s.name,
+                value: s.id,
+                label: ((_a = s.class) === null || _a === void 0 ? void 0 : _a.code) ? `${s.class.code}-${s.name}` : s.name,
             });
         }),
         placeholder: t("sectionPlaceholder"),

package/base-modules/expense/filter.js

@@ -9,7 +9,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { EnhancedRadio } from "@appcorp/shadcn/components/enhanced-radio";
 import { useEnhancedCombobox } from "@appcorp/shadcn/hooks/use-enhanced-combobox";
 import { useExpenseModule } from "./context";
-import { EXPENSE_CATEGORY_OPTIONS, EXPENSE_STATUS_OPTIONS, EXPENSE_API_ROUTES } from "./constants";
+import { EXPENSE_CATEGORY_OPTIONS, EXPENSE_STATUS_OPTIONS, EXPENSE_API_ROUTES, } from "./constants";
 import { useTranslations } from "next-intl";
 export const ExpenseFilter = () => {
     const { state, handleChange } = useExpenseModule();
@@ -49,7 +49,10 @@ export const ExpenseFilter = () => {
         info: t("filterByCategory"),
         label: t("filterCategoryLabel"),
         onValueChange: (value) => handleChange("filterCategory", value),
-        options: EXPENSE_CATEGORY_OPTIONS.map((opt) => ({ id: opt.value, name: categoryLabelMap[opt.value] || opt.label })),
+        options: EXPENSE_CATEGORY_OPTIONS.map((opt) => ({
+            value: opt.value,
+            label: categoryLabelMap[opt.value] || opt.label,
+        })),
         placeholder: t("filterAllCategoriesLabel"),
         searchEndpoint: EXPENSE_API_ROUTES.UNIT,
         searchPlaceholder: t("filterSearchCategoriesLabel"),
@@ -61,7 +64,10 @@ export const ExpenseFilter = () => {
         info: t("filterByStatus"),
         label: t("filterOptionStatus"),
         onValueChange: (value) => handleChange("filterStatus", value),
-        options: EXPENSE_STATUS_OPTIONS.map((opt) => ({ id: opt.value, name: statusLabelMap[opt.value] || opt.label })),
+        options: EXPENSE_STATUS_OPTIONS.map((opt) => ({
+            value: opt.value,
+            label: statusLabelMap[opt.value] || opt.label,
+        })),
         placeholder: t("filterAllStatusesLabel"),
         searchEndpoint: EXPENSE_API_ROUTES.UNIT,
         searchPlaceholder: t("filterSearchStatusLabel"),

package/base-modules/expense/form.js

@@ -60,8 +60,8 @@ export const ExpenseForm = () => {
         label: t("formCategoryLabel"),
         onValueChange: (value) => handleChange("category", value),
         options: EXPENSE_CATEGORY_OPTIONS.map((opt) => ({
-            id: opt.value,
-            name: categoryLabelMap[opt.value] || opt.label,
+            value: opt.value,
+            label: categoryLabelMap[opt.value] || opt.label,
         })),
         placeholder: t("formCategoryPlaceholder"),
         required: true,
@@ -76,8 +76,8 @@ export const ExpenseForm = () => {
         label: t("formOptionStatus"),
         onValueChange: (value) => handleChange("status", value),
         options: EXPENSE_STATUS_OPTIONS.map((opt) => ({
-            id: opt.value,
-            name: statusLabelMap[opt.value] || opt.label,
+            value: opt.value,
+            label: statusLabelMap[opt.value] || opt.label,
         })),
         placeholder: t("formStatusPlaceholder"),
         required: true,
@@ -92,8 +92,8 @@ export const ExpenseForm = () => {
         label: t("formPaymentMethodLabel"),
         onValueChange: (value) => handleChange("paymentMethod", value),
         options: PAYMENT_METHOD_OPTIONS.map((opt) => ({
-            id: opt.value,
-            name: paymentMethodLabelMap[opt.value] || opt.label,
+            value: opt.value,
+            label: paymentMethodLabelMap[opt.value] || opt.label,
         })),
         placeholder: t("formPaymentMethodPlaceholder"),
         searchEndpoint: EXPENSE_API_ROUTES.UNIT,

package/base-modules/fee-structure/form.js

@@ -51,8 +51,8 @@ export const FeeStructureForm = () => {
         label: t("formOptionFeeType"),
         onValueChange: (value) => handleChange("feeType", value),
         options: FEE_TYPE_OPTIONS.map((opt) => ({
-            id: opt.value,
-            name: feeTypeLabelMap[opt.value] || opt.label,
+            value: opt.value,
+            label: feeTypeLabelMap[opt.value] || opt.label,
         })),
         placeholder: t("formFeeTypePlaceholder"),
         required: true,
@@ -67,8 +67,8 @@ export const FeeStructureForm = () => {
         label: t("formOptionFrequency"),
         onValueChange: (value) => handleChange("frequency", value),
         options: FREQUENCY_OPTIONS.map((opt) => ({
-            id: opt.value,
-            name: frequencyLabelMap[opt.value] || opt.label,
+            value: opt.value,
+            label: frequencyLabelMap[opt.value] || opt.label,
         })),
         placeholder: t("formFrequencyPlaceholder"),
         searchEndpoint: FEE_STRUCTURE_API_ROUTES.UNIT,
@@ -82,8 +82,8 @@ export const FeeStructureForm = () => {
         label: t("formClassLabel"),
         onValueChange: (value) => handleChange("classId", value || null),
         options: classes === null || classes === void 0 ? void 0 : classes.map((cls) => ({
-            id: cls.id,
-            name: `${cls.name} (${cls.code})`,
+            value: cls.id,
+            label: `${cls.name} (${cls.code})`,
         })),
         placeholder: t("formClassPlaceholder"),
         searchEndpoint: FEE_STRUCTURE_API_ROUTES.UNIT,

package/base-modules/school/form.js

@@ -24,7 +24,10 @@ export const SchoolForm = () => {
         info: t("formCurrencyInfo"),
         label: t("formCurrencyLabel"),
         onValueChange: (value) => handleChange("currency", value),
-        options: Object.values(CURRENCY).map((c) => ({ id: c, name: c })),
+        options: Object.values(CURRENCY).map((c) => ({
+            value: c,
+            label: c,
+        })),
         placeholder: t("formCurrencyPlaceholder"),
         required: true,
         searchEndpoint: SCHOOL_API_ROUTES.UNIT,

package/base-modules/section/form.js

@@ -31,8 +31,8 @@ export const SectionForm = () => {
         label: t("formClassLabel"),
         onValueChange: (value) => handleChange("classId", value),
         options: (classes === null || classes === void 0 ? void 0 : classes.map((cls) => ({
-            id: cls.id,
-            name: `${cls.name} (${cls.code})`,
+            value: cls.id,
+            label: `${cls.name} (${cls.code})`,
         }))) || [],
         placeholder: t("formClassPlaceholder"),
         required: true,

package/base-modules/student-fee/filter.js

@@ -34,7 +34,10 @@ export const StudentFeeFilter = () => {
         info: t("filterByPaymentStatus"),
         label: t("filterPaymentStatusLabel"),
         onValueChange: (value) => handleChange("filterStatus", value),
-        options: PAYMENT_STATUS_OPTIONS.map((opt) => ({ id: opt.value, name: paymentStatusLabelMap[opt.value] || opt.label })),
+        options: PAYMENT_STATUS_OPTIONS.map((opt) => ({
+            value: opt.value,
+            label: paymentStatusLabelMap[opt.value] || opt.label,
+        })),
         placeholder: t("filterAllStatusesLabel"),
         searchEndpoint: STUDENT_FEE_API_ROUTES.UNIT,
         searchPlaceholder: t("filterSearchStatusLabel"),

package/base-modules/student-fee/form.js

@@ -64,7 +64,10 @@ export const StudentFeeForm = () => {
         info: t("formStudentInfo"),
         label: t("formStudentLabel"),
         onValueChange: (value) => handleChange("studentProfileId", value),
-        options: filteredStudentOptions,
+        options: filteredStudentOptions.map((s) => ({
+            value: s.id,
+            label: s.name,
+        })),
         placeholder: t("formStudentPlaceholder"),
         required: true,
         searchEndpoint: STUDENT_FEE_API_ROUTES.UNIT,
@@ -78,8 +81,8 @@ export const StudentFeeForm = () => {
         label: t("formFeeStructureLabel"),
         onValueChange: (value) => handleChange("feeStructureId", value),
         options: feeStructures === null || feeStructures === void 0 ? void 0 : feeStructures.map((fs) => ({
-            id: fs.id,
-            name: fs.name || fs.id,
+            value: fs.id,
+            label: fs.name || fs.id,
         })),
         placeholder: t("formFeeStructurePlaceholder"),
         required: true,
@@ -94,8 +97,8 @@ export const StudentFeeForm = () => {
         label: t("formDiscountCodeLabel"),
         onValueChange: (value) => handleChange("discountCodeId", value),
         options: (discountCodes === null || discountCodes === void 0 ? void 0 : discountCodes.map((code) => ({
-            id: code.id,
-            name: `${code.code} - ${code.discountValue}${code.discountType === DISCOUNT_TYPE.PERCENTAGE ? "%" : currency}`,
+            value: code.id,
+            label: `${code.code} - ${code.discountValue}${code.discountType === DISCOUNT_TYPE.PERCENTAGE ? "%" : currency}`,
         }))) || [],
         placeholder: t("formDiscountCodePlaceholder"),
         searchEndpoint: STUDENT_FEE_API_ROUTES.UNIT,
@@ -109,8 +112,8 @@ export const StudentFeeForm = () => {
         label: t("formOptionStatus"),
         onValueChange: (value) => handleChange("status", value),
         options: PAYMENT_STATUS_OPTIONS.map((opt) => ({
-            id: opt.value,
-            name: paymentStatusLabelMap[opt.value] || opt.label,
+            value: opt.value,
+            label: paymentStatusLabelMap[opt.value] || opt.label,
         })),
         placeholder: t("formStatusPlaceholder"),
         required: true,

package/base-modules/student-profile/filter.js

@@ -27,8 +27,8 @@ export const StudentProfileFilter = () => {
         label: t("filterOptionStatus"),
         info: t("filterByStudentStatus"),
         options: [...STATUS_OPTIONS].map((opt) => ({
-            id: opt.value,
-            name: statusLabelMap[opt.value] || opt.label,
+            value: opt.value,
+            label: statusLabelMap[opt.value] || opt.label,
         })),
         value: "filterStatus",
         onValueChange: (value) => handleChange("filterStatus", value),

package/base-modules/student-profile/form.js

@@ -24,8 +24,8 @@ export const StudentProfileForm = () => {
         label: t("formGenderLabel"),
         onValueChange: (value) => handleChange("gender", value),
         options: GENDER_OPTIONS.map((opt) => ({
-            id: opt.value,
-            name: genderLabelMap[opt.value] || opt.label,
+            value: opt.value,
+            label: genderLabelMap[opt.value] || opt.label,
         })),
         placeholder: "",
         searchEndpoint: STUDENT_PROFILE_API_ROUTES.UNIT,
@@ -37,8 +37,8 @@ export const StudentProfileForm = () => {
         label: t("formOptionStatus"),
         onValueChange: (value) => handleChange("status", value),
         options: STATUS_OPTIONS.map((opt) => ({
-            id: opt.value,
-            name: opt.label,
+            value: opt.value,
+            label: opt.label,
         })),
         placeholder: "",
         required: true,

package/base-modules/teacher/form.js

@@ -49,8 +49,8 @@ export const TeacherForm = () => {
         label: t("formGenderLabel"),
         onValueChange: (value) => handleChange("gender", value || null),
         options: GENDER_OPTIONS.map((opt) => ({
-            id: opt.value,
-            name: genderLabelMap[opt.value] || opt.label,
+            value: opt.value,
+            label: genderLabelMap[opt.value] || opt.label,
         })),
         placeholder: "",
         searchEndpoint: TEACHER_API_ROUTES.UNIT,

package/base-modules/user/form.js

@@ -36,8 +36,8 @@ export const UserForm = () => {
         label: t("formRoleIdLabel"),
         onValueChange: (value) => handleChange("userRole", value),
         options: roleOptions.map((opt) => ({
-            id: opt.id,
-            name: opt.name,
+            value: opt.id,
+            label: opt.name,
         })),
         placeholder: t("formRoleIdPlaceholder"),
         required: true,

package/base-modules/workspace/form.js

@@ -39,8 +39,8 @@ export const WorkspaceForm = () => {
         options: plans
             .filter(({ name }) => name.match("PKR"))
             .map((plan) => ({
-            id: plan.id,
-            name: plan.name,
+            value: plan.id,
+            label: plan.name,
         })),
         placeholder: t("formPlanPlaceholder"),
         info: t("formPlanInfo"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appcorp/fusion-storybook",
-  "version": "0.2.44",
+  "version": "0.2.45",
   "scripts": {
     "build-storybook": "storybook build",
     "build:next": "next build",
@@ -38,7 +38,7 @@
   },
   "devDependencies": {
     "@appcorp/app-corp-vista": "^1.0.0",
-    "@appcorp/shadcn": "^1.1.92",
+    "@appcorp/shadcn": "^1.1.97",
     "@chromatic-com/storybook": "^5.1.2",
     "@commitlint/cli": "^20.5.0",
     "@commitlint/config-conventional": "^20.5.0",