Skip to content

Commit

Permalink
Merge branch 'develop' into Daksh/RocketChat#24917
Browse files Browse the repository at this point in the history
  • Loading branch information
Daksh-10 authored Sep 1, 2023
2 parents 1afa33b + 6098941 commit ed2847d
Show file tree
Hide file tree
Showing 674 changed files with 11,620 additions and 14,275 deletions.
7 changes: 7 additions & 0 deletions .changeset/bright-carpets-fly.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@rocket.chat/core-typings': minor
'@rocket.chat/rest-typings': minor
'@rocket.chat/meteor': minor
---

new: ring mobile users on direct conference calls
9 changes: 9 additions & 0 deletions .changeset/bright-snakes-vanish.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
"@rocket.chat/meteor": patch
---

Fixed an issue causing `queue time` to be calculated from current time when a room was closed without being served.
Now:
- For served rooms: queue time = servedBy time - queuedAt
- For not served, but open rooms = now - queuedAt
- For not served and closed rooms = closedAt - queuedAt
7 changes: 7 additions & 0 deletions .changeset/chilled-phones-give.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/core-typings": patch
"@rocket.chat/rest-typings": patch
---

Fixed `overrideDestinationChannelEnabled` treated as a required param in `integrations.create` and `integration.update` endpoints
5 changes: 5 additions & 0 deletions .changeset/cool-students-tan.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

feat(apps): `ActionManagerBusyState` component for apps `ui.interaction`
6 changes: 6 additions & 0 deletions .changeset/eighty-kids-jog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/livechat': minor
'@rocket.chat/meteor': minor
---

Added new Omnichannel's trigger condition "After starting a chat".
6 changes: 6 additions & 0 deletions .changeset/fair-cats-destroy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/model-typings": patch
---

When setting a room as read-only, do not allow previously unmuted users to send messages.
5 changes: 5 additions & 0 deletions .changeset/fast-pumpkins-smoke.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

fix: finnish translation
5 changes: 5 additions & 0 deletions .changeset/fifty-cars-divide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed issue with custom OAuth services' settings not being be fully removed
5 changes: 5 additions & 0 deletions .changeset/fuzzy-glasses-divide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': minor
---

Added a new Roles bridge to RC Apps-Engine for reading and retrieving role details.
5 changes: 5 additions & 0 deletions .changeset/good-elephants-live.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixed message fetching method in LivechatBridge for Apps
5 changes: 5 additions & 0 deletions .changeset/grumpy-candles-rule.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

fix: rejected conference calls continue to ring
5 changes: 5 additions & 0 deletions .changeset/heavy-baboons-laugh.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

User information crashing for some locales
5 changes: 5 additions & 0 deletions .changeset/hip-hounds-ring.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Added ability to disable private app installation via envvar (DISABLED_PRIVATE_APP_INSTALLATION)
5 changes: 5 additions & 0 deletions .changeset/many-icons-provide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Don't allow to report self messages
5 changes: 5 additions & 0 deletions .changeset/moody-pans-act.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fix seat counter including bots users
6 changes: 6 additions & 0 deletions .changeset/pretty-bees-give.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": minor
"@rocket.chat/rest-typings": minor
---

Add option to select what URL previews should be generated for each message.
6 changes: 6 additions & 0 deletions .changeset/real-pets-visit.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/core-typings": patch
---

Fixed `default` field not being returned from the `setDefault` endpoints when setting to false
5 changes: 5 additions & 0 deletions .changeset/rotten-turtles-agree.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fix: stop blinking "Room not found" before dm creation
8 changes: 8 additions & 0 deletions .changeset/serious-geckos-drive.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
'@rocket.chat/core-typings': minor
'@rocket.chat/rest-typings': minor
'@rocket.chat/ui-client': minor
'@rocket.chat/meteor': minor
---

Added Reports Metrics Dashboard to Omnichannel
5 changes: 5 additions & 0 deletions .changeset/shiny-garlics-carry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fix CORS headers not being set for assets
5 changes: 5 additions & 0 deletions .changeset/short-cobras-tell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": minor
---

