feat(miniapp-utils): DOMA-10721 added collections helpers (#5518)

* feat(miniapp-utils): DOMA-10721 added collections helpers * refactor(global): DOMA-10721 replaced app utils to package one * refactor(global): DOMA-10721 replaced app utils to package one
open-condo-software · Nov 20, 2024 · 55844fa · 55844fa
1 parent ef107ba
commit 55844fa
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 5 deletions.
diff --git a/apps/dev-portal/domains/miniapp/components/B2CApp/edit/builds/BuildsSection.tsx b/apps/dev-portal/domains/miniapp/components/B2CApp/edit/builds/BuildsSection.tsx
@@ -4,6 +4,7 @@ import React, { useCallback, useState } from 'react'
 import { useIntl } from 'react-intl'
 
 import { PlusCircle } from '@open-condo/icons'
+import { nonNull } from '@open-condo/miniapp-utils/helpers/collections'
 import { Button, Modal, Input, Alert, Typography } from '@open-condo/ui'
 
 import { EmptyTableFiller } from '@/domains/common/components/EmptyTableFiller'
@@ -21,7 +22,6 @@ import {
 import { useFileSizeFormatter } from '@/domains/miniapp/hooks/useFileSizeFormatter'
 import { useFileValidator } from '@/domains/miniapp/hooks/useFileValidator'
 import { useMutationCompletedHandler } from '@/domains/miniapp/hooks/useMutationCompletedHandler'
-import { nonNull } from '@/domains/miniapp/utils/nonNull'
 import { getCurrentPage } from '@/domains/miniapp/utils/query'
 import { INVALID_MIMETYPE } from '@dev-api/domains/common/constants/errors'
 import { B2C_APP_BUILD_UNIQUE_VERSION_CONSTRAINT } from '@dev-api/domains/miniapp/constants/constraints'

diff --git a/apps/dev-portal/domains/miniapp/components/B2CApp/edit/properties/PropertiesTable.tsx b/apps/dev-portal/domains/miniapp/components/B2CApp/edit/properties/PropertiesTable.tsx
@@ -4,14 +4,14 @@ import React, { useCallback, useEffect, useState } from 'react'
 import { useIntl } from 'react-intl'
 
 import { PlusCircle, Trash } from '@open-condo/icons'
+import { nonNull } from '@open-condo/miniapp-utils/helpers/collections'
 import { Button } from '@open-condo/ui'
 
 
 import { EmptyTableFiller } from '@/domains/common/components/EmptyTableFiller'
 import { useMutationErrorHandler } from '@/domains/common/hooks/useMutationErrorHandler'
 import { getClientSideSenderInfo } from '@/domains/common/utils/userid.utils'
 import { DEFAULT_PAGE_SIZE } from '@/domains/miniapp/constants/common'
-import { nonNull } from '@/domains/miniapp/utils/nonNull'
 import { getCurrentPage } from '@/domains/miniapp/utils/query'
 
 import { CreatePropertyModal } from './CreatePropertyModal'

diff --git a/apps/dev-portal/domains/miniapp/components/B2CApp/edit/publishing/PublishForm.tsx b/apps/dev-portal/domains/miniapp/components/B2CApp/edit/publishing/PublishForm.tsx
@@ -2,13 +2,13 @@ import { Form } from 'antd'
 import React, { useCallback, useState } from 'react'
 import { useIntl } from 'react-intl'
 
+import { nonNull } from '@open-condo/miniapp-utils/helpers/collections'
 import { Checkbox, Select, Button } from '@open-condo/ui'
 import type { CheckboxProps } from '@open-condo/ui'
 
 import { useValidations } from '@/domains/common/hooks/useValidations'
 import styles from '@/domains/miniapp/components/B2CApp/edit/publishing/PublishForm.module.css'
 import { DEFAULT_PAGE_SIZE } from '@/domains/miniapp/constants/common'
-import { nonNull } from '@/domains/miniapp/utils/nonNull'
 
 import { useAllB2CAppBuildsLazyQuery } from '@/lib/gql'
 

diff --git a/apps/dev-portal/package.json b/apps/dev-portal/package.json
@@ -23,6 +23,7 @@
     "@open-condo/cli": "workspace:^",
     "@open-condo/config": "workspace:^",
     "@open-condo/icons": "workspace:^",
+    "@open-condo/miniapp-utils": "workspace:^",
     "@open-condo/next": "workspace:^",
     "@open-condo/tsconfig": "workspace:^",
     "@open-condo/ui": "workspace:^",

diff --git a/apps/resident-app b/apps/resident-app
diff --git a/packages/miniapp-utils/package.json b/packages/miniapp-utils/package.json
@@ -39,6 +39,9 @@
       "helpers/apollo": [
         "dist/types/helpers/apollo.d.ts"
       ],
+      "helpers/collections": [
+        "dist/types/helpers/collections.d.ts"
+      ],
       "helpers/environment": [
         "dist/types/helpers/environment.d.ts"
       ],
@@ -62,6 +65,11 @@
       "require": "./dist/cjs/helpers/apollo.js",
       "import": "./dist/esm/helpers/apollo.js"
     },
+    "./helpers/collections": {
+      "types": "./dist/types/helpers/collections.d.ts",
+      "require": "./dist/cjs/helpers/collections.js",
+      "import": "./dist/esm/helpers/collections.js"
+    },
     "./helpers/environment": {
       "types": "./dist/types/helpers/environment.d.ts",
       "require": "./dist/cjs/helpers/environment.js",

diff --git a/...v-portal/domains/miniapp/utils/nonNull.ts → .../miniapp-utils/src/helpers/collections.ts b/...v-portal/domains/miniapp/utils/nonNull.ts → .../miniapp-utils/src/helpers/collections.ts
@@ -1,3 +1,3 @@
 export function nonNull<TVal> (val: TVal): val is NonNullable<TVal> {
     return val !== null && val !== undefined
-}
+}
diff --git a/yarn.lock b/yarn.lock
@@ -1125,6 +1125,7 @@ __metadata:
     "@open-condo/cli": "workspace:^"
     "@open-condo/config": "workspace:^"
     "@open-condo/icons": "workspace:^"
+    "@open-condo/miniapp-utils": "workspace:^"
     "@open-condo/next": "workspace:^"
     "@open-condo/tsconfig": "workspace:^"
     "@open-condo/ui": "workspace:^"
@@ -2003,6 +2004,7 @@ __metadata:
     "@open-condo/config": "workspace:^"
     "@open-condo/icons": "workspace:^"
     "@open-condo/locales": "workspace:^"
+    "@open-condo/miniapp-utils": "workspace:^"
     "@open-condo/tsconfig": "workspace:^"
     "@open-condo/ui": "workspace:^"
     "@parcel/watcher": ^2.3.0