refactor: revision the use of crypto.randomUUID (#63)

React component props "key" are set into valid natural keys without surrogate random numbers and/or indexes in them

Author: iurii-golovinskii

lerna.json

@@ -1,4 +1,4 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "2.11.1"
+  "version": "2.11.1-feature-revision-use-crypto-random.0"
 }

package-lock.json

@@ -100,7 +100,8 @@
     "rxjs": "^7.8.1",
     "start-server-and-test": "2.0.0",
     "ts-event-bus": "4.1.1",
-    "ts-jest": "29.1.0"
+    "ts-jest": "29.1.0",
+    "uuid": "^11.1.0"
   },
   "devDependencies": {
     "@esbuild-plugins/node-globals-polyfill": "0.2.3",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netcracker/qubership-apihub-ui-agents",
-  "version": "2.11.1",
+  "version": "2.11.1-feature-revision-use-crypto-random.0",
   "license": "Apache-2.0",
   "files": [
     "/dist"

packages/agents/package.json

@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-import type { AgentKey, NamespaceKey, SettingsKey, VersionKey, WorkspaceKey } from './keys'
+import type { AgentKey, NamespaceKey, VersionKey, WorkspaceKey } from './keys'
 import type { AutodiscoveryStatus } from './statuses'
 import { NONE_DISCOVERY_STATUS } from './statuses'
 import { ncCustomAgentsRequestJson, ncCustomAgentsRequestVoid } from '@apihub/utils/requests'
 
 export type Settings = Readonly<{
-  key: SettingsKey
   name: string
   versionKey: VersionKey
   previousVersionKey: VersionKey
@@ -41,7 +40,6 @@ export type SettingsDto = Readonly<{
 }>
 
 export const EMPTY_SETTINGS: Settings = {
-  key: '',
   name: '',
   versionKey: '',
   previousVersionKey: '',
@@ -53,7 +51,6 @@ export const EMPTY_SETTINGS: Settings = {
 
 export function toSettings(value: SettingsDto): Settings {
   return {
-    key: crypto.randomUUID(),
     name: value.name,
     versionKey: value.version,
     previousVersionKey: value.previousVersion,

packages/agents/src/entities/settings.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { AgentKey, NamespaceKey, SnapshotKey, SnapshotPublishInfoKey, WorkspaceKey } from './keys'
+import type { AgentKey, NamespaceKey, SnapshotKey, WorkspaceKey } from './keys'
 import type { ServicePublishInfo, ServicePublishInfoDto } from './service-publish-info'
 import { toServicePublishInfo } from './service-publish-info'
 import { ncCustomAgentsRequestJson } from '@apihub/utils/requests'
@@ -23,7 +23,6 @@ import { APIHUB_NC_BASE_PATH } from '@netcracker/qubership-apihub-ui-shared/util
 import type { ApiType } from '@netcracker/qubership-apihub-ui-shared/entities/api-types'
 
 export type SnapshotPublicationInfo = Readonly<{
-  key: SnapshotPublishInfoKey
   services: ReadonlyArray<ServicePublishInfo>
   apiTypes?: ApiType[]
 }>
@@ -34,13 +33,11 @@ export type SnapshotPublicationInfoDto = Readonly<{
 }>
 
 export const EMPTY_SNAPSHOT_PUBLICATION_INFO: SnapshotPublicationInfo = {
-  key: '',
   services: [],
 }
 
 export function toSnapshotPublicationInfo(value: SnapshotPublicationInfoDto): SnapshotPublicationInfo {
   return {
-    key: crypto.randomUUID(),
     services: value.services.map(toServicePublishInfo),
     apiTypes: value.apiTypes,
   }

packages/agents/src/entities/snapshot-publication-info.ts

@@ -25,7 +25,6 @@ export type Snapshots = {
 }
 
 export type Snapshot = Readonly<{
-  key: SnapshotKey
   versionKey: VersionKey
   previousVersionKey?: VersionKey
   createdAt: string
@@ -56,7 +55,6 @@ export function toSnapshots(value: SnapshotsDto): Snapshots {
     packageKey: value.packageId,
     snapshots: value.snapshots.map(snapshot => {
       return ({
-        key: crypto.randomUUID(),
         versionKey: snapshot.version,
         previousVersionKey: snapshot.previousVersion === '' ? undefined : snapshot.previousVersion,
         createdAt: snapshot.createdAt,

packages/agents/src/entities/snapshots.ts

@@ -28,6 +28,7 @@ import type { PublishConfig} from '@apihub/entities/publish-config'
 import { toPublishConfig } from '@apihub/entities/publish-config'
 import { WORKSPACE_SEARCH_PARAM } from '@netcracker/qubership-apihub-ui-shared/utils/search-params'
 import { useSearchParam } from '@netcracker/qubership-apihub-ui-shared/hooks/searchparams/useSearchParam'
+import { v4 as uuidv4 } from 'uuid'
 
 export function useCreateSnapshot(): [CreateSnapshot, IsLoading, IsSuccess, IsError, Error | null] {
   const { agentId, namespaceKey } = useParams()
@@ -43,7 +44,7 @@ export function useCreateSnapshot(): [CreateSnapshot, IsLoading, IsSuccess, IsEr
     error,
   } = useMutation<PublishConfig, Error, CreateSnapshotPublicationOptions>({
     mutationFn: async ({ name, baseline, serviceKeys }) => {
-      const builderId = crypto.randomUUID()
+      const builderId = uuidv4()
 
       const publishConfigDto = await publishSnapshot(
         agentId!,

packages/agents/src/routes/root/NamespacePage/ServicesPage/ServicesPageBody/CreateSnapshotStep/useCreateSnapshot.ts

@@ -25,6 +25,7 @@ import type { ServiceKey, VersionKey } from '@netcracker/qubership-apihub-ui-sha
 import type { VersionStatus } from '@netcracker/qubership-apihub-ui-shared/entities/version-status'
 import { WORKSPACE_SEARCH_PARAM } from '@netcracker/qubership-apihub-ui-shared/utils/search-params'
 import { useSearchParam } from '@netcracker/qubership-apihub-ui-shared/hooks/searchparams/useSearchParam'
+import { v4 as uuidv4 } from 'uuid'
 
 export function usePromoteVersion(): [PromoteVersion, IsLoading, IsSuccess, IsError, Error | null] {
   const { agentId, namespaceKey } = useParams()
@@ -33,7 +34,7 @@ export function usePromoteVersion(): [PromoteVersion, IsLoading, IsSuccess, IsEr
 
   const { mutate, isLoading, isSuccess, isError, error } = useMutation<PublishConfig, Error, PromoteVersionOptions>({
     mutationFn: async ({ version, previousVersion, status, serviceKeys }) => {
-      const builderId = crypto.randomUUID()
+      const builderId = uuidv4()
 
       const config = await publishSnapshot(
         agentId!,

packages/agents/src/routes/root/NamespacePage/ServicesPage/ServicesPageBody/PromoteVersionStep/usePromoteVersion.ts

@@ -1,6 +1,6 @@
 {
   "name": "@netcracker/qubership-apihub-ui-editor",
-  "version": "2.11.1",
+  "version": "2.11.1-feature-revision-use-crypto-random.0",
   "license": "Apache-2.0",
   "files": [
     "/dist"