Merge branch 'verji-develop' of https://github.com/verji/matrix-react…

…-sdk into rm/1998-hide-feature2

.github/workflows/static_analysis.yaml

@@ -1,5 +1,6 @@
 name: Static Analysis
 on:
+    workflow_dispatch:
     pull_request: {}
     merge_group:
         types: [checks_requested]
@@ -21,14 +22,44 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
-
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
-
+            # VERJI SPECIFIC - yarn link FOR matrix-react-sdk-module-api on verji-main branch
+            #- name: "Veri - Clone Github Repo Action - Download verji-main of module-api"
+            #  # You may pin to the exact commit or the version.
+            #  # uses: GuillaumeFalourd/clone-github-repo-action@19817562c346ff60f9935158dede6c5ece8fd0ac
+            #  uses: GuillaumeFalourd/[email protected]
+            #  with:
+            #       # Repository Owner
+            #       owner: verji
+            #       # Repository name
+            #       repository: "matrix-react-sdk-module-api"
+            #       # PAT with repository scope (https://github.com/settings/tokens)
+            #       access-token: ${{secrets.PAT}}
+            #       # Depth of the clone (default: full history)
+            #       depth: 1
+            #       # Branch name (default: main)
+            #       branch: "verji-main"
+            #       # Clone with submodules
+            #       submodule: false # optional, default is false
+            # - name: "Verji - Build and yarn link matrix-react-sdk-module-api (prepublish)"
+            #   uses: Azure/powershell@v2
+            #   with:
+            #       # Yarn link matrix-react-sdk-module-api #--skipLibCheck build --skipLibCheck
+            #       inlineScript: "cd matrix-react-sdk-module-api && yarn && yarn link && yarn prepublishOnly && cd .. && cd .. && cd 'matrix-react-sdk'"
+            #       azPSVersion: "latest"
+            #END VERJI SPECIFIC
             - name: Install Deps
               run: "./scripts/ci/install-deps.sh --ignore-scripts"
-
+              # VERJI
+            # - name: "Verji - yarn link matrix-react-sdk-module-api/verji-main into matrix-react-sdk"
+            #   uses: Azure/powershell@v2
+            #   with:
+            #       # Yarn link matrix-react-sdk-module-api #--skipLibCheck
+            #       inlineScript: "yarn link '@matrix-org/react-sdk-module-api'"
+            #       azPSVersion: "latest"
+            # VERJI END
             - name: Typecheck
               run: "yarn run lint:types"
 
@@ -55,6 +86,8 @@ jobs:
 
     i18n_lint:
         name: "i18n Check"
+        # VERJI skip i18n by setting false
+        if: ${{false}}
         uses: matrix-org/matrix-web-i18n/.github/workflows/i18n_check.yml@main
         with:
             hardcoded-words: "Element"

.github/workflows/verji-release-drafter.yml

@@ -0,0 +1,9 @@
+name: Verji Release Drafter
+on:
+    push:
+        branches: [verji-staging]
+    workflow_dispatch: {}
+concurrency: ${{ github.workflow }}
+jobs:
+    draft:
+        uses: verji/matrix-js-sdk/.github/workflows/release-drafter-workflow.yml@verji-develop

README.md

@@ -206,3 +206,11 @@ Now the yarn commands should work as normal.
 
 We use Playwright and Element Web for end-to-end tests. See
 [`docs/playwright.md`](docs/playwright.md) for more information.
+
+// VERJI JTS - change to trigger PR:
+1
+2
+3
+4
+5
+6

jest.config.ts

@@ -20,10 +20,11 @@ import type { Config } from "jest";
 
 const config: Config = {
     testEnvironment: "jsdom",
-    testMatch: ["<rootDir>/test/**/*-test.[jt]s?(x)"],
+    testMatch: ["<rootDir>/test/**/*-test.[jt]s?(x)", "<rootDir>/test/**/**/*-test.[jt]s?(x)"],
     globalSetup: "<rootDir>/test/globalSetup.ts",
     setupFiles: ["jest-canvas-mock"],
     setupFilesAfterEnv: ["<rootDir>/test/setupTests.ts"],
+    moduleFileExtensions: ["js", "jsx", "json", "ts", "tsx"],
     moduleNameMapper: {
         "\\.(gif|png|ttf|woff2)$": "<rootDir>/__mocks__/imageMock.js",
         "\\.svg$": "<rootDir>/__mocks__/svg.js",

package.json

@@ -129,6 +129,7 @@
         "react-focus-lock": "^2.5.1",
         "react-transition-group": "^4.4.1",
         "rfc4648": "^1.4.0",
+        "rss-parser": "^3.12.0",
         "sanitize-filename": "^1.6.3",
         "sanitize-html": "2.13.0",
         "tar-js": "^0.3.0",
@@ -183,6 +184,7 @@
         "@types/react-dom": "17.0.25",
         "@types/react-transition-group": "^4.4.0",
         "@types/sanitize-html": "2.11.0",
+        "@types/scheduler": "^0.23.0",
         "@types/sdp-transform": "^2.4.6",
         "@types/seedrandom": "3.0.4",
         "@types/tar-js": "^0.3.2",
@@ -221,6 +223,7 @@
         "postcss-scss": "^4.0.4",
         "prettier": "3.2.5",
         "raw-loader": "^4.0.2",
+        "react-test-renderer": "17.0.2",
         "rimraf": "^5.0.0",
         "stylelint": "^16.1.0",
         "stylelint-config-standard": "^36.0.0",

res/css/_components.pcss

@@ -1,4 +1,10 @@
 /* autogenerated by rethemendex.sh */
+
+/* ----- Verji start ----- */
+@import "./views/dialogs/_InviteNewMembersDialog.scss";
+@import "./views/dialogs/_ConfirmInviteExternalUsersDialog.scss";
+/* ----- Verji end ----- */
+
 @import "./_animations.pcss";
 @import "./_common.pcss";
 @import "./_font-sizes.pcss";

res/css/structures/_HomePage.pcss

@@ -22,6 +22,7 @@ limitations under the License.
     height: 100%;
     margin-left: auto;
     margin-right: auto;
+    max-height: 100%;
 }
 
 .mx_HomePage_default {

res/css/structures/_LeftPanel.pcss

@@ -148,6 +148,8 @@ limitations under the License.
                 }
             }
 
