o2sdev · tomaszpacior · Apr 1, 2025 · Apr 1, 2025
diff --git a/apps/api-harmonization/CHANGELOG.md b/apps/api-harmonization/CHANGELOG.md
@@ -1,5 +1,151 @@
 # @o2s/api-harmonization
 
+## 0.18.0
+
+### Minor Changes
+
+- 98b2b61: implemented breadcrumbs
+
+### Patch Changes
+
+- Updated dependencies [98b2b61]
+    - @o2s/integrations.mocked@0.19.0
+    - @o2s/framework@0.20.0
+
+## 0.17.0
+
+### Minor Changes
+
+- 35eeac7: implement service details page
+- 92be116: added Price model, services page implemented
+- 92be116: implement services page
+- 35eeac7: implement service details page
+- 52b3e0a: add tooltips to mocked buttons
+
+### Patch Changes
+
+- Updated dependencies [35eeac7]
+- Updated dependencies [92be116]
+- Updated dependencies [92be116]
+- Updated dependencies [35eeac7]
+- Updated dependencies [52b3e0a]
+    - @o2s/integrations.mocked@0.18.0
+    - @o2s/framework@0.19.0
+
+## 0.16.0
+
+### Minor Changes
+
+- 92f2be2: Fix inconsistent data in User Profile
+
+### Patch Changes
+
+- Updated dependencies [3a1ff43]
+- Updated dependencies [92f2be2]
+    - @o2s/framework@0.18.0
+    - @o2s/integrations.mocked@0.17.0
+
+## 0.15.3
+
+### Patch Changes
+
+- Updated dependencies [477ca3e]
+    - @o2s/integrations.mocked@0.16.0
+    - @o2s/framework@0.17.0
+
+## 0.15.2
+
+### Patch Changes
+
+- Updated dependencies [30d3544]
+- Updated dependencies [c4ec3cb]
+- Updated dependencies [db41474]
+- Updated dependencies [30d3544]
+    - @o2s/integrations.mocked@0.15.0
+    - @o2s/framework@0.16.0
+
+## 0.15.1
+
+### Patch Changes
+
+- 5b48057: updated dependencies
+- Updated dependencies [5b48057]
+    - @o2s/integrations.strapi-cms@0.14.1
+    - @o2s/integrations.algolia@0.2.1
+    - @o2s/integrations.mocked@0.14.1
+    - @o2s/integrations.redis@0.9.2
+    - @o2s/utils.logger@0.9.2
+    - @o2s/framework@0.15.1
+
+## 0.15.0
+
+### Minor Changes
+
+- db32d1c: unified naming of the related objects in the api-harmonization and frontend apps - from now on, they are called `blocks` (instead of `components` in api-harmonization and `containers` in frontend)
+
+### Patch Changes
+
+- Updated dependencies [db32d1c]
+    - @o2s/integrations.strapi-cms@0.14.0
+    - @o2s/integrations.mocked@0.14.0
+    - @o2s/framework@0.15.0
+
+## 0.14.0
+
+### Minor Changes
+
+- 80b678a: Added search integration with Algolia
+
+### Patch Changes
+
+- Updated dependencies [80b678a]
+    - @o2s/integrations.strapi-cms@0.13.0
+    - @o2s/integrations.algolia@0.2.0
+    - @o2s/integrations.mocked@0.13.0
+    - @o2s/framework@0.14.0
+
+## 0.13.0
+
+### Minor Changes
+
+- 0e3fe6c: improved error handling across the app
+
+### Patch Changes
+
+- Updated dependencies [0e3fe6c]
+    - @o2s/integrations.strapi-cms@0.12.0
+    - @o2s/integrations.mocked@0.12.0
+
+## 0.12.0
+
+### Minor Changes
+
+- b4cddfb: add seo, add headers
+
+### Patch Changes
+
+- f2a6781: fixed an issue with alternative URLs for pages - on pages with dynamic URLs (e.g. /cases/(.+)) switching to another locale caused route to change to /cases/(.+) instead of /cases/12345
+- eea2896: added recent tickets component
+- Updated dependencies [f2a6781]
+- Updated dependencies [eea2896]
+- Updated dependencies [b4cddfb]
+- Updated dependencies [54c9fb5]
+    - @o2s/integrations.strapi-cms@0.11.0
+    - @o2s/integrations.mocked@0.11.0
+    - @o2s/framework@0.12.0
+
+## 0.11.0
+
+### Minor Changes
+
+- e0ce5cb: Added localized mocks
+
+### Patch Changes
+
+- Updated dependencies [e0ce5cb]
+    - @o2s/integrations.mocked@0.10.0
+    - @o2s/framework@0.11.0
+
 ## 0.10.1
 
 ### Patch Changes

