Merge branch 'master' into RPLT-415-rc-service-app-append-name

.github/labeler.yml

@@ -125,9 +125,6 @@ ts-bundler:
 ts-scripts:
   - packages/ts-scripts/**
 
-ts-types:
-  - packages/ts-types/**
-
 utils-common:
   - packages/utils-common/**
 

packages/admin-portal/package.json

@@ -24,6 +24,7 @@
     "@linaria/react": "^5.0.3",
     "@reapit/connect-session": "workspace:packages/connect-session",
     "@reapit/elements": "4.1.2",
+    "@reapit/foundations-ts-definitions": "^1.5.9",
     "@reapit/use-reapit-data": "workspace:packages/use-reapit-data",
     "@reapit/utils-common": "workspace:packages/utils-common",
     "@reapit/utils-react": "workspace:packages/utils-react",
@@ -42,9 +43,7 @@
   "devDependencies": {
     "@linaria/shaker": "^5.0.3",
     "@reapit/config-manager": "workspace:packages/config-manager",
-    "@reapit/foundations-ts-definitions": "workspace:packages/foundations-ts-definitions",
     "@reapit/ts-scripts": "workspace:packages/ts-scripts",
-    "@reapit/ts-types": "workspace:packages/ts-types",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
     "concurrently": "^6.5.1",

packages/api-key-service/package.json

@@ -7,6 +7,7 @@
     "@nestjs/core": "^9.4.3",
     "@nestjs/platform-express": "^8.4.7",
     "@nestjs/testing": "^9.4.3",
+    "@reapit/foundations-ts-definitions": "^1.5.9",
     "aws-lambda": "^1.0.7",
     "aws-sdk": "^2.1580.0",
     "aws-serverless-express": "^3.4.0",
@@ -17,10 +18,8 @@
   },
   "devDependencies": {
     "@reapit/config-manager": "workspace:packages/config-manager",
-    "@reapit/foundations-ts-definitions": "workspace:packages/foundations-ts-definitions",
     "@reapit/ts-bundler": "workspace:packages/ts-bundler",
     "@reapit/ts-scripts": "workspace:packages/ts-scripts",
-    "@reapit/ts-types": "workspace:packages/ts-types",
     "@reapit/utils-common": "workspace:packages/utils-common",
     "@reapit/utils-node": "workspace:packages/utils-node",
     "@typescript-eslint/eslint-plugin": "^6.21.0",

packages/api-key-service/tsconfig.json

@@ -7,7 +7,7 @@
     "baseUrl": "./",
     "sourceRoot": "/",
     "paths": {
-      "@reapit/*": ["../*"]
+
     },
     "declaration": true,
     "declarationDir": "dist",

packages/api-key-verify/package.json

@@ -25,14 +25,13 @@
   "dependencies": {
     "@aws/dynamodb-data-mapper": "^0.7.3",
     "@aws/dynamodb-data-mapper-annotations": "^0.7.3",
-    "@reapit/foundations-ts-definitions": "workspace:packages/foundations-ts-definitions",
+    "@reapit/foundations-ts-definitions": "^1.5.9",
     "aws": "^0.0.3-2"
   },
   "devDependencies": {
     "@nestjs/common": "^9.4.3",
     "@nestjs/testing": "^9.4.3",
     "@reapit/ts-scripts": "workspace:packages/ts-scripts",
-    "@reapit/ts-types": "workspace:packages/ts-types",
     "@reapit/utils-nest": "workspace:packages/utils-nest",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",

packages/app-builder-backend/package.json

@@ -30,7 +30,7 @@
     "@aws-sdk/client-dynamodb": "^3.535.0",
     "@graphql-tools/delegate": "^8.8.1",
     "@graphql-tools/stitch": "^8.7.50",
-    "@reapit/foundations-ts-definitions": "workspace:packages/foundations-ts-definitions",
+    "@reapit/foundations-ts-definitions": "^1.5.9",
     "@reapit/ts-scripts": "workspace:packages/ts-scripts",
     "@reapit/utils-common": "workspace:packages/utils-common",
     "@types/luxon": "^2.4.0",
@@ -64,7 +64,6 @@
   "devDependencies": {
     "@reapit/config-manager": "workspace:packages/config-manager",
     "@reapit/ts-bundler": "workspace:packages/ts-bundler",
-    "@reapit/ts-types": "workspace:packages/ts-types",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^29.5.12",
     "@types/jszip": "^3.4.1",

packages/app-builder-backend/src/platform/index.ts

@@ -5,13 +5,13 @@ import {
   SchemaModel,
   SchemaModelPagedResult,
   UpdateSchemaRequest,
-} from '@reapit/foundations-ts-definitions/types'
+} from '@reapit/foundations-ts-definitions'
 import config from '../config.json'
 import { fetch } from '../utils/fetch'
 
 const { platformApiUrl } = config
 
-export { SchemaModel } from '@reapit/foundations-ts-definitions/types'
+export { SchemaModel } from '@reapit/foundations-ts-definitions'
 
 export const getMetadataObject = async (
   id: string,

packages/app-builder-backend/src/resolvers/department-resolver.ts

@@ -4,7 +4,7 @@ import { Arg, Authorized, Ctx, Query, Resolver } from 'type-graphql'
 import { query } from '../utils/graphql-fetch'
 import { Context } from '../types'
 import { Department, DepartmentFragment } from '../entities/department'
-import { DepartmentModel, DepartmentModelPagedResult } from '@reapit/foundations-ts-definitions/types'
+import { DepartmentModel, DepartmentModelPagedResult } from '@reapit/foundations-ts-definitions'
 
 const getDepartmentsQuery = gql`
   ${DepartmentFragment}

packages/app-builder-backend/src/types.ts

@@ -1,4 +1,4 @@
-import { AppDetailModel } from '@reapit/foundations-ts-definitions/types'
+import { AppDetailModel } from '@reapit/foundations-ts-definitions'
 import { CustomEntity } from './entities/custom-entity'
 import { MetadataSchemaType } from './utils/extract-metadata'
 

packages/app-builder-backend/tsconfig.json

@@ -6,7 +6,6 @@
     "baseUrl": "./",
     "sourceRoot": "/",
     "paths": {
-      "@reapit/*": ["../*"]
     },
     "declaration": true,
     "declarationDir": "dist",

packages/app-builder/package.json

@@ -57,7 +57,6 @@
     "@linaria/shaker": "^5.0.3",
     "@reapit/config-manager": "workspace:packages/config-manager",
     "@reapit/ts-scripts": "workspace:packages/ts-scripts",
-    "@reapit/ts-types": "workspace:packages/ts-types",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^14.2.1",
     "@types/debounce": "^1.2.4",

packages/app-marketplace-admin/package.json

@@ -29,6 +29,7 @@
     "@linaria/react": "^5.0.3",
     "@reapit/connect-session": "workspace:packages/connect-session",
     "@reapit/elements": "^4.1.2",
+    "@reapit/foundations-ts-definitions": "2.0.0",
     "@reapit/utils-common": "workspace:packages/utils-common",
     "@reapit/utils-react": "workspace:packages/utils-react",
     "@sentry/browser": "^7.107.0",
@@ -47,9 +48,7 @@
   "devDependencies": {
     "@linaria/shaker": "^5.0.3",
     "@reapit/config-manager": "workspace:packages/config-manager",
-    "@reapit/foundations-ts-definitions": "workspace:packages/foundations-ts-definitions",
     "@reapit/ts-scripts": "workspace:^",
-    "@reapit/ts-types": "workspace:packages/ts-types",
     "@testing-library/react": "^14.2.1",
     "@types/uuid": "^8.3.4",
     "@typescript-eslint/eslint-plugin": "^6.21.0",

packages/app-marketplace-admin/src/components/apps-market-manager/app-browse-manage-table.tsx

@@ -14,9 +14,9 @@ import {
   Table,
 } from '@reapit/elements'
 import {
+  Marketplace,
   AppsBrowseConfigEnum,
   AppsBrowseConfigItemInterface,
-  AppSummaryModelPagedResult,
 } from '@reapit/foundations-ts-definitions'
 import {
   SendFunction,
@@ -121,7 +121,7 @@ export const updatedItemIndex = async <T extends { index?: number; id?: string }
 
 export const ManageTableExpandableContent: FC<ManageTableExpandableContentProps> = (props) => {
   const { configItem, setSelectedItem, connectSession, deleteItem } = props
-  const [selectedApps] = useReapitGet<AppSummaryModelPagedResult>({
+  const [selectedApps] = useReapitGet<Marketplace.AppSummaryModelPagedResult>({
     reapitConnectBrowserSession,
     action: getActions[GetActionNames.getApps],
     queryParams: { showHiddenApps: 'true', pageSize: 100, id: configItem?.filters?.id },

packages/app-marketplace-admin/src/components/apps-market-manager/app-browse-upsert-modal.tsx

@@ -26,11 +26,10 @@ import {
   ToggleRadio,
 } from '@reapit/elements'
 import {
+  Marketplace,
   AppsBrowseConfigEnum,
-  AppsBrowseConfigItemFiltersInterface,
   AppsBrowseConfigItemInterface,
-  AppSummaryModelPagedResult,
-  CategoryModelPagedResult,
+  AppsBrowseConfigItemFiltersInterface,
 } from '@reapit/foundations-ts-definitions'
 import { SearchableMultiSelect } from '@reapit/utils-react'
 import {
@@ -179,7 +178,7 @@ export const AppBrowseUpsertModal: FC<AppBrowseUpsertModalDefaultProps> = ({
 
   const [loading, setLoading] = useState<boolean>(false)
 
-  const [categories] = useReapitGet<CategoryModelPagedResult>({
+  const [categories] = useReapitGet<Marketplace.CategoryModelPagedResult>({
     reapitConnectBrowserSession,
     action: getActions[GetActionNames.getAppCategories],
     queryParams: { pageSize: 25 },
@@ -192,7 +191,7 @@ export const AppBrowseUpsertModal: FC<AppBrowseUpsertModalDefaultProps> = ({
     returnType: UpdateReturnTypeEnum.RESPONSE,
   })
 
-  const [initialApps] = useReapitGet<AppSummaryModelPagedResult>({
+  const [initialApps] = useReapitGet<Marketplace.AppSummaryModelPagedResult>({
     reapitConnectBrowserSession,
     action: getActions[GetActionNames.getApps],
     queryParams: { showHiddenApps: 'true', pageSize: 100, id: defaultValues?.filters?.id },

packages/app-marketplace-cms/package.json

@@ -7,6 +7,7 @@
     "@nestjs/config": "^2.3.4",
     "@nestjs/core": "^9.4.3",
     "@nestjs/platform-express": "^9.4.3",
+    "@reapit/foundations-ts-definitions": "2.0.0",
     "@reapit/utils-nest": "workspace:packages/utils-nest",
     "aws-lambda": "^1.0.7",
     "aws-sdk": "^2.1580.0",

packages/app-marketplace-cms/src/cms/public-controller.ts

@@ -1,6 +1,6 @@
 import { QueryIterator } from '@aws/dynamodb-data-mapper'
 import { Controller, Get, Query } from '@nestjs/common'
-import { AppsBrowseConfigEnum } from '@reapit/foundations-ts-definitions/marketplace-cms'
+import { AppsBrowseConfigEnum } from '@reapit/foundations-ts-definitions'
 import { CmsProvider } from './cms-provider'
 import { MarketplaceAppModel } from './marketplace-app-model'
 

packages/app-marketplace-cms/tsconfig.json

@@ -7,7 +7,6 @@
     "baseUrl": "./",
     "sourceRoot": "/",
     "paths": {
-      "@reapit/*": ["../*"],
       "@reapit/utils-nest": ["../utils-nest/src"]
     },
     "declaration": true,

packages/cli/package.json

@@ -36,7 +36,6 @@
   "devDependencies": {
     "@reapit/config-manager": "workspace:packages/config-manager",
     "@reapit/ts-scripts": "workspace:packages/ts-scripts",
-    "@reapit/ts-types": "workspace:packages/ts-types",
     "@types/adm-zip": "^0.5.5",
     "@types/inquirer": "^7.3.3",
     "@types/semver": "^7.5.8",

packages/cli/src/commands/pipeline/delete.ts

@@ -1,6 +1,6 @@
 import { Command } from '../../decorators'
 import { AbstractCommand } from '../../abstract.command'
-import { PipelineModelInterface } from '../../../../foundations-ts-definitions/deployment-schema'
+import { PipelineModelInterface } from '@reapit/foundations-ts-definitions'
 import ora from 'ora'
 import { REAPIT_PIPELINE_CONFIG_FILE } from './constants'
 import chalk from 'chalk'

packages/cli/src/commands/pipeline/link.ts

@@ -3,7 +3,7 @@ import { AbstractCommand } from '../../abstract.command'
 import {
   PipelineModelInterface,
   PipelineRunnerModelInterface,
-} from '../../../../foundations-ts-definitions/deployment-schema'
+} from '@reapit/foundations-ts-definitions'
 import ora from 'ora'
 import { REAPIT_PIPELINE_CONFIG_FILE } from './constants'
 import inquirer from 'inquirer'

packages/cli/src/commands/release/repo.ts

@@ -3,7 +3,7 @@ import { AbstractCommand } from '../../abstract.command'
 import {
   PipelineModelInterface,
   PipelineRunnerModelInterface,
-} from '@reapit/foundations-ts-definitions/deployment-schema'
+} from '@reapit/foundations-ts-definitions'
 import ora from 'ora'
 import { REAPIT_PIPELINE_CONFIG_FILE } from '../pipeline/constants'
 import { Multispinner, SpinnerState } from '../../utils/multispinner'

packages/cognito-custom-mail-lambda/package.json

@@ -31,14 +31,14 @@
   },
   "homepage": "https://github.com/reapit/foundations#readme",
   "dependencies": {
+    "@reapit/foundations-ts-definitions": "^1.5.9",
     "aws-lambda": "^1.0.7",
     "events": "^3.3.0",
     "snyk": "^1.1285.0",
     "string-template": "^1.0.0"
   },
   "devDependencies": {
     "@reapit/config-manager": "workspace:packages/config-manager",
-    "@reapit/foundations-ts-definitions": "workspace:^",
     "@reapit/ts-scripts": "workspace:^",
     "@reapit/utils-node": "workspace:packages/utils-node",
     "@types/mjml": "^4.7.4",

packages/connect-session-server/tsconfig.json

@@ -7,8 +7,7 @@
     "baseUrl": "./",
     "sourceRoot": "/",
     "paths": {
-      "@reapit/utils-nest": ["../utils-nest/src"],
-      "@reapit/*": ["../*"]
+      "@reapit/utils-nest": ["../utils-nest/src"]
     },
     "declaration": true,
     "declarationDir": "dist",

packages/connect-session/package.json

@@ -52,7 +52,6 @@
   "devDependencies": {
     "@reapit/config-manager": "workspace:packages/config-manager",
     "@reapit/ts-scripts": "workspace:packages/ts-scripts",
-    "@reapit/ts-types": "workspace:packages/ts-types",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",

packages/data-warehouse/package.json

@@ -39,7 +39,6 @@
     "@linaria/shaker": "^5.0.3",
     "@reapit/config-manager": "workspace:packages/config-manager",
     "@reapit/ts-scripts": "workspace:packages/ts-scripts",
-    "@reapit/ts-types": "workspace:packages/ts-types",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
     "babel-jest": "^29.7.0",