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

[MM-54591] Use getVersion endpoint to report app name (#2862)

Browse Source
This commit is contained in:
Devin Binnie
2023-09-29 11:16:29 -04:00
committed by GitHub
parent 2a88175b09
commit 8281bbbb37
8 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/renderer/components/DownloadsDropdown/DownloadsDropdownItem.tsx
View File

@@ -10,17 +10,24 @@ import UpdateWrapper from './Update/UpdateWrapper';
type OwnProps = {
activeItem?: DownloadedItem;
item: DownloadedItem;
appName: string;
}
const DownloadsDropdownItem = ({item, activeItem}: OwnProps) => {
const DownloadsDropdownItem = ({item, activeItem, appName}: OwnProps) => {
if (item.type === 'update' && item.state !== 'progressing') {
return <UpdateWrapper item={item}/>;
return (
<UpdateWrapper
item={item}
appName={appName}
/>
);
}
return (
<DownloadsDropdownItemFile
item={item}
activeItem={activeItem}
appName={appName}
/>
);
};

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

@@ -15,9 +15,10 @@ import Thumbnail from './Thumbnail';
type OwnProps = {
activeItem?: DownloadedItem;
item: DownloadedItem;
appName: string;
}
const DownloadsDropdownItemFile = ({item, activeItem}: OwnProps) => {
const DownloadsDropdownItemFile = ({item, activeItem, appName}: OwnProps) => {
const [threeDotButtonVisible, setThreeDotButtonVisible] = useState(false);
const translate = useIntl();
@@ -28,7 +29,7 @@ const DownloadsDropdownItemFile = ({item, activeItem}: OwnProps) => {
};
const itemFilename = item.type === 'update' ?
translate.formatMessage({id: 'renderer.downloadsDropdown.Update.MattermostVersionX', defaultMessage: `{appName} version ${item.filename}`}, {version: item.filename, appName: window.desktop.getAppName()}) :
translate.formatMessage({id: 'renderer.downloadsDropdown.Update.MattermostVersionX', defaultMessage: `{appName} version ${item.filename}`}, {version: item.filename, appName}) :
item.filename;
return (

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

@@ -12,9 +12,10 @@ import Thumbnail from '../Thumbnail';
type OwnProps = {
item: DownloadedItem;
appName: string;
}
const UpdateAvailable = ({item}: OwnProps) => {
const UpdateAvailable = ({item, appName}: OwnProps) => {
const onButtonClick = (e: React.MouseEvent<HTMLButtonElement>) => {
e?.preventDefault?.();
window.desktop.downloadsDropdown.startUpdateDownload();
@@ -36,7 +37,7 @@ const UpdateAvailable = ({item}: OwnProps) => {
defaultMessage={`A new version of the {appName} Desktop App (version ${item.filename}) is available to install.`}
values={{
version: item.filename,
appName: window.desktop.getAppName(),
appName,
}}
/>
</div>

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

@@ -15,9 +15,10 @@ import FileSizeAndStatus from '../FileSizeAndStatus';
type OwnProps = {
item: DownloadedItem;
appName: string;
}
const UpdateAvailable = ({item}: OwnProps) => {
const UpdateAvailable = ({item, appName}: OwnProps) => {
const translate = useIntl();
const onButtonClick = (e: React.MouseEvent<HTMLButtonElement>) => {
@@ -31,7 +32,7 @@ const UpdateAvailable = ({item}: OwnProps) => {
<Thumbnail item={item}/>
<div className='DownloadsDropdown__File__Body__Details'>
<div className='DownloadsDropdown__File__Body__Details__Filename'>
{translate.formatMessage({id: 'renderer.downloadsDropdown.Update.MattermostVersionX', defaultMessage: `{appName} version ${item.filename}`}, {version: item.filename, appName: window.desktop.getAppName()})}
{translate.formatMessage({id: 'renderer.downloadsDropdown.Update.MattermostVersionX', defaultMessage: `{appName} version ${item.filename}`}, {version: item.filename, appName})}
</div>
<div
className={classNames('DownloadsDropdown__File__Body__Details__FileSizeAndStatus', {

17
src/renderer/components/DownloadsDropdown/Update/UpdateWrapper.tsx
View File

@@ -11,14 +11,25 @@ import 'renderer/css/components/Button.scss';
type OwnProps = {
item: DownloadedItem;
appName: string;
}
const UpdateWrapper = ({item}: OwnProps) => {
const UpdateWrapper = ({item, appName}: OwnProps) => {
if (item.state === 'available') {
return <UpdateAvailable item={item}/>;
return (
<UpdateAvailable
item={item}
appName={appName}
/>
);
}
if (item.state === 'completed') {
return <UpdateDownloaded item={item}/>;
return (
<UpdateDownloaded
item={item}
appName={appName}
/>
);
}
return null;
};