@oneuptime/common 8.0.5387 → 8.0.5409

package/Server/Utils/Workspace/MicrosoftTeams/MicrosoftTeams.ts

@@ -98,6 +98,10 @@ export default class MicrosoftTeamsUtil extends WorkspaceBase {
       );
     }
 
+    if (!microsoftAppTenantId) {
+      throw new BadDataException("Microsoft Teams tenant ID is required");
+    }
+
     logger.debug(
       "Creating Bot Framework adapter with authentication configuration",
     );
@@ -125,6 +129,12 @@ export default class MicrosoftTeamsUtil extends WorkspaceBase {
     projectId: ObjectID;
   }): Promise<string> {
     logger.debug("=== getValidAccessToken called ===");
+
+    if (!data.projectId) {
+      throw new BadDataException(
+        "projectId is required to get Microsoft Teams access token",
+      );
+    }
     logger.debug(`Project ID: ${data.projectId.toString()}`);
     logger.debug(
       `Auth token (first 20 chars): ${data.authToken?.substring(0, 20)}...`,
@@ -155,6 +165,19 @@ export default class MicrosoftTeamsUtil extends WorkspaceBase {
 
     const miscData: MicrosoftTeamsMiscData =
       projectAuth.miscData as MicrosoftTeamsMiscData;
+    const tenantId: string | undefined = projectAuth.workspaceProjectId;
+
+    logger.debug(`Resolved tenant ID: ${tenantId}`);
+
+    if (!tenantId) {
+      logger.error(
+        "Microsoft Teams tenant ID missing from project auth configuration",
+      );
+      throw new BadDataException(
+        "Microsoft Teams tenant ID not found for this project",
+      );
+    }
+
     logger.debug(
       `MiscData appAccessToken exists: ${Boolean(miscData.appAccessToken)}`,
     );
@@ -184,6 +207,7 @@ export default class MicrosoftTeamsUtil extends WorkspaceBase {
           const newToken: string | null = await this.refreshAccessToken({
             projectId: data.projectId,
             miscData,
+            tenantId,
           });
           if (newToken) {
             logger.debug("Successfully refreshed token");
@@ -210,6 +234,7 @@ export default class MicrosoftTeamsUtil extends WorkspaceBase {
     const newToken: string | null = await this.refreshAccessToken({
       projectId: data.projectId,
       miscData,
+      tenantId,
     });
     if (newToken) {
       logger.debug("Successfully refreshed token");
@@ -227,10 +252,24 @@ export default class MicrosoftTeamsUtil extends WorkspaceBase {
   private static async refreshAccessToken(data: {
     projectId: ObjectID;
     miscData: MicrosoftTeamsMiscData;
+    tenantId: string;
   }): Promise<string | null> {
     logger.debug("=== refreshAccessToken called ===");
+
+    if (!data.projectId) {
+      throw new BadDataException(
+        "projectId is required to refresh Microsoft Teams access token",
+      );
+    }
+
+    if (!data.miscData) {
+      throw new BadDataException(
+        "miscData is required to refresh Microsoft Teams access token",
+      );
+    }
+
     logger.debug(`Project ID: ${data.projectId.toString()}`);
-    logger.debug(`Tenant ID: ${data.miscData.tenantId}`);
+    logger.debug(`Tenant ID: ${data.tenantId}`);
 
     try {
       // Check if we have the necessary client credentials
@@ -246,18 +285,18 @@ export default class MicrosoftTeamsUtil extends WorkspaceBase {
 
       logger.debug("Client credentials are configured");
 
-      if (!data.miscData.tenantId) {
-        logger.error("Tenant ID not found in miscData, cannot refresh token");
+      if (!data.tenantId) {
+        logger.error("Tenant ID not provided, cannot refresh token");
         return null;
       }
 
       logger.debug(
         `Attempting to refresh Microsoft Teams access token for project ${data.projectId.toString()}`,
       );
-      logger.debug(`Using tenant ID: ${data.miscData.tenantId}`);
+      logger.debug(`Using tenant ID: ${data.tenantId}`);
 
       // Use OAuth 2.0 client credentials flow to get a new app access token
-      const tokenUrl: string = `https://login.microsoftonline.com/${data.miscData.tenantId}/oauth2/v2.0/token`;
+      const tokenUrl: string = `https://login.microsoftonline.com/${data.tenantId}/oauth2/v2.0/token`;
       logger.debug(`Token URL: ${tokenUrl}`);
 
       const tokenRequestBody: JSONObject = {
@@ -314,6 +353,7 @@ export default class MicrosoftTeamsUtil extends WorkspaceBase {
         appAccessToken: newAccessToken,
         appAccessTokenExpiresAt: OneUptimeDate.toString(expiryDate),
         lastAppTokenIssuedAt: OneUptimeDate.toString(now),
+        tenantId: data.tenantId,
       };
 
       logger.debug("Saving updated token to database");
@@ -322,7 +362,7 @@ export default class MicrosoftTeamsUtil extends WorkspaceBase {
         projectId: data.projectId,
         workspaceType: WorkspaceType.MicrosoftTeams,
         authToken: newAccessToken,
-        workspaceProjectId: data.miscData.tenantId,
+        workspaceProjectId: data.tenantId,
         miscData: updatedMiscData as any,
       });
 
@@ -780,6 +820,24 @@ export default class MicrosoftTeamsUtil extends WorkspaceBase {
     projectId: ObjectID;
     teamId: string;
   }): Promise<WorkspaceChannel | null> {
+    if (!data.projectId) {
+      throw new BadDataException(
+        "projectId is required to get Microsoft Teams channel by name",
+      );
+    }
+
+    if (!data.teamId) {
+      throw new BadDataException(
+        "teamId is required to get Microsoft Teams channel by name",
+      );
+    }
+
+    if (!data.channelName) {
+      throw new BadDataException(
+        "channelName is required to get Microsoft Teams channel by name",
+      );
+    }
+
     logger.debug(`Getting workspace channel by name: ${data.channelName}`);
 
     // Get project auth to get available teams
@@ -1004,6 +1062,36 @@ export default class MicrosoftTeamsUtil extends WorkspaceBase {
     adaptiveCard: JSONObject;
     projectId: ObjectID;
   }): Promise<WorkspaceThread> {
+    if (!data.projectId) {
+      throw new BadDataException(
+        "projectId is required to send Microsoft Teams adaptive card",
+      );
+    }
+
+    if (!data.teamId) {
+      throw new BadDataException(
+        "teamId is required to send Microsoft Teams adaptive card",
+      );
+    }
+
+    if (!data.workspaceChannel) {
+      throw new BadDataException(
+        "workspaceChannel is required to send Microsoft Teams adaptive card",
+      );
+    }
+
+    if (!data.workspaceChannel.id) {
+      throw new BadDataException(
+        "workspaceChannel.id is required to send Microsoft Teams adaptive card",
+      );
+    }
+
+    if (!data.adaptiveCard) {
+      throw new BadDataException(
+        "adaptiveCard is required to send Microsoft Teams adaptive card",
+      );
+    }
+
     logger.debug(
       `Sending adaptive card to channel via Bot Framework: ${data.workspaceChannel.name} (${data.workspaceChannel.id})`,
     );
@@ -1032,6 +1120,14 @@ export default class MicrosoftTeamsUtil extends WorkspaceBase {
         );
       }
 
+      const tenantId: string | undefined = projectAuth.workspaceProjectId;
+
+      if (!tenantId) {
+        throw new BadDataException(
+          "Tenant ID not found in Microsoft Teams integration",
+        );
+      }
+
       // Check if app client ID is configured
       if (!MicrosoftTeamsAppClientId) {
         throw new BadDataException(
@@ -1042,7 +1138,7 @@ export default class MicrosoftTeamsUtil extends WorkspaceBase {
       logger.debug(`Using bot ID: ${miscData.botId}`);
 
       // Get Bot Framework adapter
-      const adapter: CloudAdapter = this.getBotAdapter(miscData.tenantId);
+      const adapter: CloudAdapter = this.getBotAdapter(tenantId);
 
       // Create conversation reference for the channel
       const conversationReference: ConversationReference = {
@@ -1055,7 +1151,7 @@ export default class MicrosoftTeamsUtil extends WorkspaceBase {
           name: data.workspaceChannel.name,
           isGroup: true,
           conversationType: "channel",
-          tenantId: miscData.tenantId,
+          tenantId: tenantId,
         },
         channelId: "msteams",
         serviceUrl: "https://smba.trafficmanager.net/teams/",
@@ -1113,6 +1209,25 @@ export default class MicrosoftTeamsUtil extends WorkspaceBase {
     projectId: ObjectID;
   }): Promise<WorkspaceChannel> {
     logger.debug("=== getWorkspaceChannelFromChannelId called ===");
+
+    if (!data.projectId) {
+      throw new BadDataException(
+        "projectId is required to get Microsoft Teams channel by ID",
+      );
+    }
+
+    if (!data.teamId) {
+      throw new BadDataException(
+        "teamId is required to get Microsoft Teams channel by ID",
+      );
+    }
+
+    if (!data.channelId) {
+      throw new BadDataException(
+        "channelId is required to get Microsoft Teams channel by ID",
+      );
+    }
+
     logger.debug(`Channel ID: ${data.channelId}`);
     logger.debug(`Team ID: ${data.teamId}`);
     logger.debug(`Project ID: ${data.projectId.toString()}`);
@@ -1638,13 +1753,11 @@ export default class MicrosoftTeamsUtil extends WorkspaceBase {
       await WorkspaceProjectAuthTokenService.findOneBy({
         query: {
           workspaceType: WorkspaceType.MicrosoftTeams,
-          miscData: {
-            tenantId: tenantId,
-          } as any,
+          workspaceProjectId: tenantId,
         },
         select: {
           projectId: true,
-          miscData: true,
+          workspaceProjectId: true,
         },
         props: {
           isRoot: true,
@@ -2231,9 +2344,13 @@ All monitoring checks are passing normally.`;
         await WorkspaceProjectAuthTokenService.findOneBy({
           query: {
             workspaceType: WorkspaceType.MicrosoftTeams,
-            miscData: { tenantId: tenantId } as any,
+            workspaceProjectId: tenantId,
+          },
+          select: {
+            projectId: true,
+            authToken: true,
+            workspaceProjectId: true,
           },
-          select: { projectId: true, authToken: true },
           props: { isRoot: true },
         });
 
@@ -2683,6 +2800,13 @@ All monitoring checks are passing normally.`;
     projectId: ObjectID;
   }): Promise<Record<string, { id: string; name: string }>> {
     logger.debug("=== refreshTeams called ===");
+
+    if (!data.projectId) {
+      throw new BadDataException(
+        "projectId is required to refresh Microsoft Teams teams",
+      );
+    }
+
     logger.debug(`Project ID: ${data.projectId.toString()}`);
 
     try {
@@ -2699,10 +2823,19 @@ All monitoring checks are passing normally.`;
         );
       }
 
+      const tenantId: string | undefined = projectAuth.workspaceProjectId;
+
+      if (!tenantId) {
+        throw new BadDataException(
+          "Microsoft Teams tenant ID not found for this project",
+        );
+      }
+
       // Get a valid app access token
       const accessToken: string | null = await this.refreshAccessToken({
         projectId: data.projectId,
         miscData: projectAuth.miscData as MicrosoftTeamsMiscData,
+        tenantId,
       });
 
       if (!accessToken) {
@@ -2759,11 +2892,13 @@ All monitoring checks are passing normally.`;
       const miscData: MicrosoftTeamsMiscData =
         (projectAuth.miscData as MicrosoftTeamsMiscData) || {};
       miscData.availableTeams = availableTeams;
+      miscData.tenantId = tenantId;
 
       await WorkspaceProjectAuthTokenService.updateOneById({
         id: projectAuth.id!,
         data: {
           miscData: miscData,
+          workspaceProjectId: tenantId,
         },
         props: {
           isRoot: true,

package/Types/Permission.ts

@@ -80,9 +80,6 @@ enum Permission {
   EditTelemetryServiceMetrics = "EditTelemetryServiceMetrics",
   ReadTelemetryServiceMetrics = "ReadTelemetryServiceMetrics",
 
-  // Telemetry Attributes
-  DeleteTelemetryAttributes = "DeleteTelemetryAttributes",
-
   // Billing Permissions (Owner Permission)
   ManageProjectBilling = "ManageProjectBilling",
 

package/UI/Components/Filters/FilterViewer.tsx

@@ -30,6 +30,9 @@ export interface ComponentProps<T extends GenericObject> {
   isModalLoading?: boolean;
   onFilterRefreshClick?: undefined | (() => void);
   filterData?: FilterData<T> | undefined;
+  onAdvancedFiltersToggle?:
+    | undefined
+    | ((showAdvancedFilters: boolean) => void);
 }
 
 type FilterComponentFunction = <T extends GenericObject>(
@@ -355,7 +358,7 @@ const FilterComponent: FilterComponentFunction = <T extends GenericObject>(
     <div>
       {showViewer && (
         <div>
-          <div className="mt-5 mb-5 bg-gray-50 rounded rounded-xl p-5 border border-2 border-gray-100">
+          <div className="mt-5 mb-5 bg-gray-50 rounded-xl p-5 border-2 border-gray-100">
             <div className="flex mt-1 mb-2">
               <div className="flex-auto py-0.5 text-sm leading-5">
                 <span className="font-semibold">
@@ -442,6 +445,7 @@ const FilterComponent: FilterComponentFunction = <T extends GenericObject>(
             onFilterChanged={(filterData: FilterData<T>) => {
               setTempFilterDataForModal(filterData);
             }}
+            onAdvancedFiltersToggle={props.onAdvancedFiltersToggle}
           />
         </Modal>
       )}

package/UI/Components/Filters/FiltersForm.tsx

@@ -24,6 +24,9 @@ export interface ComponentProps<T extends GenericObject> {
   isFilterLoading?: undefined | boolean;
   filterError?: string | undefined;
   onFilterRefreshClick?: undefined | (() => void);
+  onAdvancedFiltersToggle?:
+    | undefined
+    | ((showAdvancedFilters: boolean) => void);
 }
 
 type FiltersFormFunction = <T extends GenericObject>(
@@ -131,7 +134,11 @@ const FiltersForm: FiltersFormFunction = <T extends GenericObject>(
                 : "Show Advanced Filters"
             }
             onClick={() => {
-              setShowMoreFilters(!showMoreFilters);
+              setShowMoreFilters((currentValue: boolean) => {
+                const newValue: boolean = !currentValue;
+                props.onAdvancedFiltersToggle?.(newValue);
+                return newValue;
+              });
             }}
           />
         )}

package/UI/Components/List/List.tsx

@@ -43,6 +43,9 @@ export interface ComponentProps<T extends GenericObject> {
   onFilterRefreshClick?: undefined | (() => void);
   onFilterModalClose?: (() => void) | undefined;
   onFilterModalOpen?: (() => void) | undefined;
+  onAdvancedFiltersToggle?:
+    | undefined
+    | ((showAdvancedFilters: boolean) => void);
 }
 
 type ListFunction = <T extends GenericObject>(
@@ -118,6 +121,7 @@ const List: ListFunction = <T extends GenericObject>(
             }}
             singularLabel={props.singularLabel}
             pluralLabel={props.pluralLabel}
+            onAdvancedFiltersToggle={props.onAdvancedFiltersToggle}
           />
         </div>
         <div className="">

package/UI/Components/LogsViewer/LogsViewer.tsx

@@ -10,7 +10,12 @@ import {
 } from "../../../Types/FunctionTypes";
 import Log from "../../../Models/AnalyticsModels/Log";
 import LogSeverity from "../../../Types/Log/LogSeverity";
-import React, { FunctionComponent, ReactElement, Ref } from "react";
+import React, {
+  FunctionComponent,
+  ReactElement,
+  Ref,
+  useCallback,
+} from "react";
 import Toggle from "../Toggle/Toggle";
 import Card from "../Card/Card";
 import Button, { ButtonSize, ButtonStyleType } from "../Button/Button";
@@ -58,6 +63,13 @@ const LogsViewer: FunctionComponent<ComponentProps> = (
     React.useRef<HTMLDivElement>(null);
 
   const [logAttributes, setLogAttributes] = React.useState<Array<string>>([]);
+  const [attributesLoaded, setAttributesLoaded] =
+    React.useState<boolean>(false);
+  const [attributesLoading, setAttributesLoading] =
+    React.useState<boolean>(false);
+  const [attributesError, setAttributesError] = React.useState<string>("");
+  const [areAdvancedFiltersVisible, setAreAdvancedFiltersVisible] =
+    React.useState<boolean>(false);
 
   const [isPageLoading, setIsPageLoading] = React.useState<boolean>(true);
   const [pageError, setPageError] = React.useState<string>("");
@@ -66,66 +78,83 @@ const LogsViewer: FunctionComponent<ComponentProps> = (
     Dictionary<TelemetryService>
   >({});
 
-  const loadAttributes: PromiseVoidFunction = async (): Promise<void> => {
-    try {
-      setIsPageLoading(true);
-
-      const telemetryServices: ListResult<TelemetryService> =
-        await ModelAPI.getList({
-          modelType: TelemetryService,
-          query: {},
-          select: {
-            name: true,
-            serviceColor: true,
-          },
-          limit: LIMIT_PER_PROJECT,
-          skip: 0,
-          sort: {
-            name: SortOrder.Ascending,
-          },
-        });
-      const services: Dictionary<TelemetryService> = {};
-
-      telemetryServices.data.forEach((service: TelemetryService) => {
-        services[service.id!.toString()!] = service;
-      });
-
-      setServiceMap(services);
-
-      const attributeRepsonse: HTTPResponse<JSONObject> | HTTPErrorResponse =
-        await API.post({
-          url: URL.fromString(APP_API_URL.toString()).addRoute(
-            "/telemetry/logs/get-attributes",
-          ),
-          data: {},
-          headers: {
-            ...ModelAPI.getCommonHeaders(),
-          },
+  const loadTelemetryServices: PromiseVoidFunction =
+    useCallback(async (): Promise<void> => {
+      try {
+        setIsPageLoading(true);
+        setPageError("");
+
+        const telemetryServices: ListResult<TelemetryService> =
+          await ModelAPI.getList({
+            modelType: TelemetryService,
+            query: {},
+            select: {
+              name: true,
+              serviceColor: true,
+            },
+            limit: LIMIT_PER_PROJECT,
+            skip: 0,
+            sort: {
+              name: SortOrder.Ascending,
+            },
+          });
+        const services: Dictionary<TelemetryService> = {};
+
+        telemetryServices.data.forEach((service: TelemetryService) => {
+          services[service.id!.toString()!] = service;
         });
 
-      if (attributeRepsonse instanceof HTTPErrorResponse) {
-        throw attributeRepsonse;
-      } else {
-        const attributes: Array<string> = attributeRepsonse.data[
+        setServiceMap(services);
+      } catch (err) {
+        setPageError(
+          `We couldn't load telemetry service metadata. ${API.getFriendlyErrorMessage(err as Error)}`,
+        );
+      } finally {
+        setIsPageLoading(false);
+      }
+    }, []);
+
+  const loadAttributes: PromiseVoidFunction =
+    useCallback(async (): Promise<void> => {
+      try {
+        setAttributesLoading(true);
+        setAttributesError("");
+
+        const attributeRepsonse: HTTPResponse<JSONObject> | HTTPErrorResponse =
+          await API.post({
+            url: URL.fromString(APP_API_URL.toString()).addRoute(
+              "/telemetry/logs/get-attributes",
+            ),
+            data: {},
+            headers: {
+              ...ModelAPI.getCommonHeaders(),
+            },
+          });
+
+        if (attributeRepsonse instanceof HTTPErrorResponse) {
+          throw attributeRepsonse;
+        }
+
+        const attributes: Array<string> = (attributeRepsonse.data[
           "attributes"
-        ] as Array<string>;
+        ] || []) as Array<string>;
         setLogAttributes(attributes);
+        setAttributesLoaded(true);
+      } catch (err) {
+        setLogAttributes([]);
+        setAttributesLoaded(false);
+        setAttributesError(
+          `We couldn't load log attributes. Filters may be limited. ${API.getFriendlyErrorMessage(err as Error)}`,
+        );
+      } finally {
+        setAttributesLoading(false);
       }
-
-      setIsPageLoading(false);
-      setPageError("");
-    } catch (err) {
-      setIsPageLoading(false);
-      setPageError(API.getFriendlyErrorMessage(err as Error));
-    }
-  };
+    }, []);
 
   // Update the screen height when the window is resized
 
   React.useEffect(() => {
-    loadAttributes().catch((err: unknown) => {
-      setPageError(API.getFriendlyErrorMessage(err as Error));
-    });
+    void loadTelemetryServices();
 
     const handleResize: any = (): void => {
       setScreenHeight(window.innerHeight);
@@ -136,7 +165,7 @@ const LogsViewer: FunctionComponent<ComponentProps> = (
     return () => {
       window.removeEventListener("resize", handleResize);
     };
-  }, []);
+  }, [loadTelemetryServices]);
 
   // Keep scroll to the bottom of the log
 
@@ -180,11 +209,9 @@ const LogsViewer: FunctionComponent<ComponentProps> = (
   if (isPageLoading) {
     return <PageLoader isVisible={true} />;
   }
-
   if (pageError) {
     return <ErrorMessage message={pageError} />;
   }
-
   return (
     <div>
       {props.showFilters && (
@@ -198,6 +225,26 @@ const LogsViewer: FunctionComponent<ComponentProps> = (
                 onFilterChanged={(filterData: Query<Log>) => {
                   setFilterData(filterData);
                 }}
+                onAdvancedFiltersToggle={(show: boolean) => {
+                  setAreAdvancedFiltersVisible(show);
+
+                  if (show && !attributesLoaded && !attributesLoading) {
+                    void loadAttributes();
+                  }
+                }}
+                isFilterLoading={areAdvancedFiltersVisible && attributesLoading}
+                filterError={
+                  areAdvancedFiltersVisible && attributesError
+                    ? attributesError
+                    : undefined
+                }
+                onFilterRefreshClick={
+                  areAdvancedFiltersVisible && attributesError
+                    ? () => {
+                        void loadAttributes();
+                      }
+                    : undefined
+                }
                 filters={[
                   {
                     key: "body",

package/UI/Components/Markdown.tsx/MarkdownViewer.tsx

@@ -14,7 +14,7 @@ const MarkdownViewer: FunctionComponent<ComponentProps> = (
   props: ComponentProps,
 ): ReactElement => {
   return (
-    <div className="max-w-none p-3">
+    <div className="max-w-none">
       <ReactMarkdown
         components={{
           // because tailwind does not supply <h1 ... /> styles https://tailwindcss.com/docs/preflight#headings-are-unstyled

package/UI/Components/ModelTable/BaseModelTable.tsx

@@ -224,6 +224,10 @@ export interface BaseTableProps<
 
   formSummary?: FormSummaryConfig | undefined;
 
+  onAdvancedFiltersToggle?:
+    | undefined
+    | ((showAdvancedFilters: boolean) => void);
+
   /*
    * this key is used to save table user preferences in local storage.
    * If you provide this key, the table will save the user preferences in local storage.
@@ -1516,6 +1520,7 @@ const BaseModelTable: <TBaseModel extends BaseModel | AnalyticsBaseModel>(
         onFilterModalOpen={() => {
           setShowFilterModal(true);
         }}
+        onAdvancedFiltersToggle={props.onAdvancedFiltersToggle}
         onSortChanged={(
           sortBy: keyof TBaseModel | null,
           sortOrder: SortOrder,
@@ -1662,6 +1667,7 @@ const BaseModelTable: <TBaseModel extends BaseModel | AnalyticsBaseModel>(
         onFilterModalOpen={() => {
           setShowFilterModal(true);
         }}
+        onAdvancedFiltersToggle={props.onAdvancedFiltersToggle}
         singularLabel={props.singularName || model.singularName || "Item"}
         pluralLabel={props.pluralName || model.pluralName || "Items"}
         error={error}

package/UI/Components/Table/Table.tsx

@@ -54,6 +54,9 @@ export interface ComponentProps<T extends GenericObject> {
   onFilterModalClose?: (() => void) | undefined;
   onFilterModalOpen?: (() => void) | undefined;
   filterData?: undefined | FilterData<T>;
+  onAdvancedFiltersToggle?:
+    | undefined
+    | ((showAdvancedFilters: boolean) => void);
 
   enableDragAndDrop?: boolean | undefined;
   dragDropIndexField?: keyof T | undefined;
@@ -242,6 +245,7 @@ const Table: TableFunction = <T extends GenericObject>(
         singularLabel={props.singularLabel}
         pluralLabel={props.pluralLabel}
         filterData={props.filterData}
+        onAdvancedFiltersToggle={props.onAdvancedFiltersToggle}
       />
       {props.bulkActions?.buttons && (
         <BulkUpdateForm