phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[MM-54321] Expose app name through the API correctly (#2813)

Browse Source
This commit is contained in:
Devin Binnie
2023-09-01 11:47:13 -04:00
committed by GitHub
parent 8bf7a59721
commit b36b40e017
5 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/preload/desktopAPI.js
View File

@@ -4,7 +4,7 @@
'use strict'; 'use strict';
import {ipcRenderer, contextBridge} from 'electron'; import {ipcRenderer, contextBridge, app} from 'electron';
import { import {
GET_LANGUAGE_INFORMATION, GET_LANGUAGE_INFORMATION,
@@ -110,6 +110,8 @@ contextBridge.exposeInMainWorld('mas', {
}); });
contextBridge.exposeInMainWorld('desktop', { contextBridge.exposeInMainWorld('desktop', {
getAppName: () => app.name,
quit: (reason, stack) => ipcRenderer.send(QUIT, reason, stack), quit: (reason, stack) => ipcRenderer.send(QUIT, reason, stack),
openAppMenu: () => ipcRenderer.send(OPEN_APP_MENU), openAppMenu: () => ipcRenderer.send(OPEN_APP_MENU),
closeServersDropdown: () => ipcRenderer.send(CLOSE_SERVERS_DROPDOWN), closeServersDropdown: () => ipcRenderer.send(CLOSE_SERVERS_DROPDOWN),

4
src/renderer/components/DownloadsDropdown/DownloadsDropdownItemFile.tsx
View File

@@ -7,8 +7,6 @@ import classNames from 'classnames';
import {useIntl} from 'react-intl'; import {useIntl} from 'react-intl';
import {app} from 'electron';
import FileSizeAndStatus from './FileSizeAndStatus'; import FileSizeAndStatus from './FileSizeAndStatus';
import ProgressBar from './ProgressBar'; import ProgressBar from './ProgressBar';
import ThreeDotButton from './ThreeDotButton'; import ThreeDotButton from './ThreeDotButton';
@@ -30,7 +28,7 @@ const DownloadsDropdownItemFile = ({item, activeItem}: OwnProps) => {
}; };
const itemFilename = item.type === 'update' ? const itemFilename = item.type === 'update' ?
translate.formatMessage({id: 'renderer.downloadsDropdown.Update.MattermostVersionX', defaultMessage: `{appName} version ${item.filename}`}, {version: item.filename, appName: app.name}) : translate.formatMessage({id: 'renderer.downloadsDropdown.Update.MattermostVersionX', defaultMessage: `{appName} version ${item.filename}`}, {version: item.filename, appName: window.desktop.getAppName()}) :
item.filename; item.filename;
return ( return (

4
src/renderer/components/DownloadsDropdown/Update/UpdateAvailable.tsx
View File

@@ -8,8 +8,6 @@ import {FormattedMessage} from 'react-intl';
import {Button} from 'react-bootstrap'; import {Button} from 'react-bootstrap';
import {app} from 'electron';
import Thumbnail from '../Thumbnail'; import Thumbnail from '../Thumbnail';
type OwnProps = { type OwnProps = {
@@ -38,7 +36,7 @@ const UpdateAvailable = ({item}: OwnProps) => {
defaultMessage={`A new version of the {appName} Desktop App (version ${item.filename}) is available to install.`} defaultMessage={`A new version of the {appName} Desktop App (version ${item.filename}) is available to install.`}
values={{ values={{
version: item.filename, version: item.filename,
appName: app.name, appName: window.desktop.getAppName(),
}} }}
/> />
</div> </div>

4
src/renderer/components/DownloadsDropdown/Update/UpdateDownloaded.tsx
View File

@@ -10,8 +10,6 @@ import {Button} from 'react-bootstrap';
import classNames from 'classnames'; import classNames from 'classnames';
import {app} from 'electron';
import Thumbnail from '../Thumbnail'; import Thumbnail from '../Thumbnail';
import FileSizeAndStatus from '../FileSizeAndStatus'; import FileSizeAndStatus from '../FileSizeAndStatus';
@@ -33,7 +31,7 @@ const UpdateAvailable = ({item}: OwnProps) => {
<Thumbnail item={item}/> <Thumbnail item={item}/>
<div className='DownloadsDropdown__File__Body__Details'> <div className='DownloadsDropdown__File__Body__Details'>
<div className='DownloadsDropdown__File__Body__Details__Filename'> <div className='DownloadsDropdown__File__Body__Details__Filename'>
{translate.formatMessage({id: 'renderer.downloadsDropdown.Update.MattermostVersionX', defaultMessage: `{appName} version ${item.filename}`}, {version: item.filename, appName: app.name})} {translate.formatMessage({id: 'renderer.downloadsDropdown.Update.MattermostVersionX', defaultMessage: `{appName} version ${item.filename}`}, {version: item.filename, appName: window.desktop.getAppName()})}
</div> </div>
<div <div
className={classNames('DownloadsDropdown__File__Body__Details__FileSizeAndStatus', { className={classNames('DownloadsDropdown__File__Body__Details__FileSizeAndStatus', {

2
src/types/window.ts
View File

@@ -31,6 +31,8 @@ declare global {
getThumbnailLocation: (location: string) => Promise<string>; getThumbnailLocation: (location: string) => Promise<string>;
}; };
desktop: { desktop: {
getAppName: () => string;
quit: (reason: string, stack: string) => void; quit: (reason: string, stack: string) => void;
openAppMenu: () => void; openAppMenu: () => void;
closeServersDropdown: () => void; closeServersDropdown: () => void;