hh-contracts 0.0.29 → 0.0.30

package/build/common/constants/icon-key.constant.js

@@ -5,20 +5,18 @@ exports.ICON_KEY = {
     // eye: 'eye',
     // eyeSlash: 'eyeSlash',
     chevronDown: 'chevronDown',
-    chevronLeft: 'chevronLeft',
-    chevronRight: 'chevronRight',
-    arrowDown: 'arrowDown',
-    arrowUp: 'arrowUp',
     moon: 'moon',
     sun: 'sun',
     // user: 'user',
     menu: 'menu',
-    search: 'search',
     language: 'language',
     // close: 'close',
     // check: 'check',
     // closeFilled: 'closeFilled',
     logo: 'logo',
+    housekeeping: 'housekeeping',
     flagGB: 'flagGB',
     flagRU: 'flagRU',
+    radioBase: 'radioBase',
+    radioChecked: 'radioChecked',
 };

package/build/common/models/index.js

@@ -14,7 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./common-query-params.schema"), exports);
 __exportStar(require("./icon-key.schema"), exports);
 __exportStar(require("./info.schema"), exports);
 __exportStar(require("./json.schema"), exports);

package/build/common/models/order.schema.js

@@ -4,6 +4,5 @@ exports.OrderSchema = void 0;
 const zod_1 = require("zod");
 const order_direction_constant_1 = require("../constants/order-direction.constant");
 exports.OrderSchema = zod_1.z.object({
-    orderBy: zod_1.z.string().optional(),
     orderDir: zod_1.z.nativeEnum(order_direction_constant_1.ORDER_DIRECTION).optional(),
 });

package/build/permissions/contracts/create-permission.contract.js

@@ -15,8 +15,9 @@ const CreatePermissionContractRequestSchema = permission_model_1.PermissionSchem
         .string()
         .transform(val => (val === '' ? undefined : val))
         .optional()
+        .nullable()
         .refine(val => {
-        if (val === undefined)
+        if (val === undefined || val === null)
             return true;
         try {
             JSON.parse(val);

package/build/permissions/contracts/find-many-permission.contract.js

@@ -15,7 +15,10 @@ const OrderBySchema = permission_model_1.PermissionSchema.pick({
 })
     .keyof()
     .optional();
-const FindManyPermissionsContractRequestSchema = BaseQuerySchema.merge(common_1.CommonQueryParamsSchema).extend({ orderBy: OrderBySchema });
+const FindManyPermissionsContractRequestSchema = BaseQuerySchema.extend({ orderBy: OrderBySchema })
+    .merge(common_1.OrderSchema)
+    .merge(common_1.SearchSchema)
+    .merge(common_1.PaginationRequestSchema);
 const FindManyPermissionsContractResponseSchema = zod_1.z
     .object({
     permissions: zod_1.z.array(permission_model_1.PermissionSchema),

package/common/constants/icon-key.constant.ts

@@ -2,23 +2,22 @@ export const ICON_KEY = {
   // eye: 'eye',
   // eyeSlash: 'eyeSlash',
   chevronDown: 'chevronDown',
-  chevronLeft: 'chevronLeft',
-  chevronRight: 'chevronRight',
-  arrowDown: 'arrowDown',
-  arrowUp: 'arrowUp',
   moon: 'moon',
   sun: 'sun',
   // user: 'user',
   menu: 'menu',
-  search: 'search',
   language: 'language',
   // close: 'close',
   // check: 'check',
 
   // closeFilled: 'closeFilled',
+
   logo: 'logo',
+  housekeeping: 'housekeeping',
   flagGB: 'flagGB',
   flagRU: 'flagRU',
+  radioBase: 'radioBase',
+  radioChecked: 'radioChecked',
 } as const;
 
 export type TIconKey = (typeof ICON_KEY)[keyof typeof ICON_KEY];

package/common/models/index.ts

@@ -1,4 +1,3 @@
-export * from './common-query-params.schema';
 export * from './icon-key.schema';
 export * from './info.schema';
 export * from './json.schema';

package/common/models/order.schema.ts

@@ -2,6 +2,5 @@ import { z } from 'zod';
 import { ORDER_DIRECTION } from '../constants/order-direction.constant';
 
 export const OrderSchema = z.object({
-  orderBy: z.string().optional(),
   orderDir: z.nativeEnum(ORDER_DIRECTION).optional(),
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hh-contracts",
-  "version": "0.0.29",
+  "version": "0.0.30",
   "description": "",
   "main": "./build/index.js",
   "scripts": {

package/permissions/contracts/create-permission.contract.ts

@@ -13,9 +13,10 @@ const CreatePermissionContractRequestSchema = PermissionSchema.omit({
     .string()
     .transform(val => (val === '' ? undefined : val))
     .optional()
+    .nullable()
     .refine(
       val => {
-        if (val === undefined) return true;
+        if (val === undefined || val === null) return true;
         try {
           JSON.parse(val);
           return true;

package/permissions/contracts/find-many-permission.contract.ts

@@ -1,8 +1,10 @@
 import { z } from 'zod';
 import {
-  CommonQueryParamsSchema,
   HTTP_METHOD,
+  OrderSchema,
+  PaginationRequestSchema,
   PaginationResponseSchema,
+  SearchSchema,
 } from '../../common';
 import { PermissionSchema } from '../permission.model';
 import { PERMISSIONS_API, PERMISSIONS_CONTROLLER } from '../permissions.api';
@@ -17,7 +19,10 @@ const OrderBySchema = PermissionSchema.pick({
 })
   .keyof()
   .optional();
-const FindManyPermissionsContractRequestSchema = BaseQuerySchema.merge(CommonQueryParamsSchema).extend({ orderBy: OrderBySchema });
+const FindManyPermissionsContractRequestSchema = BaseQuerySchema.extend({ orderBy: OrderBySchema })
+  .merge(OrderSchema)
+  .merge(SearchSchema)
+  .merge(PaginationRequestSchema);
 
 const FindManyPermissionsContractResponseSchema = z
   .object({

package/build/common/models/common-query-params.schema.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommonQueryParamsSchema = void 0;
-const order_schema_1 = require("./order.schema");
-const pagination_schema_1 = require("./pagination.schema");
-const search_schema_1 = require("./search.schema");
-exports.CommonQueryParamsSchema = order_schema_1.OrderSchema.merge(search_schema_1.SearchSchema).merge(pagination_schema_1.PaginationRequestSchema);

package/common/models/common-query-params.schema.ts

@@ -1,7 +0,0 @@
-import { z } from "zod";
-import { OrderSchema } from "./order.schema";
-import { PaginationRequestSchema } from "./pagination.schema";
-import { SearchSchema } from "./search.schema";
-
-export const CommonQueryParamsSchema = OrderSchema.merge(SearchSchema).merge(PaginationRequestSchema);
-export type TCommonQueryParams = z.infer<typeof CommonQueryParamsSchema>;