Merge remote-tracking branch 'origin/develop' into fix/attachmentMargin

* origin/develop: (26 commits)
  [FIX] Thread Message Preview (#25709)
  [FIX] Bump meteor-node-stubs to version 1.2.3 (#25669)
  [IMPROVE] Refactor + unit tests for federation-v2 (#25680)
  [FIX] user status Offline misnamed as Invisible in Custom Status edit dropdown menu (#24796)
  Chore: Messages raw model rewrite to ts (#25761)
  Chore: migrate katex to ts (#25501)
  Chore: AutoTranslate contextualBar rewrite  (#25751)
  Chore: Replace AnnouncementModal in favor of GenericModal (#25752)
  Chore: Keyboard shortcuts contextualBar rewrite (#25753)
  Chore: Prune Messages contextualBar rewrite (#25757)
  Chore: add Ajv JSON Schema to api/v1 (#25601)
  Update package.json (#25755)
  Update CODEOWNERS
  Chore: remove duplicated NotFoundPage.js (#25749)
  Chore: command's endpoints (#25630)
  Chore: Fix incorrect checksum for agenda package (cause of breaking develop builds) (#25741)
  Chore: Remove duplicate checksumBehavior key from yarn file (#25730)
  [FIX] Custom emoji reaction size (#25393)
  Chore: Test for department screen (#25696)
  Chore: Taking out Blaze from routes with `MainLayout`  (#25697)
  ...

.github/CODEOWNERS

@@ -9,3 +9,4 @@
 /_templates/ @RocketChat/chat-engine
 /apps/meteor/client/ @RocketChat/frontend
 /apps/meteor/tests/ @RocketChat/chat-engine
+/apps/meteor/app/apps/ @RocketChat/apps

.github/workflows/build_and_test.yml

@@ -53,12 +53,6 @@ jobs:
       #   run: |
       #     npx package-lock-check
 
-      - name: Cache cypress
-        id: cache-cypress
-        uses: actions/cache@v2
-        with:
-          path: /home/runner/.cache/Cypress
-          key: ${{ runner.OS }}-cache-cypress-${{ hashFiles('**/package-lock.json', '.github/workflows/build_and_test.yml') }}
       - uses: c-hive/gha-yarn-cache@v2
       - name: Cache turbo
         id: cache-turbo
@@ -118,7 +112,6 @@ jobs:
           git version
 
       - name: yarn install
-        # if: steps.cache-nodemodules.outputs.cache-hit != 'true' || steps.cache-cypress.outputs.cache-hit != 'true'
         run: yarn
 
       - run: yarn lint
@@ -212,15 +205,6 @@ jobs:
 
       - uses: actions/checkout@v3
 
-      - name: Cache cypress
-        id: cache-cypress
-        uses: actions/cache@v2
-        with:
-          path: /home/runner/.cache/Cypress
-          key: ${{ runner.OS }}-cache-cypress-${{ hashFiles('**/package-lock.json', '.github/workflows/build_and_test.yml') }}
-          restore-keys: |
-            ${{ runner.os }}-cache-cypress-
-            ${{ runner.os }}-
       - uses: c-hive/gha-yarn-cache@v2
       - name: Cache turbo
         id: cache-turbo
@@ -256,17 +240,6 @@ jobs:
           Xvfb -screen 0 1024x768x24 :99 &
           for i in $(seq 1 5); do (docker exec mongo mongo rocketchat --eval 'db.dropDatabase()') && npm run testci -- --test=testapi && s=0 && break || s=$? && sleep 1; done; (exit $s)
 
-      - name: E2E Test UI (Legacy - Cypress)
-        env:
-          TEST_MODE: 'true'
-          MONGO_URL: mongodb://localhost:27017/rocketchat
-          MONGO_OPLOG_URL: mongodb://localhost:27017/local
-        run: |
-          cd ./apps/meteor
-          echo -e 'pcm.!default {\n type hw\n card 0\n}\n\nctl.!default {\n type hw\n card 0\n}' > ~/.asoundrc
-          Xvfb -screen 0 1024x768x24 :99 &
-          for i in $(seq 1 2); do (docker exec mongo mongo rocketchat --eval 'db.dropDatabase()') && npm run testci -- --test=testui && s=0 && break || s=$? && ([ ! -w tests/cypress/screenshots ] || mv tests/cypress/screenshots tests/cypress/screenshots-$i) && ([ ! -w tests/cypress/videos ] || mv tests/cypress/videos tests/cypress/videos-$i) && sleep 1; done; (exit $s)
-
       - name: E2E Test UI
         env:
           TEST_MODE: 'true'
@@ -285,20 +258,6 @@ jobs:
           name: playwright-test-trace
           path: ./apps/meteor/tests/e2e/test-failures*
 
-      - name: Store cypress test screenshots
-        uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: cypress-test-screenshots
-          path: ./apps/meteor/tests/cypress/screenshots*
-
-      - name: Store cypress test videos
-        uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: cypress-test-videos
-          path: ./apps/meteor/tests/cypress/videos*
-
   test-ee:
     runs-on: ubuntu-20.04
     needs: build
@@ -345,12 +304,6 @@ jobs:
 
       - uses: actions/checkout@v3
 
-      - name: Cache cypress
-        id: cache-cypress
-        uses: actions/cache@v2
-        with:
-          path: /home/runner/.cache/Cypress
-          key: ${{ runner.OS }}-cache-cypress-${{ hashFiles('**/package-lock.json', '.github/workflows/build_and_test.yml') }}
       - uses: c-hive/gha-yarn-cache@v2
       - name: Cache turbo
         id: cache-turbo
@@ -364,7 +317,6 @@ jobs:
             ${{ runner.os }}-
 
       - name: Yarn install
-        # if: steps.cache-nodemodules.outputs.cache-hit != 'true' || steps.cache-cypress.outputs.cache-hit != 'true'
         run: yarn
 
       - name: Build micro services
@@ -386,25 +338,6 @@ jobs:
 
           for i in $(seq 1 5); do (docker exec mongo mongo rocketchat --eval 'db.dropDatabase()') && npm run testci -- --enterprise --test=testapi && s=0 && break || s=$? && sleep 1; done; (exit $s)
 
-      - name: E2E Test UI (Legacy - Cypress)
-        env:
-          TEST_MODE: 'true'
-          MONGO_URL: mongodb://localhost:27017/rocketchat
-          MONGO_OPLOG_URL: mongodb://localhost:27017/local
-          ENTERPRISE_LICENSE: ${{ secrets.ENTERPRISE_LICENSE }}
-          TRANSPORTER: nats://localhost:4222
-          CYPRESS_BASE_URL: http://localhost:4000
-          CYPRESS_TEST_API_URL: http://localhost:4000
-          OVERWRITE_SETTING_Site_Url: http://localhost:4000
-          SKIP_PROCESS_EVENT_REGISTRATION: 'true'
-        run: |
-          echo -e 'pcm.!default {\n type hw\n card 0\n}\n\nctl.!default {\n type hw\n card 0\n}' > ~/.asoundrc
-          Xvfb -screen 0 1024x768x24 :99 &
-
-          cd ./apps/meteor/
-
-          for i in $(seq 1 2); do (docker exec mongo mongo rocketchat --eval 'db.dropDatabase()') && npm run testci -- --enterprise --test=testui && s=0 && break || s=$? && ([ ! -w tests/cypress/screenshots ] || mv tests/cypress/screenshots tests/cypress/screenshots-$i) && ([ ! -w tests/cypress/videos ] || mv tests/cypress/videos tests/cypress/videos-$i) && sleep 1; done; (exit $s)
-
       - name: Install Playwright
         run: |
           cd ./apps/meteor/
@@ -417,8 +350,7 @@ jobs:
           MONGO_OPLOG_URL: mongodb://localhost:27017/local
           ENTERPRISE_LICENSE: ${{ secrets.ENTERPRISE_LICENSE }}
           TRANSPORTER: nats://localhost:4222
-          CYPRESS_BASE_URL: http://localhost:4000
-          CYPRESS_TEST_API_URL: http://localhost:4000
+          TEST_API_URL: http://localhost:4000
           OVERWRITE_SETTING_Site_Url: http://localhost:4000
           SKIP_PROCESS_EVENT_REGISTRATION: 'true'
         run: |
@@ -436,19 +368,6 @@ jobs:
           name: ee-playwright-test-trace
           path: ./apps/meteor/tests/e2e/test-failures*
 
-      - name: Store cypress test screenshots
-        uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: ee-cypress-test-screenshots
-          path: ./apps/meteor/tests/cypress/screenshots*
-
-      - name: Store cypress test videos
-        uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: ee-cypress-test-videos
-          path: ./apps/meteor/tests/cypress/videos*
   #   notification:
   #     runs-on: ubuntu-20.04
   #     needs: test

.gitignore

@@ -41,4 +41,5 @@ yarn-error.log*
 !.yarn/sdks
 !.yarn/versions
 
-.nvmrc
+.nvmrc
+.idea/

.vscode/settings.json

@@ -10,5 +10,5 @@
 		}
 	],
 	"typescript.tsdk": "./node_modules/typescript/lib",
-	"cSpell.words": ["photoswipe"]
+	"cSpell.words": ["photoswipe", "tmid"]
 }

.yarnrc.yml

@@ -11,5 +11,3 @@ plugins:
     spec: '@yarnpkg/plugin-typescript'
 
 yarnPath: .yarn/releases/yarn-3.2.0.cjs
-
-checksumBehavior: 'update'

apps/meteor/.gitignore

@@ -78,8 +78,6 @@ tests/end-to-end/temporary_staged_test
 .screenshots
 /private/livechat
 /storybook-static
-/tests/cypress/screenshots
-/tests/cypress/videos
 /tests/e2e/test-failures
 coverage
 .nyc_output

apps/meteor/app/api/server/api.d.ts

@@ -98,7 +98,7 @@ type ActionThis<TMethod extends Method, TPathPattern extends PathPattern, TOptio
 	readonly request: Request;
 	/* @deprecated */
 	requestParams(): OperationParams<TMethod, TPathPattern>;
-	getLoggedInUser(): IUser | undefined;
+	getLoggedInUser(): TOptions extends { authRequired: true } ? IUser : IUser | undefined;
 	getPaginationItems(): {
 		readonly offset: number;
 		readonly count: number;