diff --git a/apps/api-harmonization/package.json b/apps/api-harmonization/package.json
@@ -1,13 +1,13 @@
 {
     "name": "@o2s/api-harmonization",
-    "version": "0.10.1",
+    "version": "0.18.0",
     "description": "",
     "author": "",
     "private": true,
     "license": "MIT",
     "exports": {
         ".": "./src/index.ts",
-        "./components": "./src/components/index.ts",
+        "./blocks": "./src/blocks/index.ts",
         "./modules": "./src/modules/index.ts"
     },
     "scripts": {
@@ -25,10 +25,10 @@
         "@nestjs/config": "^3.3.0",
         "@nestjs/core": "^10.0.0",
         "@nestjs/platform-express": "^10.0.0",
-        "@o2s/framework": "^0.13.1",
-        "@o2s/integrations.mocked": "^0.12.1",
-        "@o2s/utils.logger": "^0.9.1",
-        "compression": "^1.7.5",
+        "@o2s/framework": "^0.20.0",
+        "@o2s/integrations.mocked": "^0.19.0",
+        "@o2s/utils.logger": "^0.9.3",
+        "compression": "^1.8.0",
         "cookie": "^1.0.2",
         "cookie-parser": "^1.4.7",
         "dayjs": "^1.11.13",
@@ -50,26 +50,26 @@
         "@trivago/prettier-plugin-sort-imports": "^4.3.0",
         "@types/compression": "^1.7.5",
         "@types/cookie-parser": "^1.4.8",
-        "@types/express": "^5.0.0",
-        "@types/jest": "^29.5.2",
+        "@types/express": "^5.0.1",
+        "@types/jest": "^29.5.14",
         "@types/node": "^20.3.1",
         "@types/string-template": "^1.0.6",
-        "@types/supertest": "^6.0.0",
+        "@types/supertest": "^6.0.3",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
         "@typescript-eslint/parser": "^8.0.0",
         "cross-env": "^7.0.3",
         "eslint": "^8.0.0",
         "eslint-config-prettier": "^9.0.0",
         "eslint-plugin-prettier": "^5.0.0",
-        "jest": "^29.5.0",
-        "prettier": "^3.4.0",
+        "jest": "^29.7.0",
+        "prettier": "^3.5.3",
         "source-map-support": "^0.5.21",
         "supertest": "^7.0.0",
         "ts-jest": "^29.1.0",
         "ts-loader": "^9.4.3",
-        "ts-node": "^10.9.1",
+        "ts-node": "^10.9.2",
         "tsconfig-paths": "^4.2.0",
-        "typescript": "^5.1.3"
+        "typescript": "^5.8.2"
     },
     "jest": {
         "moduleFileExtensions": [
@@ -88,4 +88,4 @@
         "coverageDirectory": "../coverage",
         "testEnvironment": "node"
     }
-}
+}
diff --git a/apps/api-harmonization/src/app.config.ts b/apps/api-harmonization/src/app.config.ts
@@ -7,7 +7,9 @@ import { CmsIntegrationConfig } from '@o2s/api-harmonization/models/cms';
 import { InvoicesIntegrationConfig } from '@o2s/api-harmonization/models/invoices';
 import { NotificationsIntegrationConfig } from '@o2s/api-harmonization/models/notifications';
 import { OrganizationsIntegrationConfig } from '@o2s/api-harmonization/models/organizations';
+import { ProductsIntegrationConfig } from '@o2s/api-harmonization/models/products';
 import { ResourcesIntegrationConfig } from '@o2s/api-harmonization/models/resources';
