Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add open button to app details page [DHIS2-13885] #564

Merged
merged 2 commits into from
Oct 29, 2024
Merged

feat: add open button to app details page [DHIS2-13885] #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff74cef
feat: add open button to app details page
amcgee Oct 29, 2024
2402d3e
style: format
amcgee Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions i18n/en.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"POT-Creation-Date: 2024-09-26T12:27:51.211Z\n"
"PO-Revision-Date: 2024-09-26T12:27:51.211Z\n"
"POT-Creation-Date: 2024-10-29T11:22:33.823Z\n"
"PO-Revision-Date: 2024-10-29T11:22:33.823Z\n"

msgid ""
"Your session has expired. Please refresh the page and login before trying "
Expand All @@ -33,6 +33,9 @@ msgstr "First published {{relativeTime}}"
msgid "by {{- developer}}"
msgstr "by {{- developer}}"

msgid "Open"
msgstr "Open"

msgid "About this app"
msgstr "About this app"

Expand Down
15 changes: 14 additions & 1 deletion src/components/AppDetails/AppDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import i18n from '@dhis2/d2-i18n'
import { Card, Divider } from '@dhis2/ui'
import { Button, Card, Divider } from '@dhis2/ui'
import moment from 'moment'
import PropTypes from 'prop-types'
import React, { useState } from 'react'
Expand Down Expand Up @@ -122,6 +122,19 @@ export const AppDetails = ({
</span>
)}
</div>
<div>
{installedApp?.launchUrl && (
<a
href={installedApp.launchUrl}
target="_blank"
rel="noreferrer"
>
<Button className={styles.openLink}>
{i18n.t('Open')}
</Button>
</a>
)}
</div>
</header>
<Divider />
<section className={[styles.section, styles.mainSection].join(' ')}>
Expand Down
9 changes: 7 additions & 2 deletions src/components/AppDetails/AppDetails.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

.header {
display: grid;
grid-template-columns: 72px auto;
grid-template-columns: min-content auto min-content;
grid-gap: var(--spacers-dp16);
align-items: center;
line-height: 24px;
Expand Down Expand Up @@ -44,7 +44,7 @@
.mainSection {
display: grid;
grid-gap: var(--spacers-dp24);
grid-template-columns: 60% auto;
grid-template-columns: auto max-content;
}

.manageInstalledVersion {
Expand Down Expand Up @@ -127,3 +127,8 @@
.downloadLink {
text-decoration: none;
}

.openLink::after {
content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAQElEQVR42qXKwQkAIAxDUUdxtO6/RBQkQZvSi8I/pL4BoGw/XPkh4XigPmsUgh0626AjRsgxHTkUThsG2T/sIlzdTsp52kSS1wAAAABJRU5ErkJggg==);
margin: 0px 3px 0px 5px;
}
6 changes: 3 additions & 3 deletions src/components/AppDetails/ManageInstalledVersion.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,11 @@ export const ManageInstalledVersion = ({
return (
<div className={styles.manageInstalledVersion}>
{!hasCompatibleVersions && (
<>
<div>
<em>
{i18n.t('There are no compatible versions available.')}
</em>
</>
</div>
)}
{hasCompatibleVersions && canInstall && (
<>
Expand All @@ -122,7 +122,7 @@ export const ManageInstalledVersion = ({
</>
)}
{canUninstall && (
<Button secondary onClick={handleUninstall}>
<Button secondary destructive onClick={handleUninstall}>
{i18n.t('Uninstall v{{appVersion}}', {
appVersion: installedApp.version,
})}
Expand Down
Loading