@isrd-isi-edu/ermrestjs 2.7.0 → 2.9.0

package/src/models/reference-column/key-pseudo-column.ts

@@ -7,7 +7,7 @@ import { Reference, Tuple } from '@isrd-isi-edu/ermrestjs/src/models/reference';
 
 // utils
 import { renderMarkdown } from '@isrd-isi-edu/ermrestjs/src/utils/markdown-utils';
-import { isStringAndNotEmpty } from '@isrd-isi-edu/ermrestjs/src/utils/type-utils';
+import { isValidVisibleCellHeight, isStringAndNotEmpty } from '@isrd-isi-edu/ermrestjs/src/utils/type-utils';
 import { buildSelfTemplateVariables } from '@isrd-isi-edu/ermrestjs/src/utils/template-utils';
 
 // legacy
@@ -227,6 +227,10 @@ export class KeyPseudoColumn extends ReferenceColumn {
         sourceDisplay.hideColumnHeader = this.sourceObject.hide_column_header;
       }
 
+      if (this.sourceObject && isValidVisibleCellHeight(this.sourceObject.visible_cell_height)) {
+        sourceDisplay.visibleCellHeight = this.sourceObject.visible_cell_height;
+      }
+
       Object.assign(res, keyDisplay, sourceDisplay);
       this._display_cached = res;
     }

package/src/models/reference-column/reference-column.ts

@@ -12,7 +12,12 @@ import $log from '@isrd-isi-edu/ermrestjs/src/services/logger';
 
 // utils
 import { renderMarkdown } from '@isrd-isi-edu/ermrestjs/src/utils/markdown-utils';
-import { isObjectAndKeyExists, isObjectAndNotNull, isStringAndNotEmpty } from '@isrd-isi-edu/ermrestjs/src/utils/type-utils';
+import {
+  isValidVisibleCellHeight,
+  isObjectAndKeyExists,
+  isObjectAndNotNull,
+  isStringAndNotEmpty,
+} from '@isrd-isi-edu/ermrestjs/src/utils/type-utils';
 import { _annotations, _contexts } from '@isrd-isi-edu/ermrestjs/src/utils/constants';
 import { buildSelfTemplateVariables } from '@isrd-isi-edu/ermrestjs/src/utils/template-utils';
 import ActiveListCondition from '@isrd-isi-edu/ermrestjs/src/models/active-list-condition';
@@ -385,6 +390,10 @@ export class ReferenceColumn {
         sourceDisplay.hideColumnHeader = this.sourceObject.hide_column_header;
       }
 
+      if (this.sourceObject && isValidVisibleCellHeight(this.sourceObject.visible_cell_height)) {
+        sourceDisplay.visibleCellHeight = this.sourceObject.visible_cell_height;
+      }
+
       // Using assign to avoid changing the original colDisplay
       Object.assign(res, colDisplay, sourceDisplay);
       this._display_cached = res;

package/src/services/handlebars.ts

@@ -12,11 +12,11 @@ import {
   _addErmrestVarsToTemplate,
   _addTemplateVars,
   _escapeMarkdownCharacters,
-  _formatUtils,
   _getPath,
   encodeFacet,
   encodeFacetString,
 } from '@isrd-isi-edu/ermrestjs/js/utils/helpers';
+import { _formatUtils } from '@isrd-isi-edu/ermrestjs/src/utils/format-utils';
 import AuthnService from '@isrd-isi-edu/ermrestjs/src/services/authn';
 import { isObjectAndNotNull } from '@isrd-isi-edu/ermrestjs/src/utils/type-utils';
 import { fixedEncodeURIComponent } from '@isrd-isi-edu/ermrestjs/src/utils/value-utils';
@@ -403,6 +403,28 @@ export default class HandlebarsService {
         return _formatUtils.humanizeBytes(value, mode, precision, tooltip);
       },
 
