Interface cleanup, casing bug, hook up os_versions API call, show os …

…settings modal

frontend/components/side_panels/QuerySidePanel/QueryTableColumns/ColumnListItem/ColumnListItem.tsx

@@ -4,7 +4,7 @@ import classnames from "classnames";
 import {
   ColumnType,
   IQueryTableColumn,
-  TableSchemaPlatforms,
+  TableSchemaPlatform,
 } from "interfaces/osquery_table";
 import TooltipWrapper from "components/TooltipWrapper";
 import { buildQueryStringFromParams } from "utilities/url";
@@ -58,7 +58,7 @@ const renderTooltip = (
     );
   };
 
-  const renderPlatformFootnotes = (columnPlatforms: TableSchemaPlatforms[]) => {
+  const renderPlatformFootnotes = (columnPlatforms: TableSchemaPlatform[]) => {
     let platformsCopy;
     switch (columnPlatforms.length) {
       case 1:

frontend/components/side_panels/QuerySidePanel/QueryTablePlatforms/QueryTablePlatforms.tsx

@@ -1,12 +1,11 @@
 import React from "react";
 
-import { SupportedDisplayPlatform } from "interfaces/platform";
 import { PLATFORM_DISPLAY_NAMES } from "utilities/constants";
 import Icon from "components/Icon";
-import { TableSchemaPlatforms } from "interfaces/osquery_table";
+import { TableSchemaPlatform } from "interfaces/osquery_table";
 
 interface IPLatformListItemProps {
-  platform: SupportedDisplayPlatform;
+  platform: TableSchemaPlatform;
 }
 
 const baseClassListItem = "platform-list-item";
@@ -21,7 +20,7 @@ const PlatformListItem = ({ platform }: IPLatformListItemProps) => {
 };
 
 // TODO: remove when freebsd is removed
-type IPlatformsWithFreebsd = TableSchemaPlatforms | "freebsd";
+type IPlatformsWithFreebsd = TableSchemaPlatform | "freebsd";
 
 interface IQueryTablePlatformsProps {
   platforms: IPlatformsWithFreebsd[];
@@ -39,7 +38,7 @@ const QueryTablePlatforms = ({ platforms }: IQueryTablePlatformsProps) => {
       return (
         <PlatformListItem
           key={platform}
-          platform={platform as SupportedDisplayPlatform} // TODO: remove when freebsd is removed
+          platform={platform as TableSchemaPlatform} // TODO: remove when freebsd is removed
         />
       );
     });

frontend/interfaces/osquery_table.ts

@@ -24,23 +24,23 @@ export type ColumnType =
   | "string"; // TODO: Why do we have type string, STRING, and text in schema.json?
 
 // TODO: Replace with one or the other once osquery_fleet_schema.json follows one type or other
-export type TableSchemaPlatforms = SupportedDisplayPlatform | SupportedPlatform;
+export type TableSchemaPlatform = SupportedDisplayPlatform | SupportedPlatform;
 export interface IQueryTableColumn {
   name: string;
   description: string;
   type: ColumnType;
   hidden: boolean;
   required: boolean;
   index: boolean;
-  platforms?: TableSchemaPlatforms[];
+  platforms?: TableSchemaPlatform[];
   requires_user_context?: boolean;
 }
 
 export interface IOsQueryTable {
   name: string;
   description: string;
   url: string;
-  platforms: TableSchemaPlatforms[];
+  platforms: TableSchemaPlatform[];
   evented: boolean;
   cacheable: boolean;
   columns: IQueryTableColumn[];

frontend/pages/DashboardPage/DashboardPage.tsx

@@ -29,7 +29,6 @@ import {
   IMdmSummaryResponse,
   IMdmSummaryMdmSolution,
 } from "interfaces/mdm";
-import { Platform, SelectedPlatform } from "interfaces/platform";
 import { ISoftwareResponse, ISoftwareCountResponse } from "interfaces/software";
 import { API_ALL_TEAMS_ID, ITeam } from "interfaces/team";
 import { IConfig } from "interfaces/config";
@@ -886,7 +885,7 @@ const DashboardPage = ({ router, location }: IDashboardProps): JSX.Element => {
             className={`${baseClass}__platform_dropdown`}
             options={PLATFORM_DROPDOWN_OPTIONS}
             searchable={false}
-            onChange={(value: SelectedPlatform) => {
+            onChange={(value: PlatformValueOptions) => {
               const selectedPlatformOption = PLATFORM_DROPDOWN_OPTIONS.find(
                 (platform) => platform.value === value
               );

frontend/pages/hosts/details/OSSettingsModal/OSSettingsTable/OSSettingsTableConfig.tsx

@@ -146,6 +146,10 @@ export const generateTableData = (
       return makeWindowsRows(hostMDMData);
     case "darwin":
       return makeDarwinRows(hostMDMData);
+    case "ios":
+      return hostMDMData.profiles;
+    case "ipados":
+      return hostMDMData.profiles;
     default:
       return null;
   }

frontend/services/entities/operating_systems.ts

@@ -11,6 +11,8 @@ export const OS_VERSIONS_API_SUPPORTED_PLATFORMS = [
   "darwin",
   "windows",
   "chrome",
+  "ios",
+  "ipados",
 ];
 
 export interface IGetOSVersionsQueryParams {

frontend/utilities/sql_tools.ts

@@ -7,18 +7,18 @@ import {
   SUPPORTED_PLATFORMS,
   SupportedPlatform,
 } from "interfaces/platform";
-import { TableSchemaPlatforms } from "interfaces/osquery_table";
+import { TableSchemaPlatform } from "interfaces/osquery_table";
 
 type IAstNode = Record<string | number | symbol, unknown>;
 
 // TODO: Research if there are any preexisting types for osquery schema
 // TODO: Is it ever possible that osquery_tables.json would be missing name or platforms?
 interface IOsqueryTable {
   name: string;
-  platforms: TableSchemaPlatforms[];
+  platforms: TableSchemaPlatform[];
 }
 
-type IPlatformDictionary = Record<string, TableSchemaPlatforms[]>;
+type IPlatformDictionary = Record<string, TableSchemaPlatform[]>;
 
 const platformsByTableDictionary: IPlatformDictionary = (osqueryTablesAvailable as IOsqueryTable[]).reduce(
   (dictionary: IPlatformDictionary, osqueryTable) => {

frontend/utilities/strings/stringUtils.ts

@@ -20,6 +20,8 @@ const capitalizeRole = (str: UserRole): UserRole => {
 
 export const STYLIZATIONS_AND_ACRONYMS = [
   "macOS",
+  "iOS",
+  "iPadOS",
   "osquery",
   "MySQL",
   "MDM",
@@ -29,7 +31,7 @@ export const STYLIZATIONS_AND_ACRONYMS = [
 ];
 
 // fleetdm.com/handbook/marketing/content-style-guide#sentence-case
-// * doesn't recognize proper nouns!
+/** Does not recognize proper nouns! */
 export const enforceFleetSentenceCasing = (s: string) => {
   const resArr = s.split(" ").map((word, i) => {
     if (!STYLIZATIONS_AND_ACRONYMS.includes(word)) {