matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-08-06 16:22:46 +03:00
Code Activity

Add Windows 64-bit arm link and remove 32-bit link on compatibility page (#29312)

Browse Source 
* Add Windows 64-bit arm link and remove 32-bit link on compatibility page

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update snapshots

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski
2025-02-19 16:17:56 +00:00
committed by GitHub
parent 8857c07acb
commit e47d7aaaff
8 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/config.md
View File

@@ -163,14 +163,14 @@ These two options describe the various availability for the application. When th
such as trying to get the user to use an Android app or the desktop app for encrypted search, the config options will be looked such as trying to get the user to use an Android app or the desktop app for encrypted search, the config options will be looked
at to see if the link should be to somewhere else. at to see if the link should be to somewhere else.
Starting with `desktop_builds`, the following subproperties are available: Starting with `desktop_builds`, the following sub-properties are available:
1. `available`: Required. When `true`, the desktop app can be downloaded from somewhere. 1. `available`: Required. When `true`, the desktop app can be downloaded from somewhere.
2. `logo`: Required. A URL to a logo (SVG), intended to be shown at 24x24 pixels. 2. `logo`: Required. A URL to a logo (SVG), intended to be shown at 24x24 pixels.
3. `url`: Required. The download URL for the app. This is used as a hyperlink. 3. `url`: Required. The download URL for the app. This is used as a hyperlink.
4. `url_macos`: Optional. Direct link to download macOS desktop app. 4. `url_macos`: Optional. Direct link to download macOS desktop app.
5. `url_win32`: Optional. Direct link to download Windows 32-bit desktop app. 5. `url_win64`: Optional. Direct link to download Windows x86 64-bit desktop app.
6. `url_win64`: Optional. Direct link to download Windows 64-bit desktop app. 6. `url_win64arm`: Optional. Direct link to download Windows ARM 64-bit desktop app.
7. `url_linux`: Optional. Direct link to download Linux desktop app. 7. `url_linux`: Optional. Direct link to download Linux desktop app.
When `desktop_builds` is not specified at all, the app will assume desktop downloads are available from https://element.io When `desktop_builds` is not specified at all, the app will assume desktop downloads are available from https://element.io

BIN
playwright/snapshots/app-loading/feature-detection.spec.ts/unsupported-browser-CompatibilityView-linux.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 226 KiB

After

Width:  |  Height:  |  Size: 227 KiB

2
src/IConfigOptions.ts
View File

@@ -71,7 +71,7 @@ export interface IConfigOptions {
url: string; // download url url: string; // download url
url_macos?: string; url_macos?: string;
url_win64?: string; url_win64?: string;
url_win32?: string; url_win64arm?: string;
url_linux?: string; url_linux?: string;
}; };
mobile_builds: { mobile_builds: {

2
src/SdkConfig.ts
View File

@@ -59,7 +59,7 @@ export const DEFAULTS: DeepReadonly<IConfigOptions> = {
url: "https://element.io/download", url: "https://element.io/download",
url_macos: "https://packages.element.io/desktop/install/macos/Element.dmg", url_macos: "https://packages.element.io/desktop/install/macos/Element.dmg",
url_win64: "https://packages.element.io/desktop/install/win32/x64/Element%20Setup.exe", url_win64: "https://packages.element.io/desktop/install/win32/x64/Element%20Setup.exe",
url_win32: "https://packages.element.io/desktop/install/win32/ia32/Element%20Setup.exe", url_win64arm: "https://packages.element.io/desktop/install/win32/arm64/Element%20Setup.exe",
url_linux: "https://element.io/download#linux", url_linux: "https://element.io/download#linux",
}, },
mobile_builds: { mobile_builds: {

16
src/async-components/structures/ErrorView.tsx
View File

@@ -80,9 +80,9 @@ const MobileAppLinks: React.FC<{
const DesktopAppLinks: React.FC<{ const DesktopAppLinks: React.FC<{
macOsUrl?: string; macOsUrl?: string;
win64Url?: string; win64Url?: string;
win32Url?: string; win64ArmUrl?: string;
linuxUrl?: string; linuxUrl?: string;
}> = ({ macOsUrl, win64Url, win32Url, linuxUrl }) => { }> = ({ macOsUrl, win64Url, win64ArmUrl, linuxUrl }) => {
return ( return (
<Flex gap="var(--cpd-space-4x)"> <Flex gap="var(--cpd-space-4x)">
{macOsUrl && ( {macOsUrl && (
@@ -92,12 +92,12 @@ const DesktopAppLinks: React.FC<{
)} )}
{win64Url && ( {win64Url && (
<Button as="a" href={win64Url} kind="secondary" Icon={MicrosoftIcon}> <Button as="a" href={win64Url} kind="secondary" Icon={MicrosoftIcon}>
{_t("incompatible_browser|windows", { bits: "64" })} {_t("incompatible_browser|windows_64bit")}
</Button> </Button>
)} )}
{win32Url && ( {win64ArmUrl && (
<Button as="a" href={win32Url} kind="secondary" Icon={MicrosoftIcon}> <Button as="a" href={win64ArmUrl} kind="secondary" Icon={MicrosoftIcon}>
{_t("incompatible_browser|windows", { bits: "32" })} {_t("incompatible_browser|windows_arm_64bit")}
</Button> </Button>
)} )}
{linuxUrl && ( {linuxUrl && (
@@ -127,7 +127,7 @@ export const UnsupportedBrowserView: React.FC<{
config.desktop_builds?.available && config.desktop_builds?.available &&
(config.desktop_builds?.url_macos || (config.desktop_builds?.url_macos ||
config.desktop_builds?.url_win64 || config.desktop_builds?.url_win64 ||
config.desktop_builds?.url_win32 || config.desktop_builds?.url_win64arm ||
config.desktop_builds?.url_linux); config.desktop_builds?.url_linux);
const hasMobileBuilds = Boolean( const hasMobileBuilds = Boolean(
config.mobile_builds?.ios || config.mobile_builds?.android || config.mobile_builds?.fdroid, config.mobile_builds?.ios || config.mobile_builds?.android || config.mobile_builds?.fdroid,
@@ -157,7 +157,7 @@ export const UnsupportedBrowserView: React.FC<{
<DesktopAppLinks <DesktopAppLinks
macOsUrl={config.desktop_builds?.url_macos} macOsUrl={config.desktop_builds?.url_macos}
win64Url={config.desktop_builds?.url_win64} win64Url={config.desktop_builds?.url_win64}
win32Url={config.desktop_builds?.url_win32} win64ArmUrl={config.desktop_builds?.url_win64arm}
linuxUrl={config.desktop_builds?.url_linux} linuxUrl={config.desktop_builds?.url_linux}
/> />
</> </>

3
src/i18n/strings/en_EN.json
View File

@@ -1286,7 +1286,8 @@
"use_desktop_heading": "Use %(brand)s Desktop instead", "use_desktop_heading": "Use %(brand)s Desktop instead",
"use_mobile_heading": "Use %(brand)s on mobile instead", "use_mobile_heading": "Use %(brand)s on mobile instead",
"use_mobile_heading_after_desktop": "Or use our mobile app", "use_mobile_heading_after_desktop": "Or use our mobile app",
"windows": "Windows (%(bits)s-bit)" "windows_64bit": "Windows (64-bit)",
"windows_arm_64bit": "Windows (ARM 64-bit)"
}, },
"info_tooltip_title": "Information", "info_tooltip_title": "Information",
"integration_manager": { "integration_manager": {

4
test/unit-tests/async-components/structures/__snapshots__/ErrorView-test.tsx.snap
View File

@@ -176,7 +176,7 @@ exports[`<UnsupportedBrowserView /> should match snapshot 1`] = `
class="_button_i91xf_17 _has-icon_i91xf_66" class="_button_i91xf_17 _has-icon_i91xf_66"
data-kind="secondary" data-kind="secondary"
data-size="lg" data-size="lg"
href="https://packages.element.io/desktop/install/win32/ia32/Element%20Setup.exe" href="https://packages.element.io/desktop/install/win32/arm64/Element%20Setup.exe"
role="link" role="link"
tabindex="0" tabindex="0"
> >
@@ -185,7 +185,7 @@ exports[`<UnsupportedBrowserView /> should match snapshot 1`] = `
height="20" height="20"
width="20" width="20"
/> />
Windows (32-bit) Windows (ARM 64-bit)
</a> </a>
<a <a
class="_button_i91xf_17 _has-icon_i91xf_66" class="_button_i91xf_17 _has-icon_i91xf_66"

4
test/unit-tests/vector/__snapshots__/init-test.ts.snap
View File

@@ -189,7 +189,7 @@ exports[`showIncompatibleBrowser should match snapshot 1`] = `
class="_button_i91xf_17 _has-icon_i91xf_66" class="_button_i91xf_17 _has-icon_i91xf_66"
data-kind="secondary" data-kind="secondary"
data-size="lg" data-size="lg"
href="https://packages.element.io/desktop/install/win32/ia32/Element%20Setup.exe" href="https://packages.element.io/desktop/install/win32/arm64/Element%20Setup.exe"
role="link" role="link"
tabindex="0" tabindex="0"
> >
@@ -198,7 +198,7 @@ exports[`showIncompatibleBrowser should match snapshot 1`] = `
height="20" height="20"
width="20" width="20"
/> />
Windows (32-bit) Windows (ARM 64-bit)
</a> </a>
<a <a
class="_button_i91xf_17 _has-icon_i91xf_66" class="_button_i91xf_17 _has-icon_i91xf_66"