-
Notifications
You must be signed in to change notification settings - Fork 360
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
Fleet UI: Add reminder banners for ABM and APNs expirations #19085
Conversation
@@ -65,8 +65,8 @@ export default { | |||
MACADMINS: `/${API_VERSION}/fleet/macadmins`, | |||
|
|||
// MDM endpoints | |||
MDM_APPLE: `/${API_VERSION}/fleet/mdm/apple`, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
these endpoints (mdm/apple
and mdm/apple_bm
are deprecated and now /apns
and /abm
respectively
👀 |
@@ -61,6 +63,8 @@ const App = ({ children, location }: IAppProps): JSX.Element => { | |||
setCurrentUser, | |||
setConfig, | |||
setEnrollSecret, | |||
setABMExpiry, | |||
setAPNsExpiry, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We could also cleanup sandbox code while we're at it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't want to scope creep cleaning up the entire <SandboxGate/>
in this banners PR estimated to be a 2 right before I took a week vacation.
@@ -1,33 +1,5 @@ | |||
.apple-bm-terms-message { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🙌
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good. Are you convinced the MDM API calls are working/being handled right?
@@ -19,6 +19,8 @@ import { | |||
intlFormat, | |||
intervalToDuration, | |||
isAfter, | |||
isBefore, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
unused
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
grazie
/> | ||
<div className={`${baseClass}--animation-disabled`}> | ||
{renderAppWideBanner()} | ||
<SandboxGate |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we can take out the SandboxGate
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Limiting scope as I'm leaving in 5 work hours.
{renderAppWideBanner()} | ||
<SandboxGate | ||
fallbackComponent={() => ( | ||
<SandboxExpiryMessage |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
and message
config?.license.expiration || "" | ||
); | ||
|
||
const showingAppWideBanner = |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if a more directly linked way to check this would be more bug-proof? Not a deal breaker.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I just built on what's already in there. Definitely consider a refactor if more time was allotted.
00c5397
to
756451a
Compare
Issue
Cerra #11544
Description
Note: This PR builds on the license-expiration PR which should be reviewed and merged first as it will likely cause merge conflicts.
Screen recording
https://www.loom.com/share/79108625899a4418af7343536ec26d56?sid=18709263-d797-4c46-afa9-c79cf18f13da
Checklist for submitter
If some of the following don't apply, delete the relevant line.
changes/
,orbit/changes/
oree/fleetd-chrome/changes
.