Reorganized the message menu
5 changes: 5 additions & 0 deletions .changeset/sour-cows-refuse.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed inviter not informed when inviting member to room via `/invite` slashcommand
5 changes: 5 additions & 0 deletions .changeset/stale-roses-knock.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fix: User timezone not being respected on Current Chat's filter
6 changes: 6 additions & 0 deletions .changeset/tricky-years-swim.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/rest-typings": patch
---

Deprecate `livechat:getOverviewData` and `livechat:getAgentOverviewData` methods and create API endpoints `livechat/analytics/overview` and `livechat/analytics/agent-overview` to fetch analytics data
5 changes: 5 additions & 0 deletions .changeset/unlucky-turtles-search.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixed Accounts profile form name change was not working
5 changes: 5 additions & 0 deletions .changeset/wet-frogs-kiss.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fix: Missing padding on Omnichannel contacts Contextualbar loading state
5 changes: 5 additions & 0 deletions .changeset/wild-spiders-smell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed an issue where a mailer error was being sent to customers using offline message's form on Omnichannel instead of the translated one
11 changes: 11 additions & 0 deletions .changeset/wise-onions-trade.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/i18n": patch
"@rocket.chat/livechat": patch
"@rocket.chat/mock-providers": patch
"@rocket.chat/ui-client": patch
"@rocket.chat/ui-contexts": patch
"@rocket.chat/web-ui-registration": patch
---

Fixed the login page language switcher, now the component has a new look, is reactive and the language selection becomes concrete upon login in. Also changed the default language of the login page to be the browser language.
5 changes: 5 additions & 0 deletions .changeset/wise-ways-fetch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fixed the unread messages mark not showing
5 changes: 5 additions & 0 deletions .changeset/yellow-schools-tell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/eslint-config': minor
---

Unpublished changes in ESLint config
5 changes: 3 additions & 2 deletions .github/workflows/ci-test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ jobs:
path: |
~/.cache/ms-playwright
# This is the version of Playwright that we are using, if you are willing to upgrade, you should update this.
key: playwright-1.23.1.
key: playwright-1.37.1

