chore: new omni-core package #35992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

kodiakhq merged 6 commits into develop from new-omni-lib-pkg

Jul 28, 2025

+166 −15

apps/meteor/app/livechat/imports/server/rest/departments.ts

-Original file line number
+Diff line change
@@ -1,5 +1,6 @@
     import type { ILivechatDepartment } from '@rocket.chat/core-typings';
     import { LivechatDepartment, LivechatDepartmentAgents } from '@rocket.chat/models';
+    import { isDepartmentCreationAvailable } from '@rocket.chat/omni-core';
     import { isGETLivechatDepartmentProps, isPOSTLivechatDepartmentProps } from '@rocket.chat/rest-typings';
     import {
     	isLivechatDepartmentDepartmentIdAgentsGETProps,
@@ Expand All / @@ -26,7 +27,6 @@ import { @@
     	saveDepartmentAgents,
     	removeDepartment,
     } from '../../../server/lib/departmentsLib';
-    import { isDepartmentCreationAvailable } from '../../../server/lib/isDepartmentCreationAvailable';
     API.v1.addRoute(
     	'livechat/department',
@@ Expand Down @@

apps/meteor/app/livechat/server/lib/departmentsLib.ts

-Original file line number
+Diff line change
@@ -1,12 +1,12 @@
     import { AppEvents, Apps } from '@rocket.chat/apps';
     import type { LivechatDepartmentDTO, ILivechatDepartment, ILivechatDepartmentAgents, ILivechatAgent } from '@rocket.chat/core-typings';
     import { LivechatDepartment, LivechatDepartmentAgents, LivechatVisitors, LivechatRooms, Users } from '@rocket.chat/models';
+    import { isDepartmentCreationAvailable } from '@rocket.chat/omni-core';
     import { check } from 'meteor/check';
     import { Meteor } from 'meteor/meteor';
     import { updateDepartmentAgents } from './Helper';
     import { afterDepartmentArchived, afterDepartmentUnarchived } from './hooks';
-    import { isDepartmentCreationAvailable } from './isDepartmentCreationAvailable';
     import { livechatLogger } from './logger';
     import { callbacks } from '../../../../lib/callbacks';
     import {
@@ Expand Down @@

apps/meteor/ee/app/livechat-enterprise/server/index.ts

-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
     import { License } from '@rocket.chat/license';
+    import { patchOmniCore } from '@rocket.chat/omni-core-ee';
     import { Meteor } from 'meteor/meteor';
     import './methods/addMonitor';
@@ Expand Down Expand Up / @@ -30,6 +31,8 @@ import './business-hour'; @@
     import './api';
     import { createDefaultPriorities } from './priorities';
+    patchOmniCore();
     await License.onLicense('livechat-enterprise', async () => {
     	require('./hooks');
     	await import('./startup');
@@ Expand Down @@

apps/meteor/ee/server/patches/index.ts

-Original file line number
+Diff line change
@@ -1,6 +1,5 @@
     import './closeBusinessHour';
     import './getInstanceList';
-    import './isDepartmentCreationAvailable';
     import './verifyContactChannel';
     import './mergeContacts';
     import './isAgentAvailableToTakeContactInquiry';
@@ Expand Down @@

apps/meteor/ee/server/patches/isDepartmentCreationAvailable.ts

This file was deleted.

apps/meteor/package.json

-Original file line number
+Diff line change
@@ Expand Up / @@ -277,6 +277,8 @@ @@
     		"@rocket.chat/mongo-adapter": "workspace:^",
     		"@rocket.chat/mp3-encoder": "^0.31.26",
     		"@rocket.chat/network-broker": "workspace:^",
+    		"@rocket.chat/omni-core": "workspace:^",
+    		"@rocket.chat/omni-core-ee": "workspace:^",
     		"@rocket.chat/omnichannel-services": "workspace:^",
     		"@rocket.chat/onboarding-ui": "^0.35.2",
     		"@rocket.chat/password-policies": "workspace:^",
@@ Expand Down @@

ee/packages/omni-core-ee/.eslintrc.json

-Original file line number
+Diff line change
@@ -0,0 +1,4 @@
+    {
+    	"extends": ["@rocket.chat/eslint-config"],
+    	"ignorePatterns": ["**/dist"]
+    }

ee/packages/omni-core-ee/package.json

-Original file line number
+Diff line change
@@ -0,0 +1,30 @@
+    {
+    	"name": "@rocket.chat/omni-core-ee",
+    	"version": "0.0.1",
+    	"private": true,
+    	"devDependencies": {
+    		"@rocket.chat/eslint-config": "workspace:^",
+    		"@rocket.chat/jest-presets": "workspace:~",
+    		"@rocket.chat/tsconfig": "workspace:*",
+    		"@types/jest": "~29.5.14",
+    		"eslint": "~8.45.0",
+    		"jest": "~29.7.0",
+    		"typescript": "~5.7.2"
+    	},
+    	"scripts": {
+    		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
+    		"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
+    		"test": "jest",
+    		"build": "rm -rf dist && tsc -p tsconfig.json",
+    		"dev": "tsc -p tsconfig.json --watch --preserveWatchOutput"
+    	},
+    	"main": "./dist/index.js",
+    	"typings": "./dist/index.d.ts",
+    	"files": [
+    		"/dist"
+    	],
+    	"dependencies": {
+    		"@rocket.chat/models": "workspace:^",
+    		"@rocket.chat/omni-core": "workspace:^"
+    	}
+    }

ee/packages/omni-core-ee/src/index.ts

-Original file line number
+Diff line change
@@ -0,0 +1,5 @@
+    import { isDepartmentCreationAvailablePatch } from './isDepartmentCreationAvailable';
+    export function patchOmniCore(): void {
+    	isDepartmentCreationAvailablePatch();
+    }

ee/packages/omni-core-ee/src/isDepartmentCreationAvailable.ts

-Original file line number
+Diff line change
@@ -0,0 +1,13 @@
+    import { License } from '@rocket.chat/license';
+    import { isDepartmentCreationAvailable } from '@rocket.chat/omni-core';
+    export function isDepartmentCreationAvailablePatch(): void {
+    	isDepartmentCreationAvailable.patch(async (next) => {
+    		// Skip the standard check when Livechat Enterprise is enabled, as it allows unlimited departments
+    		if (License.hasModule('livechat-enterprise')) {
+    			return true;
+    		}
+    		return next();
+    	});
+    }

ee/packages/omni-core-ee/tsconfig.json

-Original file line number
+Diff line change
@@ -0,0 +1,9 @@
+    {
+    	"extends": "@rocket.chat/tsconfig/server.json",
+    	"compilerOptions": {
+    		"rootDir": "./src",
+    		"outDir": "./dist",
+    		"declaration": true
+    	},
+    	"include": ["./src/**/*"],
+    }

packages/omni-core/.eslintrc.json

-Original file line number
+Diff line change
@@ -0,0 +1,4 @@
+    {
+    	"extends": ["@rocket.chat/eslint-config"],
+    	"ignorePatterns": ["**/dist"]
+    }

packages/omni-core/package.json

-Original file line number
+Diff line change
@@ -0,0 +1,30 @@
+    {
+    	"name": "@rocket.chat/omni-core",
+    	"version": "0.0.1",
+    	"private": true,
+    	"devDependencies": {
+    		"@rocket.chat/eslint-config": "workspace:^",
+    		"@rocket.chat/jest-presets": "workspace:~",
+    		"@rocket.chat/tsconfig": "workspace:*",
+    		"@types/jest": "~29.5.14",
+    		"eslint": "~8.45.0",
+    		"jest": "~29.7.0",
+    		"typescript": "~5.7.2"
+    	},
+    	"scripts": {
+    		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
+    		"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
+    		"test": "jest",
+    		"build": "rm -rf dist && tsc -p tsconfig.json",
+    		"dev": "tsc -p tsconfig.json --watch --preserveWatchOutput"
+    	},
+    	"main": "./dist/index.js",
+    	"typings": "./dist/index.d.ts",
+    	"files": [
+    		"/dist"
+    	],
+    	"dependencies": {
+    		"@rocket.chat/models": "workspace:^",
+    		"@rocket.chat/patch-injection": "workspace:^"
+    	}
+    }

packages/omni-core/src/index.ts

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export * from './isDepartmentCreationAvailable';

0 ...rver/lib/isDepartmentCreationAvailable.ts → ...core/src/isDepartmentCreationAvailable.ts

File renamed without changes.

packages/omni-core/tsconfig.json

-Original file line number
+Diff line change
@@ -0,0 +1,9 @@
+    {
+    	"extends": "@rocket.chat/tsconfig/server.json",
+    	"compilerOptions": {
+    		"rootDir": "./src",
+    		"outDir": "./dist",
+    		"declaration": true
+    	},
+    	"include": ["./src/**/*"],
+    }

yarn.lock

-Original file line number
+Diff line change
@@ Expand Up / @@ -7867,6 +7867,8 @@ __metadata: @@
         "@rocket.chat/mongo-adapter": "workspace:^"
         "@rocket.chat/mp3-encoder": "npm:^0.31.26"
         "@rocket.chat/network-broker": "workspace:^"
+        "@rocket.chat/omni-core": "workspace:^"
+        "@rocket.chat/omni-core-ee": "workspace:^"
         "@rocket.chat/omnichannel-services": "workspace:^"
         "@rocket.chat/onboarding-ui": "npm:^0.35.2"
         "@rocket.chat/password-policies": "workspace:^"
@@ Expand Down Expand Up / @@ -8299,6 +8301,38 @@ __metadata: @@
       languageName: unknown
       linkType: soft
+    "@rocket.chat/omni-core-ee@workspace:^, @rocket.chat/omni-core-ee@workspace:ee/packages/omni-core-ee":
+      version: 0.0.0-use.local
+      resolution: "@rocket.chat/omni-core-ee@workspace:ee/packages/omni-core-ee"
+      dependencies:
+        "@rocket.chat/eslint-config": "workspace:^"
+        "@rocket.chat/jest-presets": "workspace:~"
+        "@rocket.chat/models": "workspace:^"
+        "@rocket.chat/omni-core": "workspace:^"
+        "@rocket.chat/tsconfig": "workspace:*"
+        "@types/jest": "npm:~29.5.14"
+        eslint: "npm:~8.45.0"
+        jest: "npm:~29.7.0"
+        typescript: "npm:~5.7.2"
+      languageName: unknown
+      linkType: soft
+    "@rocket.chat/omni-core@workspace:^, @rocket.chat/omni-core@workspace:packages/omni-core":
+      version: 0.0.0-use.local
+      resolution: "@rocket.chat/omni-core@workspace:packages/omni-core"
+      dependencies:
+        "@rocket.chat/eslint-config": "workspace:^"
+        "@rocket.chat/jest-presets": "workspace:~"
+        "@rocket.chat/models": "workspace:^"
+        "@rocket.chat/patch-injection": "workspace:^"
+        "@rocket.chat/tsconfig": "workspace:*"
+        "@types/jest": "npm:~29.5.14"
+        eslint: "npm:~8.45.0"
+        jest: "npm:~29.7.0"
+        typescript: "npm:~5.7.2"
+      languageName: unknown
+      linkType: soft
     "@rocket.chat/omnichannel-services@workspace:^, @rocket.chat/omnichannel-services@workspace:ee/packages/omnichannel-services":
       version: 0.0.0-use.local
       resolution: "@rocket.chat/omnichannel-services@workspace:ee/packages/omnichannel-services"
@@ Expand Down Expand Up / @@ -34893,6 +34927,16 @@ __metadata: @@
       languageName: node
       linkType: hard
+    "typescript@npm:~5.7.2":
+      version: 5.7.3
+      resolution: "typescript@npm:5.7.3"
+      bin:
+        tsc: bin/tsc
+        tsserver: bin/tsserver
+      checksum: 10/6a7e556de91db3d34dc51cd2600e8e91f4c312acd8e52792f243c7818dfadb27bae677175fad6947f9c81efb6c57eb6b2d0c736f196a6ee2f1f7d57b74fc92fa
+      languageName: node
+      linkType: hard
     "typescript@npm:~5.8.3":
       version: 5.8.3
       resolution: "typescript@npm:5.8.3"
@@ Expand All / @@ -34903,6 +34947,16 @@ __metadata: @@
       languageName: node
       linkType: hard
+    "typescript@patch:typescript@npm%3A~5.7.2#optional!builtin<compat/typescript>":
+      version: 5.7.3
+      resolution: "typescript@patch:typescript@npm%3A5.7.3#optional!builtin<compat/typescript>::version=5.7.3&hash=5786d5"
+      bin:
+        tsc: bin/tsc
+        tsserver: bin/tsserver
+      checksum: 10/dc58d777eb4c01973f7fbf1fd808aad49a0efdf545528dab9b07d94fdcb65b8751742804c3057e9619a4627f2d9cc85547fdd49d9f4326992ad0181b49e61d81
+      languageName: node
+      linkType: hard
     "typescript@patch:typescript@npm%3A~5.8.3#optional!builtin<compat/typescript>":
       version: 5.8.3
       resolution: "typescript@patch:typescript@npm%3A5.8.3#optional!builtin<compat/typescript>::version=5.8.3&hash=5786d5"
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: new omni-core package #35992

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!