Merge remote-tracking branch 'matrix-react-sdk/verji-develop' into ve…

…rji-merge-react-sdk
element-hq · Dec 20, 2024 · 69543e8 · 69543e8
2 parents c2799a1 + 62d6dc7
commit 69543e8
Show file tree

Hide file tree

Showing 159 changed files with 28,347 additions and 943 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -7,3 +7,4 @@ test/end-to-end-tests/lib/
 src/component-index.js
 # Auto-generated file
 src/modules.ts
+src/components/structures/scripts/freshworks.js
diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml
@@ -1,5 +1,7 @@
+## VERJI WE MUST REVISIT THIS FILE MANUALLY IN PIPELINE / UNSURE WHAT IS NECESSARY TO KEEP
 name: Static Analysis
 on:
+    workflow_dispatch:
     pull_request: {}
     push:
         branches: [develop, master]
@@ -24,7 +26,6 @@ jobs:
         runs-on: ubuntu-24.04
         steps:
             - uses: actions/checkout@v4
-
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
@@ -38,6 +39,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
         permissions:
             pull-requests: read
@@ -53,6 +56,8 @@ jobs:
                 welcome_to_element
 
     rethemendex_lint:
+        # VERJI skip Rethemendex check by setting false
+        if: ${{false}}
         name: "Rethemendex Check"
         runs-on: ubuntu-24.04
         steps:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,3 +1,4 @@
+## VERJI NEEDS TO MANUALLY CHECK THIS ALONG WITH RUNNING ACTION
 name: Tests
 on:
     pull_request: {}

diff --git a/.github/workflows/verji-release-drafter.yml b/.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
diff --git a/jest.config.ts b/jest.config.ts
@@ -19,6 +19,7 @@ const config: Config = {
     globalSetup: "<rootDir>/test/globalSetup.ts",
     setupFiles: ["jest-canvas-mock", "web-streams-polyfill/polyfill"],
     setupFilesAfterEnv: ["<rootDir>/test/setupTests.ts"],
+    moduleFileExtensions: ["js", "jsx", "json", "ts", "tsx"],
     moduleNameMapper: {
         "\\.(css|scss|pcss)$": "<rootDir>/__mocks__/cssMock.js",
         "\\.(gif|png|ttf|woff2)$": "<rootDir>/__mocks__/imageMock.js",

diff --git a/package.json b/package.json
@@ -84,7 +84,7 @@
         "@formatjs/intl-segmenter": "^11.5.7",
         "@matrix-org/analytics-events": "^0.29.0",
         "@matrix-org/emojibase-bindings": "^1.3.3",
-        "@matrix-org/react-sdk-module-api": "^2.4.0",
+        "@matrix-org/react-sdk-module-api": "https://github.com/verji/matrix-react-sdk-module-api.git#verji-main",
         "@matrix-org/spec": "^1.7.0",
         "@sentry/browser": "^8.0.0",
         "@vector-im/compound-design-tokens": "^2.0.1",
@@ -142,6 +142,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.1",
         "tar-js": "^0.3.0",
@@ -205,9 +206,10 @@
         "@types/react-beautiful-dnd": "^13.0.0",
         "@types/react-dom": "18.3.1",
         "@types/react-transition-group": "^4.4.0",
-        "@types/sanitize-html": "2.13.0",
-        "@types/semver": "^7.5.8",
-        "@types/tar-js": "^0.3.5",
+        "@types/sanitize-html": "2.11.0",
+        "@types/sdp-transform": "^2.4.6",
+        "@types/seedrandom": "3.0.4",
+        "@types/tar-js": "^0.3.2",
         "@types/ua-parser-js": "^0.7.36",
         "@types/uuid": "^10.0.0",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
@@ -272,9 +274,7 @@
         "prettier": "3.4.2",
         "process": "^0.11.10",
         "raw-loader": "^4.0.2",
-        "rimraf": "^6.0.0",
-        "semver": "^7.5.2",
-        "source-map-loader": "^5.0.0",
+        "rimraf": "^5.0.0",
         "stylelint": "^16.1.0",
         "stylelint-config-standard": "^36.0.0",
         "stylelint-scss": "^6.0.0",

diff --git a/res/css/_components.pcss b/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";

diff --git a/res/css/structures/_HomePage.pcss b/res/css/structures/_HomePage.pcss
@@ -13,6 +13,7 @@ Please see LICENSE files in the repository root for full details.
     height: 100%;
     margin-left: auto;
     margin-right: auto;
+    max-height: 100%;
 }
 
 .mx_HomePage_default {

diff --git a/res/css/structures/_LeftPanel.pcss b/res/css/structures/_LeftPanel.pcss
@@ -140,6 +140,39 @@ Please see LICENSE files in the repository root for full details.
                 }
             }
 
