fix: Updated unique value consideration logic to treat empty, null,…

… u… (#501) …ndefined values as value
implerhq · Feb 13, 2024 · 2dad04d · 2dad04d
2 parents 65c89c4 + aad6547
commit 2dad04d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/apps/api/src/app/review/usecases/do-review/base-review.usecase.ts b/apps/api/src/app/review/usecases/do-review/base-review.usecase.ts
@@ -175,7 +175,7 @@ export class BaseReview {
       // uniqueCheck
       case error.keyword === 'uniqueCheck':
       case error.keyword === 'uniqueItemProperties':
-        message = `${String(data)} already exist in column, it must be unique`;
+        message = `${String(data)} already taken! Please enter unique value`;
         break;
       // custom date format
       case error.keyword === 'format' && error.params.format === 'custom-date-time':
@@ -365,9 +365,7 @@ export class BaseReview {
       keyword: 'uniqueCheck',
       schema: false, // keyword value is not used, can be true
       validate: function (data: any, dataPath: AnySchemaObject) {
-        if (!String(data)) {
-          return true;
-        }
+        if (!data) return true;
         if (uniqueItems[dataPath.parentDataProperty].has(data)) {
           return false;
         }

diff --git a/apps/web/design-system/custom-select/CustomSelect.styles.tsx b/apps/web/design-system/custom-select/CustomSelect.styles.tsx
@@ -90,10 +90,8 @@ interface Params {
   size: MantineSize;
 }
 
-export default createStyles((theme: MantineTheme, params: Params): Record<string, any> => {
-  console.log(theme.colors);
-
-  return {
+export default createStyles(
+  (theme: MantineTheme, params: Params): Record<string, any> => ({
     root: getRootStyles(),
     label: getLabelStyles(theme),
     description: getDescriptionStyles(theme),
@@ -102,5 +100,5 @@ export default createStyles((theme: MantineTheme, params: Params): Record<string
     input: getInputStyles(theme, params.size),
     itemsWrapper: getSelectItemsWrapper(theme),
     item: getSelectItemStyles(theme, params.size),
-  };
-});
+  })
+);