@campxdev/shared 1.10.26 → 1.10.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@campxdev/shared",
-  "version": "1.10.26",
+  "version": "1.10.27",
   "main": "./exports.ts",
   "scripts": {
     "start": "react-scripts start",

package/src/components/MyProfile/Education/EducationForm.tsx

@@ -14,7 +14,22 @@ import { createUpdateEducation } from '../service'
 const schema = yup.object().shape({
   name: yup.string().required('Name is required'),
   institution: yup.string().required('Institution is required'),
-  startDate: yup.string().required('From Date is required'),
+  startDate: yup.string().nullable().required('From Date is required'),
+  endDate: yup
+    .string()
+
+    .required('End Date is required')
+    .test(
+      'endDate',
+      'To date must be greater than  From date',
+      function (value) {
+        const { startDate } = this.parent
+        if (!startDate) return true
+        const startDateObj = new Date(startDate)
+        const endDateObj = new Date(value)
+        return startDateObj < endDateObj
+      },
+    ),
   description: yup.string().required('Description is required'),
 })
 
@@ -73,7 +88,12 @@ export const EducationForm = ({ data, hideDialog }) => {
             label="From Date"
             required
           />
-          <FormDatePicker control={control} name="endDate" label="To Date" />
+          <FormDatePicker
+            control={control}
+            name="endDate"
+            label="To Date"
+            required
+          />
           <FormTextField
             control={control}
             multiline

package/src/components/MyProfile/Experience/ExperienceForm.tsx

@@ -1,4 +1,5 @@
 /* eslint-disable no-console */
+import { yupResolver } from '@hookform/resolvers/yup'
 import { Stack } from '@mui/material'
 import moment from 'moment'
 import { useForm } from 'react-hook-form'
@@ -9,12 +10,26 @@ import axios, { axiosErrorToast } from '../../../config/axios'
 import ActionButton from '../../ActionButton'
 import { FormDatePicker, FormSingleSelect, FormTextField } from '../../HookForm'
 import { createUpdateExperience } from '../service'
-import { yupResolver } from '@hookform/resolvers/yup'
 
 const schema = yup.object().shape({
   experienceType: yup.string().required('Experience Type is required'),
   title: yup.string().required('Title is required'),
   organizationName: yup.string().required('Organization Name is required'),
+  fromDate: yup.string().required('FromDate is Required'),
+  toDate: yup
+    .string()
+    .required('To Date is Required')
+    .test(
+      'endDate',
+      'To date must be greater than  From date',
+      function (value) {
+        const { fromDate } = this.parent
+        if (!fromDate) return true
+        const startDateObj = new Date(fromDate)
+        const endDateObj = new Date(value)
+        return startDateObj < endDateObj
+      },
+    ),
 })
 
 export const ExperienceForm = ({ data, hideDialog }) => {
@@ -82,8 +97,18 @@ export const ExperienceForm = ({ data, hideDialog }) => {
               label="Organisation Name"
               required
             />
-            <FormDatePicker control={control} name="fromDate" label="From" />
-            <FormDatePicker control={control} name="toDate" label="To" />
+            <FormDatePicker
+              control={control}
+              name="fromDate"
+              label="From"
+              required
+            />
+            <FormDatePicker
+              control={control}
+              name="toDate"
+              label="To"
+              required
+            />
             <FormTextField
               control={control}
               name="description"

package/src/components/MyProfile/MyProfile.tsx

@@ -2,6 +2,7 @@
 import { Box, Chip, Container, Typography } from '@mui/material'
 import { useQuery } from 'react-query'
 import axios from '../../config/axios'
+import { InsititutionsStore } from '../../shared-state/InstitutionsStore'
 import PageHeader from '../PageHeader'
 import Spinner from '../Spinner'
 import Education from './Education/Education'
@@ -18,6 +19,8 @@ import {
 import Workshop from './Workshop/Workshop'
 
 const MyProfile = ({ close }) => {
+  const { institutions, current } = InsititutionsStore.useState((s) => s)
+
   const { data, isLoading } = useQuery('dashboard', () =>
     axios.get('/square/users/dashboard').then((res) => res?.data),
   )
@@ -113,7 +116,10 @@ const MyProfile = ({ close }) => {
                 <Typography variant="h1">{userProfile?.fullName}</Typography>
                 <Typography variant="h4">
                   {userProfile?.designation?.name} | Dept. of{' '}
-                  {userProfile?.department?.name}
+                  {userProfile?.departments
+                    ?.filter((item) => item?.institutionId == current?.id)
+                    .map((item) => item.name)
+                    .join(',')}
                 </Typography>
               </Box>
             </Box>

package/src/components/MyProfile/PaperPublication/PublicationsForm.tsx

@@ -54,6 +54,7 @@ export const PublicationsForm = ({ data, hideDialog, userProfile = null }) => {
     selectedAuthor: 'singleAuthor',
     publicationSubtypes: [],
   })
+
   const { resource, selectedAuthor, publicationSubtypes } = state
 
   const { data: paperPublicationTypes } = useQuery(

package/src/components/MyProfile/Styles.tsx

@@ -18,10 +18,15 @@ export const StyledArrowIcon = styled(KeyboardArrowLeft)({
   color: 'white',
 })
 export const StyledMainContainer = styled(Box)(({ theme }) => ({
-  minHeight: '55vh',
+  maxHeight: '50vh',
   height: 'auto',
   marginTop: '25px',
   overflowY: 'auto',
+  '&::-webkit-scrollbar': {
+    width: '0.5em',
+    height: '0.5em',
+  },
+
   border: theme.borders.grayLight,
   borderRadius: '10px',
   '& .MuiTabs-root': {

package/src/components/MyProfile/Workshop/WorkshopForm.tsx

@@ -34,7 +34,20 @@ const schema = yup.object().shape({
   stream: yup.string().required('Stream is required'),
   program: yup.string().required('Program is required'),
   fromDate: yup.string().required('From Date is required'),
-  toDate: yup.string().required('To Date is required'),
+  toDate: yup
+    .string()
+    .required('To Date is required')
+    .test(
+      'endDate',
+      'To date must be greater than  From date',
+      function (value) {
+        const { fromDate } = this.parent
+        if (!fromDate) return true
+        const startDateObj = new Date(fromDate)
+        const endDateObj = new Date(value)
+        return startDateObj < endDateObj
+      },
+    ),
 })
 
 export const WorkshopForm = ({ data, hideDialog }) => {