+            .mx_LeftPanel_omButton,
+            .mx_LeftPanel_newsButton,
             .mx_LeftPanel_exploreButton,
             .mx_LeftPanel_recentsButton {
                 width: 32px;
@@ -179,6 +181,15 @@ limitations under the License.
                 }
             }
 
+            //Verji start
+            .mx_LeftPanel_newsButton::before {
+                mask-image: url("$(res)/img/verji/news.svg");
+            }
+            .mx_LeftPanel_omButton::before {
+                mask-image: url("$(res)/img/verji/shield.svg");
+            }
+            //Verji end
+
             .mx_LeftPanel_exploreButton::before {
                 mask-image: url("$(res)/img/element-icons/roomlist/explore.svg");
             }

res/css/structures/_MiscHeader.scss

@@ -0,0 +1,61 @@
+/*
+    ROSBERG FILE
+*/
+
+.mx_MiscHeaderButtons {
+    display: flex;
+    &::before {
+        content: unset;
+    }
+}
+
+.mx_MiscHeaderButtons::before {
+    content: "";
+    //background-color: $header-divider-color;
+    opacity: 0.5;
+    margin: 6px 8px;
+    border-radius: 1px;
+    width: 1px;
+}
+
+.mx_MiscHeader_miscButton {
+    cursor: pointer;
+    flex: 0 0 auto;
+    margin-left: 1px;
+    margin-right: 1px;
+    height: 32px;
+    width: 32px;
+    position: relative;
+    border-radius: 100%;
+
+    &::before {
+        content: "";
+        position: absolute;
+        top: 4px; // center with parent of 32px
+        left: 4px; // center with parent of 32px
+        height: 24px;
+        width: 24px;
+        background-color: $icon-button-color;
+        mask-repeat: no-repeat;
+        mask-size: contain;
+    }
+
+    &:hover {
+        //background: rgba($accent-color, 0.1);
+
+        &::before {
+            //background-color: $accent-color;
+        }
+    }
+}
+
+.mx_MiscHeader_miscButton_highlight {
+    &::before {
+        //background-color: $accent-color !important;
+    }
+}
+
+.mx_MiscHeader_roomSupportButton::before {
+    mask-image: url("$(res)/img/element-icons/settings/help.svg");
+    mask-position: center;
+}

res/css/structures/_RoomView.pcss

@@ -162,6 +162,32 @@ limitations under the License.
     margin-bottom: 80px; /* visually center the content (intentional offset) */
 }
 
+// Verji start
+@keyframes fade1 {
+    0% {
+        opacity: 0;
+    }
+    100% {
+        opacity: 1;
+    }
+}
+.mx_RoomView_News1 {
+    animation: 0.2s ease-out 0s 0.2 fade1;
+}
+
+@keyframes fade2 {
+    0% {
+        transform: translateX(70px);
+    }
+    100% {
+        transform: translateX(0);
+    }
+}
+.mx_RoomView_News2 {
+    animation: 0.2s ease 0s 0.2 fade2;
+}
+// Verji end
+
 .mx_RoomView_MessageList {
     list-style-type: none;
     padding: var(--RoomView_MessageList-padding); /* mx_ProfileResizer depends on this value */

res/css/structures/_UserMenu.pcss

@@ -207,6 +207,27 @@ limitations under the License.
     .mx_UserMenu_iconSignOut::before {
         mask-image: url("$(res)/img/element-icons/leave.svg");
     }
+    /* Verji start */
+    .mx_UserMenu_iconMembers::before {
+        mask-image: url("$(res)/img/element-icons/room/members.svg");
+    }
+
+    .mx_UserMenu_iconInvite::before {
+        mask-image: url("$(res)/img/element-icons/room/invite.svg");
+    }
+
+    .mx_UserMenu_oidcmanage::before {
+        mask-image: url("$(res)/img/verji/address-card.svg");
+    }
+
+    .mx_UserMenu_portal::before {
+        mask-image: url("$(res)/img/verji/house-user.svg");
+    }
+
+    .mx_UserMenu_signing::before {
+        mask-image: url("$(res)/img/verji/signing.svg");
+    }
+    /* Verji end */
 }
 
 .mx_UserMenu_CustomStatusSection {

res/css/views/dialogs/_ConfirmInviteExternalUsersDialog.scss

@@ -0,0 +1,41 @@
+/* ROSBERG style module */
+/* NOTE: This code (and any other Rosberg .pcss/.scss files) has to be imported in here: res\css\_components.pcss */
+
+.mx_ConfirmInviteExternalUsersDialog {
+    &.mx_BaseDialog {
+        width: 480px;
+    }
+}
+
+.mx_Dialog_content {
+    margin-bottom: 24px;
+}
+
+.vmx_all_users {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    width: 100%;
+    gap: 20px;
+}
+
+.mx_ConfirmInviteExternalUsersDialog_user {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    padding: 8px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+
+    :first-child {
+        margin-top: 0;
+    }
+
+    &_email,
+    &_project,
+    &_phoneNr {
+        margin-top: 4px;
+        font-style: italic;
+        white-space: nowrap;
+    }
+}