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

…-sdk into rm/1995-invite-dialog
verji · Aug 22, 2024 · 1d0aa67 · 1d0aa67
2 parents 8c5f697 + 665df7a
commit 1d0aa67
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 22 deletions.
diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml
@@ -86,7 +86,8 @@ jobs:
 
     i18n_lint:
         name: "i18n Check"
-        if: ${{ github.ref_name != 'verji-develop' }}
+        # VERJI skip i18n by setting false
+        if: ${{false}}
         uses: matrix-org/matrix-web-i18n/.github/workflows/i18n_check.yml@main
         with:
             hardcoded-words: "Element"

diff --git a/README.md b/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
diff --git a/scripts/ci/install-deps.sh b/scripts/ci/install-deps.sh
@@ -9,23 +9,36 @@
 
 set -ex
 
-scripts/fetchdep.sh matrix-org matrix-js-sdk develop
+scripts/fetchdep.sh verji matrix-js-sdk verji-develop # VERJI HARDCODE PARAMS
 pushd matrix-js-sdk
 [ -n "$JS_SDK_GITHUB_BASE_REF" ] && git fetch --depth 1 origin $JS_SDK_GITHUB_BASE_REF && git checkout $JS_SDK_GITHUB_BASE_REF
 yarn link
 yarn install --frozen-lockfile $@
 popd
 
-scripts/fetchdep.sh matrix-org matrix-analytics-events
+#VERJI COMMENT remove matrix-analytics-event
+#scripts/fetchdep.sh matrix-org matrix-analytics-events
 # We don't pass a default branch so cloning may fail when we are not in a PR
 # This is expected as this project does not share a release cycle but we still branch match it
-if [ -d matrix-analytics-events ]; then
-    pushd matrix-analytics-events
-    yarn link
-    yarn install --frozen-lockfile $@
-    yarn build:ts
-    popd
-fi
+#if [ -d matrix-analytics-events ]; then
+#    pushd matrix-analytics-events
+#    yarn link
+#    yarn install --frozen-lockfile $@
+#    yarn build:ts
+#    popd
+#fi
+# END VERJI COMMENT
+
+# VERJI ADD custom module-api
+scripts/fetchdep.sh verji matrix-react-sdk-module-api verji-main # VERJI HARDCODE PARAMS
+pushd matrix-react-sdk-module-api
+yarn link
+yarn install ## TRY WITHOUT FROZEN --frozen-lockfile $@
+yarn build
+popd
+
+yarn link @matrix-org/react-sdk-module-api
+# VERJI END - custom module-api
 
 yarn link matrix-js-sdk
 [ -d matrix-analytics-events ] && yarn link @matrix-org/analytics-events

diff --git a/scripts/ci/layered.sh b/scripts/ci/layered.sh
@@ -14,24 +14,25 @@ set -ex
 # for the primary repo (react-sdk in this case).
 
 # Set up the js-sdk first
-scripts/fetchdep.sh matrix-org matrix-js-sdk develop
+scripts/fetchdep.sh verji matrix-js-sdk verji-develop
 pushd matrix-js-sdk
 [ -n "$JS_SDK_GITHUB_BASE_REF" ] && git fetch --depth 1 origin $JS_SDK_GITHUB_BASE_REF && git checkout $JS_SDK_GITHUB_BASE_REF
 yarn link
 yarn install --frozen-lockfile
 popd
 
+# VERJI COMMENT OUT
 # Also set up matrix-analytics-events for branch with matching name
-scripts/fetchdep.sh matrix-org matrix-analytics-events
+#scripts/fetchdep.sh matrix-org matrix-analytics-events
 # We don't pass a default branch so cloning may fail when we are not in a PR
 # This is expected as this project does not share a release cycle but we still branch match it
-if [ -d matrix-analytics-events ]; then
-    pushd matrix-analytics-events
-    yarn link
-    yarn install --frozen-lockfile
-    yarn build:ts
-    popd
-fi
+# if [ -d matrix-analytics-events ]; then
+#     pushd matrix-analytics-events
+#     yarn link
+#     yarn install --frozen-lockfile
+#     yarn build:ts
+#     popd
+# fi
 
 # Now set up the react-sdk
 yarn link matrix-js-sdk
@@ -40,7 +41,7 @@ yarn link
 yarn install --frozen-lockfile
 
 # Finally, set up element-web
-scripts/fetchdep.sh vector-im element-web develop
+scripts/fetchdep.sh verji element-web verji-develop
 pushd element-web
 [ -n "$ELEMENT_WEB_GITHUB_BASE_REF" ] && git fetch --depth 1 origin $ELEMENT_WEB_GITHUB_BASE_REF && git checkout $ELEMENT_WEB_GITHUB_BASE_REF
 yarn link matrix-js-sdk

diff --git a/src/components/views/dialogs/InviteDialog.tsx b/src/components/views/dialogs/InviteDialog.tsx
@@ -431,6 +431,7 @@ export default class InviteDialog extends React.PureComponent<Props, IInviteDial
     private spaceMemberIds = [] as string[];
     // Verji End
 
+
     public constructor(props: Props) {
         super(props);
         // Verji Start - generate a list of userId's which are members in currently active space

diff --git a/test/components/structures/ViewSource-test.tsx b/test/components/structures/ViewSource-test.tsx
@@ -57,8 +57,8 @@ describe("ViewSource", () => {
 
         expect(() => render(<ViewSource mxEvent={redactedMessageEvent} onFinished={() => {}} />)).not.toThrow();
     });
-
-    it("should show edit button if we are the sender and can post an edit", () => {
+    // VERJI SKIP this test because we have disabled the "edit" option
+    it.skip("should show edit button if we are the sender and can post an edit", () => {
         const event = mkMessage({
             msg: "Test",
             user: MatrixClientPeg.get()!.getSafeUserId(),