- name: Install Playwright
if: inputs.type == 'ui' && steps.cache-playwright.outputs.cache-hit != 'true'
Expand Down Expand Up @@ -203,7 +203,8 @@ jobs:
IS_EE: ${{ inputs.release == 'ee' && 'true' || '' }}
REPORTER_ROCKETCHAT_API_KEY: ${{ secrets.REPORTER_ROCKETCHAT_API_KEY }}
REPORTER_ROCKETCHAT_URL: ${{ secrets.REPORTER_ROCKETCHAT_URL }}
REPORTER_ROCKETCHAT_REPORT: ${{ github.ref == 'refs/heads/develop' && 'true' || '' }}
REPORTER_ROCKETCHAT_REPORT: ${{ github.event.pull_request.draft != 'true' && 'true' || '' }}
REPORTER_ROCKETCHAT_RUN: ${{ github.run_number }}
REPORTER_ROCKETCHAT_BRANCH: ${{ github.ref }}
REPORTER_ROCKETCHAT_DRAFT: ${{ github.event.pull_request.draft }}
QASE_API_TOKEN: ${{ secrets.QASE_API_TOKEN }}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
diff --git a/dist/generateDocgenCodeBlock.js b/dist/generateDocgenCodeBlock.js
index 0993ac13e4b2aae6d24cf408d6a585b4ddeb7337..1405896291288eb1322d6c42144afd3b4fbd1abf 100644
--- a/dist/generateDocgenCodeBlock.js
+++ b/dist/generateDocgenCodeBlock.js
@@ -34,7 +34,7 @@ function insertTsIgnoreBeforeStatement(statement) {
* ```
*/
function setDisplayName(d) {
- return insertTsIgnoreBeforeStatement(typescript_1.default.createExpressionStatement(typescript_1.default.createBinary(typescript_1.default.createPropertyAccess(typescript_1.default.createIdentifier(d.displayName), typescript_1.default.createIdentifier("displayName")), typescript_1.default.SyntaxKind.EqualsToken, typescript_1.default.createLiteral(d.displayName))));
+ return insertTsIgnoreBeforeStatement(typescript_1.default.factory.createExpressionStatement(typescript_1.default.factory.createBinaryExpression(typescript_1.default.factory.createPropertyAccessExpression(typescript_1.default.factory.createIdentifier(d.displayName), typescript_1.default.factory.createIdentifier("displayName")), typescript_1.default.SyntaxKind.EqualsToken, typescript_1.default.factory.createStringLiteral(d.displayName))));
}
/**
* Set a component prop description.
@@ -65,7 +65,7 @@ function createPropDefinition(propName, prop, options) {
*
* @param defaultValue Default prop value or null if not set.
*/
- const setDefaultValue = (defaultValue) => typescript_1.default.createPropertyAssignment(typescript_1.default.createLiteral("defaultValue"),
+ const setDefaultValue = (defaultValue) => typescript_1.default.factory.createPropertyAssignment(typescript_1.default.factory.createStringLiteral("defaultValue"),
// Use a more extensive check on defaultValue. Sometimes the parser
// returns an empty object.
defaultValue !== null &&
@@ -75,12 +75,19 @@ function createPropDefinition(propName, prop, options) {
(typeof defaultValue.value === "string" ||
typeof defaultValue.value === "number" ||
typeof defaultValue.value === "boolean")
- ? typescript_1.default.createObjectLiteral([
- typescript_1.default.createPropertyAssignment(typescript_1.default.createIdentifier("value"), typescript_1.default.createLiteral(defaultValue.value)),
+ ? typescript_1.default.factory.createObjectLiteralExpression([
+ typescript_1.default.factory.createPropertyAssignment(typescript_1.default.factory.createIdentifier("value"), typeof defaultValue.value === "string"
+ ? typescript_1.default.factory.createStringLiteral(defaultValue.value)
+ : // eslint-disable-next-line no-nested-ternary
+ typeof defaultValue.value === "number"
+ ? typescript_1.default.factory.createNumericLiteral(defaultValue.value)
+ : defaultValue.value
+ ? typescript_1.default.factory.createTrue()
+ : typescript_1.default.factory.createFalse()),
])
- : typescript_1.default.createNull());
+ : typescript_1.default.factory.createNull());
/** Set a property with a string value */
- const setStringLiteralField = (fieldName, fieldValue) => typescript_1.default.createPropertyAssignment(typescript_1.default.createLiteral(fieldName), typescript_1.default.createLiteral(fieldValue));
+ const setStringLiteralField = (fieldName, fieldValue) => typescript_1.default.factory.createPropertyAssignment(typescript_1.default.factory.createStringLiteral(fieldName), typescript_1.default.factory.createStringLiteral(fieldValue));
/**
* ```
* SimpleComponent.__docgenInfo.props.someProp.description = "Prop description.";
@@ -101,7 +108,7 @@ function createPropDefinition(propName, prop, options) {
* ```
* @param required Whether prop is required or not.
*/
- const setRequired = (required) => typescript_1.default.createPropertyAssignment(typescript_1.default.createLiteral("required"), required ? typescript_1.default.createTrue() : typescript_1.default.createFalse());
+ const setRequired = (required) => typescript_1.default.factory.createPropertyAssignment(typescript_1.default.factory.createStringLiteral("required"), required ? typescript_1.default.factory.createTrue() : typescript_1.default.factory.createFalse());
/**
* ```
* SimpleComponent.__docgenInfo.props.someProp.type = {
@@ -113,7 +120,7 @@ function createPropDefinition(propName, prop, options) {
*/
const setValue = (typeValue) => Array.isArray(typeValue) &&
typeValue.every((value) => typeof value.value === "string")
- ? typescript_1.default.createPropertyAssignment(typescript_1.default.createLiteral("value"), typescript_1.default.createArrayLiteral(typeValue.map((value) => typescript_1.default.createObjectLiteral([
+ ? typescript_1.default.factory.createPropertyAssignment(typescript_1.default.factory.createStringLiteral("value"), typescript_1.default.factory.createArrayLiteralExpression(typeValue.map((value) => typescript_1.default.factory.createObjectLiteralExpression([
setStringLiteralField("value", value.value),
]))))
: undefined;
@@ -130,9 +137,9 @@ function createPropDefinition(propName, prop, options) {
if (valueField) {
objectFields.push(valueField);
}
- return typescript_1.default.createPropertyAssignment(typescript_1.default.createLiteral(options.typePropName), typescript_1.default.createObjectLiteral(objectFields));
+ return typescript_1.default.factory.createPropertyAssignment(typescript_1.default.factory.createStringLiteral(options.typePropName), typescript_1.default.factory.createObjectLiteralExpression(objectFields));
};
- return typescript_1.default.createPropertyAssignment(typescript_1.default.createLiteral(propName), typescript_1.default.createObjectLiteral([
+ return typescript_1.default.factory.createPropertyAssignment(typescript_1.default.factory.createStringLiteral(propName), typescript_1.default.factory.createObjectLiteralExpression([
setDefaultValue(prop.defaultValue),
setDescription(prop.description),
setName(prop.name),
@@ -158,10 +165,10 @@ function createPropDefinition(propName, prop, options) {
* @param relativeFilename Relative file path of the component source file.
*/
function insertDocgenIntoGlobalCollection(d, docgenCollectionName, relativeFilename) {
- return insertTsIgnoreBeforeStatement(typescript_1.default.createIf(typescript_1.default.createBinary(typescript_1.default.createTypeOf(typescript_1.default.createIdentifier(docgenCollectionName)), typescript_1.default.SyntaxKind.ExclamationEqualsEqualsToken, typescript_1.default.createLiteral("undefined")), insertTsIgnoreBeforeStatement(typescript_1.default.createStatement(typescript_1.default.createBinary(typescript_1.default.createElementAccess(typescript_1.default.createIdentifier(docgenCollectionName), typescript_1.default.createLiteral(`${relativeFilename}#${d.displayName}`)), typescript_1.default.SyntaxKind.EqualsToken, typescript_1.default.createObjectLiteral([
- typescript_1.default.createPropertyAssignment(typescript_1.default.createIdentifier("docgenInfo"), typescript_1.default.createPropertyAccess(typescript_1.default.createIdentifier(d.displayName), typescript_1.default.createIdentifier("__docgenInfo"))),
- typescript_1.default.createPropertyAssignment(typescript_1.default.createIdentifier("name"), typescript_1.default.createLiteral(d.displayName)),
- typescript_1.default.createPropertyAssignment(typescript_1.default.createIdentifier("path"), typescript_1.default.createLiteral(`${relativeFilename}#${d.displayName}`)),
+ return insertTsIgnoreBeforeStatement(typescript_1.default.factory.createIfStatement(typescript_1.default.factory.createBinaryExpression(typescript_1.default.factory.createTypeOfExpression(typescript_1.default.factory.createIdentifier(docgenCollectionName)), typescript_1.default.SyntaxKind.ExclamationEqualsEqualsToken, typescript_1.default.factory.createStringLiteral("undefined")), insertTsIgnoreBeforeStatement(typescript_1.default.factory.createExpressionStatement(typescript_1.default.factory.createBinaryExpression(typescript_1.default.factory.createElementAccessExpression(typescript_1.default.factory.createIdentifier(docgenCollectionName), typescript_1.default.factory.createStringLiteral(`${relativeFilename}#${d.displayName}`)), typescript_1.default.SyntaxKind.EqualsToken, typescript_1.default.factory.createObjectLiteralExpression([
+ typescript_1.default.factory.createPropertyAssignment(typescript_1.default.factory.createIdentifier("docgenInfo"), typescript_1.default.factory.createPropertyAccessExpression(typescript_1.default.factory.createIdentifier(d.displayName), typescript_1.default.factory.createIdentifier("__docgenInfo"))),
+ typescript_1.default.factory.createPropertyAssignment(typescript_1.default.factory.createIdentifier("name"), typescript_1.default.factory.createStringLiteral(d.displayName)),
+ typescript_1.default.factory.createPropertyAssignment(typescript_1.default.factory.createIdentifier("path"), typescript_1.default.factory.createStringLiteral(`${relativeFilename}#${d.displayName}`)),
]))))));
}
/**
@@ -180,15 +187,15 @@ function insertDocgenIntoGlobalCollection(d, docgenCollectionName, relativeFilen
* @param options Generator options.
*/
function setComponentDocGen(d, options) {
- return insertTsIgnoreBeforeStatement(typescript_1.default.createStatement(typescript_1.default.createBinary(
+ return insertTsIgnoreBeforeStatement(typescript_1.default.factory.createExpressionStatement(typescript_1.default.factory.createBinaryExpression(
// SimpleComponent.__docgenInfo
- typescript_1.default.createPropertyAccess(typescript_1.default.createIdentifier(d.displayName), typescript_1.default.createIdentifier("__docgenInfo")), typescript_1.default.SyntaxKind.EqualsToken, typescript_1.default.createObjectLiteral([
+ typescript_1.default.factory.createPropertyAccessExpression(typescript_1.default.factory.createIdentifier(d.displayName), typescript_1.default.factory.createIdentifier("__docgenInfo")), typescript_1.default.SyntaxKind.EqualsToken, typescript_1.default.factory.createObjectLiteralExpression([
// SimpleComponent.__docgenInfo.description
- typescript_1.default.createPropertyAssignment(typescript_1.default.createLiteral("description"), typescript_1.default.createLiteral(d.description)),
+ typescript_1.default.factory.createPropertyAssignment(typescript_1.default.factory.createStringLiteral("description"), typescript_1.default.factory.createStringLiteral(d.description)),
// SimpleComponent.__docgenInfo.displayName
- typescript_1.default.createPropertyAssignment(typescript_1.default.createLiteral("displayName"), typescript_1.default.createLiteral(d.displayName)),
+ typescript_1.default.factory.createPropertyAssignment(typescript_1.default.factory.createStringLiteral("displayName"), typescript_1.default.factory.createStringLiteral(d.displayName)),
// SimpleComponent.__docgenInfo.props
- typescript_1.default.createPropertyAssignment(typescript_1.default.createLiteral("props"), typescript_1.default.createObjectLiteral(Object.entries(d.props).map(([propName, prop]) => createPropDefinition(propName, prop, options)))),
+ typescript_1.default.factory.createPropertyAssignment(typescript_1.default.factory.createStringLiteral("props"), typescript_1.default.factory.createObjectLiteralExpression(Object.entries(d.props).map(([propName, prop]) => createPropDefinition(propName, prop, options)))),
]))));
}
function generateDocgenCodeBlock(options) {
@@ -196,7 +203,7 @@ function generateDocgenCodeBlock(options) {
const relativeFilename = path_1.default
.relative("./", path_1.default.resolve("./", options.filename))
.replace(/\\/g, "/");
- const wrapInTryStatement = (statements) => typescript_1.default.createTry(typescript_1.default.createBlock(statements, true), typescript_1.default.createCatchClause(typescript_1.default.createVariableDeclaration(typescript_1.default.createIdentifier("__react_docgen_typescript_loader_error")), typescript_1.default.createBlock([])), undefined);
+ const wrapInTryStatement = (statements) => typescript_1.default.factory.createTryStatement(typescript_1.default.factory.createBlock(statements, true), typescript_1.default.factory.createCatchClause(typescript_1.default.factory.createVariableDeclaration(typescript_1.default.factory.createIdentifier("__react_docgen_typescript_loader_error")), typescript_1.default.factory.createBlock([])), undefined);
const codeBlocks = options.componentDocs.map((d) => wrapInTryStatement([
options.setDisplayName ? setDisplayName(d) : null,
setComponentDocGen(d, options),
@@ -208,7 +215,7 @@ function generateDocgenCodeBlock(options) {
const printer = typescript_1.default.createPrinter({ newLine: typescript_1.default.NewLineKind.LineFeed });
const printNode = (sourceNode) => printer.printNode(typescript_1.default.EmitHint.Unspecified, sourceNode, sourceFile);
// Concat original source code with code from generated code blocks.
- const result = codeBlocks.reduce((acc, node) => `${acc}\n${printNode(node)}`,
+ const result = codeBlocks.reduce((acc, node) => `${acc}\n${printNode(node)}`,
// Use original source text rather than using printNode on the parsed form
// to prevent issue where literals are stripped within components.
// Ref: https:/strothj/react-docgen-typescript-loader/issues/7
Loading

0 comments on commit ed2847d

Please sign in to comment.