+import { SearchIntegrationConfig } from '@o2s/api-harmonization/models/search';
 import { TicketsIntegrationConfig } from '@o2s/api-harmonization/models/tickets';
 import { UsersIntegrationConfig } from '@o2s/api-harmonization/models/users';
 
@@ -23,5 +25,7 @@ export const AppConfig: ApiConfig = {
         cms: CmsIntegrationConfig,
         cache: CacheIntegrationConfig,
         billingAccounts: BillingAccountsIntegrationConfig,
+        search: SearchIntegrationConfig,
+        products: ProductsIntegrationConfig,
     },
 };
diff --git a/apps/api-harmonization/src/app.module.ts b/apps/api-harmonization/src/app.module.ts
@@ -13,26 +13,30 @@ import {
     Invoices,
     Notifications,
     Organizations,
+    Products,
     Resources,
+    Search,
     Tickets,
     Users,
 } from '@o2s/framework/modules';
 
-// COMPONENT IMPORT
+// BLOCK IMPORT
 import { configuration } from '@o2s/api-harmonization/config/configuration';
 
-import { ArticleDetailsComponentModule } from '@o2s/api-harmonization/components/article-details/article-details.module';
-import { ArticleListComponentModule } from '@o2s/api-harmonization/components/article-list/article-list.module';
-import { FaqComponentModule } from '@o2s/api-harmonization/components/faq/faq.module';
-import { InvoiceListComponentModule } from '@o2s/api-harmonization/components/invoice-list/invoice-list.module';
-import { NotificationDetailsComponentModule } from '@o2s/api-harmonization/components/notification-details/notification-details.module';
-import { NotificationListComponentModule } from '@o2s/api-harmonization/components/notification-list/notification-list.module';
-import { PaymentsHistoryComponentModule } from '@o2s/api-harmonization/components/payments-history/payments-history.module';
-import { PaymentsSummaryComponentModule } from '@o2s/api-harmonization/components/payments-summary/payments-summary.module';
-import { TicketDetailsComponentModule } from '@o2s/api-harmonization/components/ticket-details/ticket-details.module';
-import { TicketListComponentModule } from '@o2s/api-harmonization/components/ticket-list/ticket-list.module';
-import { TicketRecentComponentModule } from '@o2s/api-harmonization/components/ticket-recent/ticket-recent.module';
-import { UserAccountComponentModule } from '@o2s/api-harmonization/components/user-account/user-account.module';
+import { ArticleDetailsBlockModule } from '@o2s/api-harmonization/blocks/article-details/article-details.module';
+import { ArticleListBlockModule } from '@o2s/api-harmonization/blocks/article-list/article-list.module';
+import { FaqBlockModule } from '@o2s/api-harmonization/blocks/faq/faq.module';
+import { InvoiceListBlockModule } from '@o2s/api-harmonization/blocks/invoice-list/invoice-list.module';
+import { NotificationDetailsBlockModule } from '@o2s/api-harmonization/blocks/notification-details/notification-details.module';
+import { NotificationListBlockModule } from '@o2s/api-harmonization/blocks/notification-list/notification-list.module';
+import { PaymentsHistoryBlockModule } from '@o2s/api-harmonization/blocks/payments-history/payments-history.module';
+import { PaymentsSummaryBlockModule } from '@o2s/api-harmonization/blocks/payments-summary/payments-summary.module';
+import { ServiceDetailsBlockModule } from '@o2s/api-harmonization/blocks/service-details/service-details.module';
+import { ServiceListBlockModule } from '@o2s/api-harmonization/blocks/service-list/service-list.module';
+import { TicketDetailsBlockModule } from '@o2s/api-harmonization/blocks/ticket-details/ticket-details.module';
+import { TicketListBlockModule } from '@o2s/api-harmonization/blocks/ticket-list/ticket-list.module';
+import { TicketRecentBlockModule } from '@o2s/api-harmonization/blocks/ticket-recent/ticket-recent.module';
+import { UserAccountBlockModule } from '@o2s/api-harmonization/blocks/user-account/user-account.module';
 
 import { AppConfig } from './app.config';
 import { AppService } from './app.service';
