@campxdev/shared 1.11.19 → 1.11.21-alpha.0

package/.vscode/settings.json

@@ -1,3 +1,3 @@
 {
-  "cSpell.words": ["campxdev", "mentee", "mentees"]
+  "cSpell.words": ["campxdev", "challan", "mentee", "mentees", "omrs"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@campxdev/shared",
-  "version": "1.11.19",
+  "version": "1.11.21-alpha.0",
   "main": "./exports.ts",
   "scripts": {
     "start": "react-scripts start",
@@ -38,9 +38,9 @@
     "axios": "^0.27.2",
     "date-fns": "^2.28.0",
     "date-fns-tz": "^2.0.0",
+    "device-detector-js": "^3.0.3",
     "fuse.js": "^6.6.2",
     "js-cookie": "^3.0.1",
-    "device-detector-js": "^3.0.3",
     "moment": "^2.29.4",
     "pullstate": "^1.24.0",
     "react": "^18.2.0",

package/src/assets/images/index.ts

@@ -5,6 +5,7 @@ const internalserver = require('./500.png')
 const unauth = require('./401.png')
 const nointernet = require('./nointernet.png')
 const campxLogoPrimary = require('./campx_logo__full_primary.png')
+const campxLogoSquare = require('./X.png')
 const animatedImage = require('./animation.gif')
 const activeDevices = require('./active_devices.svg')
 const changePassword = require('./change_password.svg')
@@ -22,6 +23,8 @@ export {
   animatedImage,
   avatarImage,
   campxLogoPrimary,
+  campxLogoSquare,
+  careers,
   changePassword,
   clogWheel,
   internalserver,
@@ -36,5 +39,4 @@ export {
   profile,
   unauth,
   web,
-  careers,
 }

package/src/components/ApplicationProfile/ApplicationProfile.tsx

@@ -31,6 +31,7 @@ interface ApplicationProfileProps {
     | 'hostels'
     | 'hrms'
     | 'commute_x'
+    | 'admin'
   title: string
   permissions?: {
     add: string

package/src/components/FilterComponents/SearchBar.tsx

@@ -8,17 +8,19 @@ import { ITextFieldProps } from '../Input/TextField'
 interface SearchBarProps {
   onSearch: (v: string) => void
   label?: ReactNode
-  textFieldProps?: ITextFieldProps
   placeholder?: string
+  value?: string
+  textFieldProps?: ITextFieldProps
 }
 
 export default function SearchBar({
   onSearch,
   label,
   placeholder = 'Search',
+  value,
   ...restProps
 }: SearchBarProps) {
-  const [, setSearch] = useState('')
+  const [, setSearch] = useState(value || '')
 
   const debouncedChangeHandler = useMemo(
     () =>
@@ -34,6 +36,7 @@ export default function SearchBar({
       label={label}
       placeholder={placeholder}
       onChange={debouncedChangeHandler}
+      defaultValue={value || ''}
       InputProps={{
         endAdornment: (
           <InputAdornment position="end">

package/src/components/Layout/Header/AppHeader.tsx

@@ -13,6 +13,7 @@ import {
   peoplex,
 } from './assets'
 
+import { campxLogoPrimary } from '../../../assets/images'
 import HeaderActions from './HeaderActions/HeaderActions'
 import {
   StyledHeader,
@@ -30,12 +31,14 @@ const imageMap = {
   campx: collegex,
   commute: commutex,
   hostel: hostelx,
+  admin: campxLogoPrimary,
 }
 
 interface AppHeaderProps {
   clientLogo: string
   fullName: string
   profileUrl?: string
+  actions?: ReactNode[]
   userBoxActions: {
     label: ReactNode
     icon?: ReactNode
@@ -52,6 +55,7 @@ export default function AppHeader({
   cogWheelMenu = [],
   customHeaderActions,
   profileUrl,
+  actions = [],
 }: AppHeaderProps) {
   return (
     <StyledHeader>
@@ -68,6 +72,7 @@ export default function AppHeader({
             fullName={fullName}
             userBoxActions={userBoxActions}
             profileUrl={profileUrl}
+            actions={actions}
           />
         )}
       </Box>

package/src/components/Layout/Header/applications.ts

@@ -1,3 +1,4 @@
+import { campxLogoSquare } from '../../../assets/images'
 import { isDevelopment } from '../../../constants'
 import {
   campxSquareSmall,
@@ -10,6 +11,10 @@ import {
 } from './assets'
 
 const origins = {
+  admin: {
+    dev: 'https://admin.campx.dev',
+    prod: 'https://admin.campx.in',
+  },
   ums: {
     dev: 'https://ums.campx.dev',
     prod: 'https://ums.campx.in',
@@ -41,6 +46,14 @@ const origins = {
 }
 
 export const applications = [
+  {
+    title: 'Admin',
+    path: isDevelopment ? origins.admin.dev : origins.admin.prod,
+    icon: campxLogoSquare,
+    key: 'admin',
+    domainName: 'admin',
+    description: 'Manage Complete Campus Root Configuration',
+  },
   {
     title: 'CollegeX',
     path: isDevelopment ? origins.ums.dev : origins.ums.prod,

package/src/components/Tables/BasicTable/Table.tsx

@@ -23,21 +23,23 @@ import {
 type Order = 'asc' | 'desc' | ''
 type Sort = {}
 type DataType = 'currency' | 'string' | 'number'
-export interface TableColumn {
+
+export interface TableColumn<T> {
   dataIndex: string
   key: string
   title: any
-  render?: (cellData: any, row: any, index: number) => any
+  render?: (cellData: any, row: T, index: number) => any
   textColor?: string
   sort?: boolean
   width?: string //pixels
   dataType?: DataType
 }
-interface TableProps {
+
+interface TableProps<T> {
   showSerialNumber?: boolean
-  columns: Array<TableColumn>
+  columns: Array<TableColumn<T>>
   rowKey?: string
-  dataSource?: any[]
+  dataSource?: T[]
   loading?: boolean
   onRowClick?: (row: any) => void
   pagination?: {
@@ -54,7 +56,8 @@ interface TableProps {
   totalColumns?: number[]
   showTotalInFirstCellOfTotalRow?: boolean
 }
-export default function Table({
+
+export default function Table<T>({
   showSerialNumber = false,
   columns,
   dataSource,
@@ -67,7 +70,7 @@ export default function Table({
   sx,
   totalColumns,
   showTotalInFirstCellOfTotalRow,
-}: TableProps) {
+}: TableProps<T>) {
   const [sort, setSort] = useState<Sort>({})
   let totalCount = []
   let totalCols = []
@@ -77,18 +80,18 @@ export default function Table({
     totalCols = totalColumns ? [...totalColumns] : []
   }
 
-  const handleSortClick = (sortBykey) => {
+  const handleSortClick = (sortByKey) => {
     setSort((prev) => {
-      if (prev[sortBykey]) {
-        if (prev[sortBykey] === 'desc') return { ...prev, [sortBykey]: 'asc' }
-        if (prev[sortBykey] === 'asc') {
-          delete prev[sortBykey]
+      if (prev[sortByKey]) {
+        if (prev[sortByKey] === 'desc') return { ...prev, [sortByKey]: 'asc' }
+        if (prev[sortByKey] === 'asc') {
+          delete prev[sortByKey]
           return { ...prev }
         }
       } else {
         return {
           ...prev,
-          [sortBykey]: 'desc',
+          [sortByKey]: 'desc',
         }
       }
     })

package/src/constants/UIConstants.ts

@@ -1,4 +1,4 @@
-import { ReactNode } from "react"
+import { ReactNode } from 'react'
 
 export const batchOptions = Array.from({ length: 12 }, (_, i) => {
   return `${2012 + i} - ${2012 + i + 1}`
@@ -127,6 +127,10 @@ export const ProfileApplicationType = [
     label: 'PeopleX',
     value: 'hrms',
   },
+  {
+    label: 'AdminX',
+    value: 'admin',
+  },
 ]
 
 export interface Option {