+            .mx_LeftPanel_omButton,
+            .mx_LeftPanel_newsButton {
+                width: 32px;
+                height: 32px;
+                border-radius: 8px;
+                background-color: $panel-actions;
+                position: relative;
+                margin-left: 8px;
+                margin-top: 2px;
+                margin-bottom: 2px;
+
+                &::before {
+                    content: "";
+                    position: absolute;
+                    top: 8px;
+                    left: 8px;
+                    width: 16px;
+                    height: 16px;
+                    mask-position: center;
+                    mask-size: contain;
+                    mask-repeat: no-repeat;
+                    background-color: $secondary-content;
+                }
+
+                &:hover {
+                    background-color: $tertiary-content;
+
+                    &::before {
+                        background-color: $background;
+                    }
+                }
+            }
+
             .mx_LeftPanel_exploreButton,
             .mx_LeftPanel_recentsButton {
                 width: 32px;
@@ -171,6 +204,15 @@ Please see LICENSE files in the repository root for full details.
                 }
             }
 
+            //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");
             }

diff --git a/res/css/structures/_MiscHeader.scss b/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;
+}
diff --git a/res/css/structures/_RightPanel.pcss b/res/css/structures/_RightPanel.pcss
@@ -39,6 +39,10 @@ Please see LICENSE files in the repository root for full details.
     mask-image: url("@vector-im/compound-design-tokens/icons/info-solid.svg");
     mask-position: center;
 }
+.mx_RightPanel_supportButton::before {
+    mask-image: url("$(res)/img/element-icons/settings/help.svg");
+    mask-position: center;
+}
 
 .mx_RightPanel_pinnedMessagesButton {
     &::before {

diff --git a/res/css/structures/_RoomView.pcss b/res/css/structures/_RoomView.pcss
@@ -154,6 +154,32 @@ Please see LICENSE files in the repository root for full details.
     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 */

diff --git a/res/css/structures/_UserMenu.pcss b/res/css/structures/_UserMenu.pcss
@@ -185,8 +185,91 @@ Please see LICENSE files in the repository root for full details.
     .mx_UserMenu_iconSignOut::before {
         mask-image: url("@vector-im/compound-design-tokens/icons/leave.svg");
     }
-
     .mx_UserMenu_iconQr::before {
         mask-image: url("@vector-im/compound-design-tokens/icons/qr-code.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 {
+    margin: 0 12px 8px;
+
+    .mx_UserMenu_CustomStatusSection_field {
+        position: relative;
+        display: flex;
+
+        &.mx_UserMenu_CustomStatusSection_field_hasQuery {
+            .mx_UserMenu_CustomStatusSection_clear {
+                display: block;
+            }
+        }
+
+        > .mx_UserMenu_CustomStatusSection_input {
+            border: 1px solid $accent;
+            border-radius: 8px;
+            width: 100%;
+
+            &:focus + .mx_UserMenu_CustomStatusSection_clear {
+                display: block;
+            }
+        }
+
+        > .mx_UserMenu_CustomStatusSection_clear {
+            display: none;
+
+            position: absolute;
+            top: 50%;
+            right: 0;
+            transform: translateY(-50%);
+
+            width: 16px;
+            height: 16px;
+            margin-right: 8px;
+            background-color: $quinary-content;
+            border-radius: 50%;
+
+            &::before {
+                content: "";
+                position: absolute;
+                width: inherit;
+                height: inherit;
+                mask-image: url("$(res)/img/feather-customised/x.svg");
+                mask-position: center;
+                mask-size: 12px;
+                mask-repeat: no-repeat;
+                background-color: $secondary-content;
+            }
+        }
+    }
+
+    > p {
+        font-size: $font-12px;
+        line-height: $font-15px;
+        color: $secondary-content;
+        margin: 4px 0;
+    }
+
+    .mx_AccessibleButton_kind_primary_outline {
+        display: block;
+    }
 }