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

fix(deprecation): bring frontend in-sync with model #9303

Merged
merged 2 commits into from
Nov 27, 2023
Merged

fix(deprecation): bring frontend in-sync with model #9303

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
b5aa626
fix(deprecation): bring frontend in-sync with model
anshbansal Nov 24, 2023
07de7d8
add backward compatibility so existing deprecations show up correctly
anshbansal Nov 24, 2023
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: 1 addition & 1 deletion datahub-web-react/src/app/entity/shared/EntityDropdown/UpdateDeprecationModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const UpdateDeprecationModal = ({ urns, onClose, refetch }: Props) => {
resources: [...urns.map((urn) => ({ resourceUrn: urn }))],
deprecated: true,
note: formData.note,
decommissionTime: formData.decommissionTime && formData.decommissionTime.unix(),
decommissionTime: formData.decommissionTime && formData.decommissionTime.unix() * 1000,
},
},
});
Expand Down
17 changes: 13 additions & 4 deletions datahub-web-react/src/app/entity/shared/components/styled/DeprecationPill.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,24 @@ export const DeprecationPill = ({ deprecation, urn, refetch, showUndeprecate }:
* Deprecation Decommission Timestamp
*/
const localeTimezone = getLocaleTimezone();

let decommissionTimeSeconds;
if (deprecation.decommissionTime) {
if (deprecation.decommissionTime < 943920000000) {
// Time is set in way past if it was milli-second so considering this as set in seconds
decommissionTimeSeconds = deprecation.decommissionTime;
} else {
decommissionTimeSeconds = deprecation.decommissionTime / 1000;
}
}
const decommissionTimeLocal =
(deprecation.decommissionTime &&
(decommissionTimeSeconds &&
`Scheduled to be decommissioned on ${moment
.unix(deprecation.decommissionTime)
.unix(decommissionTimeSeconds)
.format('DD/MMM/YYYY')} (${localeTimezone})`) ||
undefined;
const decommissionTimeGMT =
deprecation.decommissionTime &&
moment.unix(deprecation.decommissionTime).utc().format('dddd, DD/MMM/YYYY HH:mm:ss z');
decommissionTimeSeconds && moment.unix(decommissionTimeSeconds).utc().format('dddd, DD/MMM/YYYY HH:mm:ss z');

const hasDetails = deprecation.note !== '' || deprecation.decommissionTime !== null;
const isDividerNeeded = deprecation.note !== '' && deprecation.decommissionTime !== null;
Expand Down
Loading