Skip to content

Commit 7faeb90

Browse files
miaawongmiaawong
committed
clean up2
1 parent 078ecdd commit 7faeb90

File tree

1 file changed

+64
-71
lines changed

1 file changed

+64
-71
lines changed

‎web/src/features/Dashboard/components/AvailableUpdateCard.tsx

Lines changed: 64 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -32,88 +32,81 @@ const AvailableUpdateCard = ({
3232
Latest Available Update
3333
</p>
3434
<p className="u-fontSize--normal">
35-
{updates && updates.length > 0 && (
36-
<span className="u-fontSize--small u-fontWeight--medium u-textColor--bodyCopy tw-ml-2">
37-
({updates.length} available)
38-
</span>
39-
)}
35+
<span className="u-fontSize--small u-fontWeight--medium u-textColor--bodyCopy tw-ml-2">
36+
({updates.length} available)
37+
</span>
4038
</p>
4139
</div>
42-
{updates && updates.length > 0 && (
43-
<div className="tw-flex tw-flex-col tw-gap-2 tw-max-h-[275px] tw-overflow-auto">
44-
<div className="available-update-row">
45-
<div className="tw-h-10 tw-bg-white tw-p-4 tw-flex tw-justify-between tw-items-center tw-rounded">
46-
<div className="flex-column">
47-
<div className="flex alignItems--center">
48-
<p className="u-fontSize--header2 u-fontWeight--bold u-lineHeight--medium card-item-title ">
49-
{update.versionLabel}
50-
</p>
51-
{update.isRequired && (
52-
<span className="status-tag required u-marginLeft--10">
53-
{" "}
54-
Required{" "}
55-
</span>
56-
)}
57-
</div>
58-
{update.upstreamReleasedAt && (
59-
<p className="u-fontSize--small u-fontWeight--medium u-textColor--bodyCopy u-marginTop--5">
40+
<div className="tw-flex tw-flex-col tw-gap-2 tw-max-h-[275px] tw-overflow-auto">
41+
<div className="available-update-row">
42+
<div className="tw-h-10 tw-bg-white tw-p-4 tw-flex tw-justify-between tw-items-center tw-rounded">
43+
<div className="flex-column">
44+
<div className="flex alignItems--center">
45+
<p className="u-fontSize--header2 u-fontWeight--bold u-lineHeight--medium card-item-title ">
46+
{update.versionLabel}
47+
</p>
48+
{update.isRequired && (
49+
<span className="status-tag required u-marginLeft--10">
6050
{" "}
61-
Released{" "}
62-
<span className="u-fontWeight--bold">
63-
{Utilities.dateFormat(
64-
update.upstreamReleasedAt,
65-
"MM/DD/YY @ hh:mm a z"
66-
)}
67-
</span>
68-
</p>
51+
Required{" "}
52+
</span>
6953
)}
7054
</div>
71-
<div className="flex alignItems--center">
72-
{update?.releaseNotes && (
73-
<>
74-
<Icon
75-
icon="release-notes"
76-
size={24}
77-
onClick={() => showReleaseNotes(update?.releaseNotes)}
78-
data-tip="View release notes"
79-
className="u-marginRight--5 clickable"
80-
/>
81-
<ReactTooltip
82-
effect="solid"
83-
className="replicated-tooltip"
84-
/>
85-
</>
86-
)}
55+
{update.upstreamReleasedAt && (
56+
<p className="u-fontSize--small u-fontWeight--medium u-textColor--bodyCopy u-marginTop--5">
57+
{" "}
58+
Released{" "}
59+
<span className="u-fontWeight--bold">
60+
{Utilities.dateFormat(
61+
update.upstreamReleasedAt,
62+
"MM/DD/YY @ hh:mm a z"
63+
)}
64+
</span>
65+
</p>
66+
)}
67+
</div>
68+
<div className="flex alignItems--center">
69+
{update?.releaseNotes && (
70+
<>
71+
<Icon
72+
icon="release-notes"
73+
size={24}
74+
onClick={() => showReleaseNotes(update?.releaseNotes)}
75+
data-tip="View release notes"
76+
className="u-marginRight--5 clickable"
77+
/>
78+
<ReactTooltip effect="solid" className="replicated-tooltip" />
79+
</>
80+
)}
8781

88-
<ReactTooltip effect="solid" id="disable-deployment-tooltip" />
82+
<ReactTooltip effect="solid" id="disable-deployment-tooltip" />
8983

90-
<button
91-
className={"btn tw-ml-2 primary blue"}
92-
onClick={() => navigate(`/app/${appSlug}/version-history`)}
93-
disabled={!update.isDeployable || isCurrentVersionLoading}
84+
<button
85+
className={"btn tw-ml-2 primary blue"}
86+
onClick={() => navigate(`/app/${appSlug}/version-history`)}
87+
disabled={!update.isDeployable || isCurrentVersionLoading}
88+
>
89+
<span
90+
key={update.nonDeployableCause}
91+
data-tip-disable={update.isDeployable}
92+
data-tip={update.nonDeployableCause}
93+
data-for="disable-deployment-tooltip"
9494
>
95-
<span
96-
key={update.nonDeployableCause}
97-
data-tip-disable={update.isDeployable}
98-
data-tip={update.nonDeployableCause}
99-
data-for="disable-deployment-tooltip"
100-
>
101-
Go to Version history
102-
</span>
103-
</button>
104-
</div>
95+
Go to Version history
96+
</span>
97+
</button>
10598
</div>
106-
{upgradeService?.error &&
107-
upgradeService?.versionLabel === update.versionLabel && (
108-
<div className="tw-my-4">
109-
<span className="u-fontSize--small u-textColor--error u-fontWeight--bold">
110-
{upgradeService.error}
111-
</span>
112-
</div>
113-
)}
11499
</div>
100+
{upgradeService?.error &&
101+
upgradeService?.versionLabel === update.versionLabel && (
102+
<div className="tw-my-4">
103+
<span className="u-fontSize--small u-textColor--error u-fontWeight--bold">
104+
{upgradeService.error}
105+
</span>
106+
</div>
107+
)}
115108
</div>
116-
)}
109+
</div>
117110
</div>
118111
);
119112
};

0 commit comments

Comments
 (0)