@oneuptime/common 14.0.10 → 14.0.11

package/UI/Components/CustomFields/CustomFieldModelFormFields.tsx

@@ -14,11 +14,7 @@ import {
 
 export { CUSTOM_FIELD_NO_VALUE_PLACEHOLDER } from "./CustomFieldFormFields";
 import BaseModel from "../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
-import {
-  CustomFieldMappingSourceInfo,
-  getCustomFieldMappingSource,
-  hasCustomFieldMappingSource,
-} from "../../../Types/CustomField/CustomFieldMappingCatalog";
+import { isCustomFieldInheritedByRecord } from "../../../Types/CustomField/CustomFieldMappingCatalog";
 import CustomFieldType from "../../../Types/CustomField/CustomFieldType";
 import { isCustomFieldValueEmpty } from "../../../Types/CustomField/CustomFieldValueMapping";
 import { JSONObject } from "../../../Types/JSON";
@@ -69,32 +65,17 @@ export type IsCustomFieldInheritedFunction = (data: {
  * typed: it is mapped (an incident field from a monitor field) and the record
  * is attached to something to copy from (the incident has a monitor). The
  * server re-applies the mapping on create, so asking for such a value would
- * only have it replaced. The same rule the Custom Fields card uses.
+ * only have it replaced. The same rule the Custom Fields card uses, and the
+ * public incident forms (isCustomFieldInheritedByRecord).
  */
 export const isCustomFieldInherited: IsCustomFieldInheritedFunction = (data: {
   definitionTableName: string;
   definition: CustomFieldFormDefinition;
   values: JSONObject;
 }): boolean => {
-  if (
-    !data.definition.mapFromResourceType ||
-    !data.definition.mapFromCustomFieldName
-  ) {
-    return false;
-  }
-
-  const source: CustomFieldMappingSourceInfo | undefined =
-    getCustomFieldMappingSource({
-      definitionTableName: data.definitionTableName,
-      resource: data.definition.mapFromResourceType,
-    });
-
-  if (!source) {
-    return false;
-  }
-
-  return hasCustomFieldMappingSource({
-    source: source,
+  return isCustomFieldInheritedByRecord({
+    definitionTableName: data.definitionTableName,
+    definition: data.definition,
     record: data.values as Record<string, unknown>,
   });
 };

package/UI/Components/EditionLabel/EditionLabel.tsx

@@ -75,15 +75,15 @@ const DAY_IN_MS: number = 24 * 60 * 60 * 1000;
 /*
  * What stops when the license lapses, in one sentence set, so every notice in
  * the dialog says it the same way. It has to be said plainly and before it
- * happens: after the trial or the grace period, single sign-on (SAML and
- * OIDC) and SCIM provisioning stop, "Require SSO" is no longer enforced (so
- * nobody is locked out: users sign in with their password), and audit logging
- * stops recording - the Community Edition's behaviour - until a license is
- * activated, when everything resumes without a restart. Core monitoring is
- * never touched.
+ * happens: after the trial or the grace period, SCIM provisioning stops and
+ * audit logging stops recording - the Community Edition's behaviour - until a
+ * license is activated, when everything resumes without a restart. Core
+ * monitoring is never touched. Single sign-on (SAML and OIDC) and "Require
+ * SSO" are not on this list: they are part of every edition (see
+ * communityFeatures below).
  */
 export const LICENSE_LAPSE_CONSEQUENCES: string =
-  'single sign-on (SAML and OIDC) stops and "Require SSO" is no longer enforced, so users sign in with their password; SCIM provisioning stops; audit logging stops recording; enterprise configuration becomes read-only; and the enterprise admin dashboards are locked. Everything resumes as soon as a license is activated, and core monitoring is never affected.';
+  "SCIM provisioning stops, audit logging stops recording, enterprise configuration becomes read-only and the enterprise admin dashboards are locked. Everything resumes as soon as a license is activated, and core monitoring is never affected.";
 
 /*
  * The two periods have different names and different lengths: an unlicensed
@@ -101,7 +101,7 @@ export const GRACE_ENFORCEMENT_SUMMARY: string = `Without a valid license (after
  * missing after the trial, or invalid), after the reason the notice gives.
  */
 export const LICENSE_LAPSED_STATE: string =
-  'Single sign-on (SAML and OIDC) and SCIM provisioning are off: "Require SSO" is not enforced, so users sign in with their password, and your identity provider\'s SCIM requests are refused. Audit logging is not recording. Enterprise configuration is read-only and the enterprise admin dashboards are locked. Everything resumes, without a restart, as soon as a valid license is added, and core monitoring is never affected.';
+  "SCIM provisioning is off and your identity provider's SCIM requests are refused. Audit logging is not recording. Enterprise configuration is read-only and the enterprise admin dashboards are locked. Everything resumes, without a restart, as soon as a valid license is added, and core monitoring is never affected.";
 
 type LicenseStatus = "valid" | "grace" | "expired" | "missing" | "invalid";
 
@@ -949,7 +949,7 @@ const EditionLabel: FunctionComponent<ComponentProps> = (
     }
 
     if (!licenseValid) {
-      return "Add a valid license to turn single sign-on, SCIM and audit logging back on and make enterprise configuration editable.";
+      return "Add a valid license to turn SCIM provisioning and audit logging back on and make enterprise configuration editable.";
     }
 
     return "License, version, seat usage, and the instances covered by this key.";
@@ -958,6 +958,7 @@ const EditionLabel: FunctionComponent<ComponentProps> = (
   const communityFeatures: Array<string> = useMemo(() => {
     return [
       "Full OneUptime platform with incident response, status pages, and workflow automation.",
+      'SAML and OIDC single sign-on (SSO) for projects, status pages, and the whole instance, including "Require SSO for login".',
       "Community support, documentation, and tutorials to help teams get started quickly.",
       "Regular updates, bug fixes, and open-source extensibility.",
       "Integrations with popular DevOps tools through community-maintained connectors.",
@@ -1324,8 +1325,8 @@ const EditionLabel: FunctionComponent<ComponentProps> = (
           <p className="mt-2 text-xs leading-relaxed text-amber-800">
             {canManageLicense
               ? hasLicenseInstalled
-                ? "Re-activate the license below before the trial ends, or let the daily license sync fetch its expiry from OneUptime, to keep single sign-on, SCIM and audit logging running and enterprise configuration editable."
-                : "Add a license below before the trial ends to keep single sign-on, SCIM and audit logging running and enterprise configuration editable."
+                ? "Re-activate the license below before the trial ends, or let the daily license sync fetch its expiry from OneUptime, to keep SCIM provisioning and audit logging running and enterprise configuration editable."
+                : "Add a license below before the trial ends to keep SCIM provisioning and audit logging running and enterprise configuration editable."
               : hasLicenseInstalled
                 ? "Ask a master admin of this installation to re-activate the license."
                 : "Ask a master admin of this installation to add a license."}
@@ -1597,8 +1598,8 @@ const EditionLabel: FunctionComponent<ComponentProps> = (
                   </h4>
                   <p className="mt-0.5 text-xs text-indigo-700">
                     {canManageLicense
-                      ? "A valid license that includes them keeps single sign-on, SCIM provisioning and audit logging running, enterprise configuration (SSO, SCIM, team compliance, audit log settings) editable and the enterprise admin dashboards unlocked."
-                      : "A master admin can add the license to keep single sign-on, SCIM provisioning and audit logging running and enterprise configuration editable."}{" "}
+                      ? "A valid license that includes them keeps SCIM provisioning and audit logging running, enterprise configuration (SCIM, team compliance, audit log settings) editable and the enterprise admin dashboards unlocked."
+                      : "A master admin can add the license to keep SCIM provisioning and audit logging running and enterprise configuration editable."}{" "}
                     Core monitoring never depends on it.
                   </p>
                   <ul className="mt-3 grid grid-cols-1 gap-2 sm:grid-cols-2">

package/UI/Components/ErrorMessage/ErrorMessage.tsx

@@ -4,6 +4,12 @@ import React, { FunctionComponent, ReactElement } from "react";
 export interface ComponentProps {
   message: string | ReactElement;
   onRefreshClick?: undefined | (() => void);
+  /*
+   * A way forward to offer under the message - an empty table's "Create X"
+   * button. It takes the place of the Refresh link: reloading a list that
+   * just loaded empty only shows the same nothing again.
+   */
+  action?: undefined | ReactElement;
 }
 
 const ErrorMessage: FunctionComponent<ComponentProps> = (
@@ -18,7 +24,11 @@ const ErrorMessage: FunctionComponent<ComponentProps> = (
   return (
     <div className="text-center my-10 text-gray-500 text-sm">
       {translatedMessage}
-      {props.onRefreshClick ? (
+      {props.action ? (
+        <div className="mt-4 flex justify-center" data-testid="empty-action">
+          {props.action}
+        </div>
+      ) : props.onRefreshClick ? (
         /*
          * This is the only recovery control on the app-wide failure and
          * empty-state surface, and it used to be a <div role="refresh-button">

package/UI/Components/Forms/Fields/FormField.tsx

@@ -714,7 +714,13 @@ const FormField: <T extends GenericObject>(
             <CodeEditor
               ariaLabelledby={fieldLabelId}
               error={props.touched && props.error ? props.error : undefined}
+              ariaInvalid={Boolean(props.touched && props.error)}
               type={CodeType.JSON}
+              /*
+               * The form validates this field with JSON5 when the value is
+               * read that way, so the editor's own check has to agree.
+               */
+              allowJSON5={props.field.allowJSON5}
               tabIndex={0}
               dataTestId={props.field.dataTestId}
               onChange={async (value: string) => {
@@ -776,6 +782,7 @@ const FormField: <T extends GenericObject>(
               dataTestId={props.field.dataTestId}
               tabIndex={0}
               disableSpellCheck={props.field.disableSpellCheck}
+              allowImageUpload={props.field.allowImageUpload}
               onChange={async (value: string) => {
                 onChange(value);
                 props.setFieldValue(props.fieldName, value);
@@ -821,6 +828,7 @@ const FormField: <T extends GenericObject>(
             <CodeEditor
               ariaLabelledby={fieldLabelId}
               error={props.touched && props.error ? props.error : undefined}
+              ariaInvalid={Boolean(props.touched && props.error)}
               tabIndex={0}
               onChange={async (value: string) => {
                 onChange(value);

package/UI/Components/Forms/Types/Field.ts

@@ -173,6 +173,14 @@ export default interface Field<TEntity> {
    */
   disableSpellCheck?: boolean | undefined;
 
+  /*
+   * For a Markdown field: whether its editor uploads pasted, dropped and
+   * picked images. Default: true. Uploading needs a signed-in user, so a
+   * form that people without a OneUptime account fill in sets this to false
+   * -- the Image button is hidden and image files are ignored.
+   */
+  allowImageUpload?: boolean | undefined;
+
   getSummaryElement?: (item: FormValues<TEntity>) => ReactElement | undefined;
 
   // If true, this field will span the full row in multi-column layouts.

package/UI/Components/Icon/Icon.tsx

@@ -432,6 +432,24 @@ const Icon: FunctionComponent<ComponentProps> = ({
         d="M8.25 6.75h12M8.25 12h12m-12 5.25h12M3.75 6.75h.007v.008H3.75V6.75zm.375 0a.375.375 0 11-.75 0 .375.375 0 01.75 0zM3.75 12h.007v.008H3.75V12zm.375 0a.375.375 0 11-.75 0 .375.375 0 01.75 0zm-.375 5.25h.007v.008H3.75v-.008zm.375 0a.375.375 0 11-.75 0 .375.375 0 01.75 0z"
       />,
     );
+  } else if (icon === IconProp.Indent) {
+    // Lines of text with the middle two pushed in, and an arrow pointing in.
+    return getSvgWrapper(
+      <path
+        strokeLinecap="round"
+        strokeLinejoin="round"
+        d="M3.75 5.25h16.5M11.25 9.75h9M11.25 14.25h9M3.75 18.75h16.5M3.75 9l3 3-3 3"
+      />,
+    );
+  } else if (icon === IconProp.Outdent) {
+    // The same lines, with the arrow pointing back out.
+    return getSvgWrapper(
+      <path
+        strokeLinecap="round"
+        strokeLinejoin="round"
+        d="M3.75 5.25h16.5M11.25 9.75h9M11.25 14.25h9M3.75 18.75h16.5M6.75 9l-3 3 3 3"
+      />,
+    );
   } else if (icon === IconProp.Template) {
     return getSvgWrapper(
       <path

package/UI/Components/Input/Input.tsx

@@ -8,6 +8,7 @@ import React, {
   FunctionComponent,
   ReactElement,
   useEffect,
+  useId,
   useLayoutEffect,
   useRef,
   useState,
@@ -117,6 +118,14 @@ const Input: FunctionComponent<ComponentProps> = (
   props: ComponentProps,
 ): ReactElement => {
   const { translateString } = useTranslateValue();
+  /*
+   * Each input's error message has an id of its own for the input to point
+   * aria-describedby at. The id was fixed, so on a form with several fields
+   * in error every message had the same id, and a screen reader described
+   * each field -- "Your Email" -- with the first field's message, "Title is
+   * required.".
+   */
+  const errorId: string = `input-error-${useId()}`;
   let className: string = "";
 
   if (!props.className) {
@@ -264,9 +273,7 @@ const Input: FunctionComponent<ComponentProps> = (
           aria-autocomplete={props.ariaAutoComplete}
           aria-activedescendant={props.ariaActiveDescendant}
           aria-invalid={props.error || props.ariaInvalid ? "true" : undefined}
-          aria-describedby={
-            props.error ? "input-error-message" : props.ariaDescribedby
-          }
+          aria-describedby={props.error ? errorId : props.ariaDescribedby}
           onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
             const value: string | Date = e.target.value;
 
@@ -342,7 +349,7 @@ const Input: FunctionComponent<ComponentProps> = (
 
       {props.error && (
         <p
-          id="input-error-message"
+          id={errorId}
           data-testid="error-message"
           className="mt-1 text-sm text-red-400"
           role="alert"

package/UI/Components/LogsViewer/LogsViewer.tsx

@@ -71,6 +71,7 @@ import OneUptimeDate from "../../../Types/Date";
 import useViewerTimeRangeZoom, {
   ViewerTimeRangeZoom,
 } from "../TelemetryViewer/useViewerTimeRangeZoom";
+import { hasLockedTelemetryScope } from "../TelemetryViewer/FacetVisibility";
 import { TimeRangeZoomProvider } from "../Charts/TimeRangeZoom/TimeRangeZoomContext";
 import useTelemetryEntityNames from "../../Utils/Telemetry/UseTelemetryEntityNames";
 import { TelemetryEntityNameMap } from "../../Utils/Telemetry/TelemetryEntityNames";
@@ -1309,6 +1310,9 @@ const LogsViewer: FunctionComponent<ComponentProps> = (
               onSavedViewSelect={props.onSavedViewSelect}
               onClearSavedView={props.onClearSavedView}
               onFacetSearchChange={props.onFacetSearchChange}
+              onlyShowValuesInScope={hasLockedTelemetryScope(
+                enrichedBaseActiveFilters,
+              )}
             />
           )}
 

package/UI/Components/LogsViewer/components/LogsFacetSidebar.tsx

@@ -35,6 +35,7 @@ import HiddenFacetsFooter from "../../TelemetryViewer/components/HiddenFacetsFoo
 import {
   FacetVisibility,
   computeFacetVisibility,
+  getFacetValuesInScope,
   getSidebarFacetEmptyStateText,
 } from "../../TelemetryViewer/FacetVisibility";
 import useFacetSearchExemptions, {
@@ -80,6 +81,12 @@ export interface LogsFacetSidebarProps {
    * only, so the sidebar stays mounted and keeps its search and expand state.
    */
   isCollapsedOnSmallScreens?: boolean | undefined;
+  /*
+   * The viewer is pinned to a scope (it shows locked chips): list only the
+   * values found in it, never the project's zero-count catalog padding.
+   * See getFacetValuesInScope.
+   */
+  onlyShowValuesInScope?: boolean | undefined;
 }
 
 /*
@@ -339,10 +346,20 @@ const LogsFacetSidebar: FunctionComponent<LogsFacetSidebarProps> = (
     onFacetSearchChange: props.onFacetSearchChange,
   });
 
+  // What the sections list: under a locked scope, only values in it.
+  const facetData: FacetData = useMemo(() => {
+    return props.onlyShowValuesInScope
+      ? getFacetValuesInScope({
+          facetData: props.facetData,
+          activeValuesByKey: activeValuesByKey,
+        })
+      : props.facetData;
+  }, [props.onlyShowValuesInScope, props.facetData, activeValuesByKey]);
+
   const visibility: FacetVisibility = useMemo(() => {
     return computeFacetVisibility({
       keys: facetKeys,
-      facetData: props.facetData,
+      facetData: facetData,
       isHideable: isHideableFacetKey,
       activeValuesByKey: activeValuesByKey,
       searchExemptKeys: facetSearch.searchExemptKeys,
@@ -351,7 +368,7 @@ const LogsFacetSidebar: FunctionComponent<LogsFacetSidebarProps> = (
     });
   }, [
     facetKeys,
-    props.facetData,
+    facetData,
     activeValuesByKey,
     facetSearch.searchExemptKeys,
     showHidden,
@@ -387,7 +404,7 @@ const LogsFacetSidebar: FunctionComponent<LogsFacetSidebarProps> = (
         )}
 
         {visibility.visibleKeys.map((key: string) => {
-          const values: Array<FacetValue> = props.facetData[key] || [];
+          const values: Array<FacetValue> = facetData[key] || [];
 
           let valueDisplayMap: Record<string, string> | undefined;
           let valueColorMap: Record<string, string> | undefined;
@@ -435,6 +452,7 @@ const LogsFacetSidebar: FunctionComponent<LogsFacetSidebarProps> = (
                 isHideable: isHideableFacetKey(key),
                 emptyStateNoun: getResourceFacetDefinition(key)?.pluralLabel,
                 searchedAtArrivalText: facetSearch.searchedAtArrivalByKey[key],
+                isScoped: props.onlyShowValuesInScope,
               })}
             />
           );