@@ -52,34 +56,39 @@ import { RoutesModule } from './modules/routes/routes.module';
             ignoreEnvFile: process.env.NODE_ENV !== 'development',
             envFilePath: `.env.local`,
         }),
+
         CMS.Module.register(AppConfig),
         Tickets.Module.register(AppConfig),
         Notifications.Module.register(AppConfig),
         Users.Module.register(AppConfig),
         Organizations.Module.register(AppConfig),
         Cache.Module.register(AppConfig),
         BillingAccounts.Module.register(AppConfig),
+        Resources.Module.register(AppConfig),
+        Invoices.Module.register(AppConfig),
+        Articles.Module.register(AppConfig),
+        Search.Module.register(AppConfig),
+        Products.Module.register(AppConfig),
 
         PageModule.register(AppConfig),
         RoutesModule.register(AppConfig),
         LoginPageModule.register(AppConfig),
         NotFoundPageModule.register(AppConfig),
 
-        TicketListComponentModule.register(AppConfig),
-        TicketDetailsComponentModule.register(AppConfig),
-        NotificationListComponentModule.register(AppConfig),
-        NotificationDetailsComponentModule.register(AppConfig),
-        FaqComponentModule.register(AppConfig),
-        Articles.Module.register(AppConfig),
-        ArticleDetailsComponentModule.register(AppConfig),
-        ArticleListComponentModule.register(AppConfig),
-        Resources.Module.register(AppConfig),
-        Invoices.Module.register(AppConfig),
-        InvoiceListComponentModule.register(AppConfig),
-        PaymentsSummaryComponentModule.register(AppConfig),
-        PaymentsHistoryComponentModule.register(AppConfig),
-        UserAccountComponentModule.register(AppConfig),
-        TicketRecentComponentModule.register(AppConfig),
+        TicketListBlockModule.register(AppConfig),
+        TicketDetailsBlockModule.register(AppConfig),
+        NotificationListBlockModule.register(AppConfig),
+        NotificationDetailsBlockModule.register(AppConfig),
+        FaqBlockModule.register(AppConfig),
+        ArticleDetailsBlockModule.register(AppConfig),
+        ArticleListBlockModule.register(AppConfig),
+        InvoiceListBlockModule.register(AppConfig),
+        PaymentsSummaryBlockModule.register(AppConfig),
+        PaymentsHistoryBlockModule.register(AppConfig),
+        UserAccountBlockModule.register(AppConfig),
+        TicketRecentBlockModule.register(AppConfig),
+        ServiceListBlockModule.register(AppConfig),
+        ServiceDetailsBlockModule.register(AppConfig),
         // COMPONENT REGISTER
     ],
     providers: [

diff --git a/...cle-details/article-details.controller.ts → ...cle-details/article-details.controller.ts b/...cle-details/article-details.controller.ts → ...cle-details/article-details.controller.ts
@@ -4,7 +4,7 @@ import { LoggerService } from '@o2s/utils.logger';
 import { AppHeaders } from '@o2s/api-harmonization/utils/headers';
 
 import { URL } from './';
-import { GetArticleDetailsComponentParams, GetArticleDetailsComponentQuery } from './article-details.request';
+import { GetArticleDetailsBlockParams, GetArticleDetailsBlockQuery } from './article-details.request';
 import { ArticleDetailsService } from './article-details.service';
 
 @Controller(URL)
@@ -13,11 +13,11 @@ export class ArticleDetailsController {
     constructor(protected readonly service: ArticleDetailsService) {}
 
     @Get(':id')
-    getArticleDetailsComponent(
+    getArticleDetailsBlock(
         @Headers() headers: AppHeaders,
-        @Query() query: GetArticleDetailsComponentQuery,
-        @Param() params: GetArticleDetailsComponentParams,
+        @Query() query: GetArticleDetailsBlockQuery,
+        @Param() params: GetArticleDetailsBlockParams,
     ) {
-        return this.service.getArticleDetailsComponent(query, params, headers);
+        return this.service.getArticleDetailsBlock(query, params, headers);
     }
 }