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.

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(subscription): add hover information on the status icon #1130

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
- updated technical user details with user type and service endpoint fields. Also, updated copy icon color for better view and made copy icon available only when value is available [#1137](https://github.com/eclipse-tractusx/portal-frontend/pull/1137)
- **Company Subscriptions**
- update API query parameters and fix tab UI scroll [#1131](https://github.com/eclipse-tractusx/portal-frontend/pull/1131)
- **App & Service Subscription Management**
- updated search place holder text - showing only available offer names at the top - and implemented hover information on the status icon of service subscription [#1130](https://github.com/eclipse-tractusx/portal-frontend/pull/1130)
- **Customer Data**
- re-enabled CSV upload [#1144](https://github.com/eclipse-tractusx/portal-frontend/pull/1144)
- reverted manual intervention with ready state api [#1144](https://github.com/eclipse-tractusx/portal-frontend/pull/1144)
Expand Down
3 changes: 3 additions & 0 deletions src/assets/locales/de/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -1488,6 +1488,9 @@
"pleaseEnterValidURL": "Please enter a valid URL",
"error": "Error",
"success": "Success",
"pending": "Das Abonnement steht noch aus",
"active": "Das Abonnement ist aktiv",
"process": "Das Abonnement ist in Bearbeitung",
"tabs": {
"request": "Request",
"active": "Active",
Expand Down
3 changes: 3 additions & 0 deletions src/assets/locales/en/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -1456,6 +1456,9 @@
"pleaseEnterValidURL": "Please enter a valid URL",
"error": "Error",
"success": "Success",
"pending": "Subscription is Pending",
"active": "Subscription is Active",
"process": "Subscription is in Progress",
"tabs": {
"request": "Request",
"active": "Active",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,15 @@ export default function SubscriptionElements({
subscription: CompanySubscriptionData
) => {
if (subscription.offerSubscriptionStatus === SubscriptionStatus.ACTIVE) {
return <AddTaskIcon className="statusIcon active" />
return (
<Tooltips
color="dark"
tooltipPlacement="top-start"
tooltipText={t('content.appSubscription.active')}
>
<AddTaskIcon className="statusIcon active" />
</Tooltips>
)
} else if (
subscription.offerSubscriptionStatus === SubscriptionStatus.PENDING
) {
Expand Down Expand Up @@ -211,7 +219,13 @@ export default function SubscriptionElements({
})
}}
/>
<HistoryIcon className="statusIcon pending" />
<Tooltips
color="dark"
tooltipPlacement="top-start"
tooltipText={t('content.appSubscription.pending')}
>
<HistoryIcon className="statusIcon pending" />
</Tooltips>
</>
)
} else if (
Expand All @@ -226,16 +240,28 @@ export default function SubscriptionElements({
variant="filled"
onClick={() => handleActivate(subscription.subscriptionId)}
/>
<HistoryIcon className="statusIcon pending" />
<Tooltips
color="dark"
tooltipPlacement="top-start"
tooltipText={t('content.appSubscription.pending')}
>
<HistoryIcon className="statusIcon pending" />
</Tooltips>
</>
)
} else {
return (
<img
src={`${getAssetBase()}/images/icons/process.svg`}
className="statusIcon"
alt="subscription process"
/>
<Tooltips
color="dark"
tooltipPlacement="top-start"
tooltipText={t('content.appSubscription.process')}
>
<img
src={`${getAssetBase()}/images/icons/process.svg`}
className="statusIcon"
alt="subscription process"
/>
</Tooltips>
)
}
} else {
Expand Down
Loading