+      /**
+       * {{datetimeDuration start end}}
+       * {{datetimeDuration start end unit="month"}}
+       * {{datetimeDuration start end unit="auto" fraction=2}}
+       * {{datetimeDuration start end unit="multi"}}
+       * {{datetimeDuration start end unit="calendar"}}
+       * {{datetimeDuration start end direction="before/after"}}
+       * {{datetimeDuration start end unit="month" tooltip=true}}
+       * @ignore
+       * @returns human-readable duration between `start` and `end`
+       */
+      datetimeDuration: function (start: any, end: any, options: Handlebars.HelperOptions) {
+        let unit, fraction, direction, tooltip;
+        if (options && isObjectAndNotNull(options.hash)) {
+          unit = options.hash.unit;
+          fraction = options.hash.fraction;
+          direction = options.hash.direction;
+          tooltip = options.hash.tooltip;
+        }
+        return _formatUtils.datetimeDuration(start, end, unit, fraction, direction, tooltip);
+      },
+
       /**
        * {{stringLength value }}
        * @ignore

package/src/utils/column-utils.ts

@@ -18,12 +18,12 @@ import { isDefinedAndNotNull } from '@isrd-isi-edu/ermrestjs/src/utils/type-util
 
 // legacy
 import {
-  _formatUtils,
   _generateRowPresentation,
   _getRowTemplateVariables,
   _processColumnOrderList,
   _renderTemplate,
 } from '@isrd-isi-edu/ermrestjs/js/utils/helpers';
+import { _formatUtils } from '@isrd-isi-edu/ermrestjs/src/utils/format-utils';
 
 /**
  * Convert the raw value of an aggregate column to a formatted value.

package/src/utils/constants.ts

@@ -286,6 +286,7 @@ export const _handlebarsHelpersList = [
   'toTitleCase',
   'replace',
   'humanizeBytes',
+  'datetimeDuration',
   'printf',
   'stringLength',
   'isUserInAcl',
@@ -529,6 +530,83 @@ export const _sourceProperties = Object.freeze({
 
 export const _exportKnownAPIs = ['entity', 'attribute', 'attributegroup', 'aggregate'];
 
+/**
+ * Named constants for the `unit` argument of `datetimeDuration`. Source of
+ * truth for valid unit values — `_datetimeDuration.VALID_UNITS` and
+ * `UNIT_ORDER` are derived from this object below.
+ *
+ * Includes the three pseudo-units (`AUTO`, `MULTI`, `CALENDAR`) alongside the
+ * seven real time units. Use `DurationRealUnit` for the real-unit subset.
+ */
+export const DURATION_UNIT = Object.freeze({
+  AUTO: 'auto',
+  MULTI: 'multi',
+  CALENDAR: 'calendar',
+  YEAR: 'year',
+  MONTH: 'month',
+  DAY: 'day',
+  HOUR: 'hour',
+  MINUTE: 'minute',
+  SECOND: 'second',
+  MILLISECOND: 'millisecond',
+} as const);
+export type DurationUnit = (typeof DURATION_UNIT)[keyof typeof DURATION_UNIT];
+
+/**
+ * Named constants for the `direction` argument of `datetimeDuration`. Source
+ * of truth for valid direction values — `_datetimeDuration.VALID_DIRECTIONS`
+ * is derived from this object below.
+ */
+export const DURATION_DIRECTION = Object.freeze({
+  SIGN: 'sign',
+  BEFORE_AFTER: 'before/after',
+  EARLIER_LATER: 'earlier/later',
+  UNSIGNED: 'unsigned',
+} as const);
+export type DurationDirection = (typeof DURATION_DIRECTION)[keyof typeof DURATION_DIRECTION];
+
+export const _datetimeDuration = Object.freeze({
+  // Real units in walking order (largest first). The source of truth for what
+  // counts as a "real" (non-pseudo) duration unit.
+  UNIT_ORDER: [
+    DURATION_UNIT.YEAR,
+    DURATION_UNIT.MONTH,
+    DURATION_UNIT.DAY,
+    DURATION_UNIT.HOUR,
+    DURATION_UNIT.MINUTE,
+    DURATION_UNIT.SECOND,
+    DURATION_UNIT.MILLISECOND,
+  ] as const,
+  ABBREVIATIONS: {
+    [DURATION_UNIT.YEAR]: 'Y',
+    [DURATION_UNIT.MONTH]: 'M',
+    [DURATION_UNIT.DAY]: 'D',
+    [DURATION_UNIT.HOUR]: 'h',
+    [DURATION_UNIT.MINUTE]: 'm',
+    [DURATION_UNIT.SECOND]: 's',
+    [DURATION_UNIT.MILLISECOND]: 'ms',
+  },
+  // Julian fixed-math constants (1Y = 365.25d, 1M = 365.25/12d).
+  // Self-consistent (12 * MONTH === YEAR), matches moment.js / date-fns / astronomy.
+  CONVERSION_RATES: {
+    [DURATION_UNIT.MILLISECOND]: 1,
+    [DURATION_UNIT.SECOND]: 1000,
+    [DURATION_UNIT.MINUTE]: 60 * 1000,
+    [DURATION_UNIT.HOUR]: 60 * 60 * 1000,
+    [DURATION_UNIT.DAY]: 24 * 60 * 60 * 1000,
+    [DURATION_UNIT.MONTH]: (365.25 / 12) * 24 * 60 * 60 * 1000, // 2,629,800,000
+    [DURATION_UNIT.YEAR]: 365.25 * 24 * 60 * 60 * 1000, // 31,557,600,000
+  },
+  VALID_UNITS: Object.values(DURATION_UNIT) as readonly DurationUnit[],
+  VALID_DIRECTIONS: Object.values(DURATION_DIRECTION) as readonly DurationDirection[],
+});
+
+/**
+ * The real (non-pseudo) subset of `DurationUnit`, derived from `UNIT_ORDER`
+ * so it stays in sync automatically.
+ */
+export type DurationRealUnit = (typeof _datetimeDuration.UNIT_ORDER)[number];
+
 export const FILTER_TYPES = Object.freeze({
   BINARYPREDICATE: 'BinaryPredicate',
   CONJUNCTION: 'Conjunction',