diff --git a/changes/22041-error-message-mdm-off b/changes/22041-error-message-mdm-off new file mode 100644 index 0000000000..b02e81a9c8 --- /dev/null +++ b/changes/22041-error-message-mdm-off @@ -0,0 +1 @@ +- add error message on the My Device page when mdm is off for the host diff --git a/frontend/pages/hosts/details/DeviceUserPage/DeviceUserPage.tsx b/frontend/pages/hosts/details/DeviceUserPage/DeviceUserPage.tsx index 4eb8245516..e75d125a91 100644 --- a/frontend/pages/hosts/details/DeviceUserPage/DeviceUserPage.tsx +++ b/frontend/pages/hosts/details/DeviceUserPage/DeviceUserPage.tsx @@ -38,6 +38,7 @@ import AboutCard from "../cards/About"; import SoftwareCard from "../cards/Software"; import PoliciesCard from "../cards/Policies"; import InfoModal from "./InfoModal"; +import { getErrorMessage } from "./helpers"; import FleetIcon from "../../../../../assets/images/fleet-avatar-24x24@2x.png"; import PolicyDetailsModal from "../cards/Policies/HostPoliciesTable/PolicyDetailsModal"; @@ -282,8 +283,7 @@ const DeviceUserPage = ({ refetchExtensions(); }, 1000); } catch (error) { - console.log(error); - renderFlash("error", `Host "${host.display_name}" refetch error`); + renderFlash("error", getErrorMessage(error, host.display_name)); setShowRefetchSpinner(false); } } diff --git a/frontend/pages/hosts/details/DeviceUserPage/helpers.ts b/frontend/pages/hosts/details/DeviceUserPage/helpers.ts new file mode 100644 index 0000000000..a5a362e026 --- /dev/null +++ b/frontend/pages/hosts/details/DeviceUserPage/helpers.ts @@ -0,0 +1,16 @@ +import { getErrorReason } from "interfaces/errors"; + +const DEFAULT_ERROR_MESSAGE = "refetch error."; + +// eslint-disable-next-line import/prefer-default-export +export const getErrorMessage = (e: unknown, hostName: string) => { + let errorMessage = getErrorReason(e, { + reasonIncludes: "Host does not have MDM turned on", + }); + + if (!errorMessage) { + errorMessage = DEFAULT_ERROR_MESSAGE; + } + + return `Host "${hostName}" ${errorMessage}`; +};