Browse Source

feat: added object validator helper function

feat/user-management-sort
Ramesh Mane 11 months ago
parent
commit
8ee5ba0fdc
  1. 13
      packages/nc-gui/composables/useUserSorts.ts
  2. 33
      packages/nc-gui/helpers/parsers/parserHelpers.ts

13
packages/nc-gui/composables/useUserSorts.ts

@ -2,6 +2,7 @@ import rfdc from 'rfdc'
import { OrgUserRoles, ProjectRoles, WorkspaceUserRoles } from 'nocodb-sdk' import { OrgUserRoles, ProjectRoles, WorkspaceUserRoles } from 'nocodb-sdk'
import type { UsersSortType } from '~/lib' import type { UsersSortType } from '~/lib'
import { useGlobal } from '#imports' import { useGlobal } from '#imports'
import { isValidObjectType } from '~/helpers/parsers/parserHelpers'
/** /**
* Hook for managing user sorts and sort configurations. * Hook for managing user sorts and sort configurations.
@ -41,11 +42,15 @@ export function useUserSorts(roleType: 'Workspace' | 'Org' | 'Project') {
// Retrieve sort configuration from local storage // Retrieve sort configuration from local storage
const storedConfig = localStorage.getItem(userSortConfigKey) const storedConfig = localStorage.getItem(userSortConfigKey)
const sortConfig = storedConfig ? JSON.parse(storedConfig) : {} const sortConfig = storedConfig ? JSON.parse(storedConfig) : ({} as Record<string, UsersSortType>)
if (isValidObjectType(sortConfig, {} as Record<string, UsersSortType>)) {
sorts.value = sortConfig sorts.value = sortConfig
// Load user-specific sort configurations or default configurations // Load user-specific sort configurations or default configurations
sorts.value = user.value?.id ? sortConfig[user.value.id] || {} : sortConfig[defaultUserId] || {} sorts.value = user.value?.id ? sortConfig[user.value.id] || {} : sortConfig[defaultUserId] || {}
} else {
sorts.value = {}
}
} catch (error) { } catch (error) {
console.error('Error while retrieving sort configuration from local storage:', error) console.error('Error while retrieving sort configuration from local storage:', error)
// Set sorts to an empty obj in case of an error // Set sorts to an empty obj in case of an error
@ -135,10 +140,10 @@ export function useUserSorts(roleType: 'Workspace' | 'Org' | 'Project') {
}) })
if (superUser && superUser.length) { if (superUser && superUser.length) {
if (sortsConfig.direction === 'asc') { if (sortsConfig.direction === 'desc') {
sortedData = [superUser[0], ...sortedData]
} else {
sortedData = [...sortedData, superUser[0]] sortedData = [...sortedData, superUser[0]]
} else {
sortedData = [superUser[0], ...sortedData]
} }
} }

33
packages/nc-gui/helpers/parsers/parserHelpers.ts

@ -225,3 +225,36 @@ export const extractNextDefaultName = (namesData: string[], defaultName: string,
? `${defaultName}${splitOperator}${extractedSortedNumbers[extractedSortedNumbers.length - 1] + 1}` ? `${defaultName}${splitOperator}${extractedSortedNumbers[extractedSortedNumbers.length - 1] + 1}`
: `${defaultName}${splitOperator}1` : `${defaultName}${splitOperator}1`
} }
/**
* Validates whether an object matches the expected type.
*
* @param obj - The object to be validated.
* @param expectedType - The expected type of the object.
* @returns `true` if the object matches the expected type, `false` otherwise.
*
* @template T - The type representing the expected structure of the object.
*
* @example
* // Define a type representing the expected structure.
* interface MyType {
* id: number;
* name: string;
* }
*
* // Object to validate
* const objToValidate = {
* id: 1,
* name: 'John Doe',
* };
*
* // Check if the object matches the expected type.
* const isValid = isValidObjectType(objToValidate, {} as MyType);
* console.log(isValid); // Should print true
*/
export const isValidObjectType = <T extends Record<string, any>>(obj: Record<string, any>, expectedType: T): boolean => {
// Check if the obj has the expected keys and values
return Object.entries(expectedType).every(([key, expectedValue]) => {
return Object.prototype.hasOwnProperty.call(obj, key) && typeof obj[key] === typeof expectedValue
})
}

Loading…
Cancel
Save