Merge branch 'main' into jeffdaley/author-link-query-param

web/app/components/dashboard/recently-viewed/item.ts

@@ -105,7 +105,7 @@ export default class DashboardRecentlyViewedItemComponent extends Component<Dash
   /**
    * The modified time of the item, whether it's a document or a project.
    */
-  protected get modifiedTime(): number {
+  protected get modifiedTime(): number | undefined {
     if (this.itemIsDoc) {
       return this.doc.modifiedTime || this.doc.createdTime;
     } else {

web/app/components/document/sidebar.hbs

@@ -292,6 +292,7 @@
       {{! Related resources }}
       <div>
         <Document::Sidebar::RelatedResources
+          @docWasCreatedOffApp={{not @document.appCreated}}
           @editingIsDisabled={{this.editingIsDisabled}}
           @documentIsDraft={{this.isDraft}}
           @productArea={{@document.product}}

web/app/components/document/sidebar/related-resources.hbs

@@ -13,6 +13,8 @@
       @title={{@headerTitle}}
       @titleTooltipText={{this.titleTooltipText}}
       @buttonIsHidden={{this.sectionHeaderButtonIsHidden}}
+      @buttonIsDisabled={{@docWasCreatedOffApp}}
+      @disabledButtonTooltipText="Only docs created in Hermes can add related resources"
       @buttonAction={{rr.showModal}}
     />
   </:header>

web/app/components/document/sidebar/related-resources.ts

@@ -5,10 +5,9 @@ import { inject as service } from "@ember/service";
 import FetchService from "hermes/services/fetch";
 import ConfigService from "hermes/services/config";
 import AlgoliaService from "hermes/services/algolia";
-import { restartableTask, task, timeout } from "ember-concurrency";
+import { restartableTask, task } from "ember-concurrency";
 import { next, schedule } from "@ember/runloop";
 import htmlElement from "hermes/utils/html-element";
-import Ember from "ember";
 import {
   RelatedExternalLink,
   RelatedHermesDocument,
@@ -32,6 +31,7 @@ export interface DocumentSidebarRelatedResourcesComponentArgs {
   itemLimit?: number;
   modalInputPlaceholder: string;
   documentIsDraft?: boolean;
+  docWasCreatedOffApp?: boolean;
   editingIsDisabled?: boolean;
   scrollContainer: HTMLElement;
 }
@@ -208,6 +208,8 @@ export default class DocumentSidebarRelatedResourcesComponent extends Component<
    * On error, triggers the "retry" design.
    */
   protected loadRelatedResources = task(async () => {
+    if (this.args.docWasCreatedOffApp) return;
+
     try {
       const resources = await this.fetchSvc
         .fetch(

web/app/components/related-resources.ts

@@ -30,7 +30,7 @@ export interface RelatedHermesDocument {
   title: string;
   documentType: string;
   documentNumber: string;
-  createdTime: number;
+  createdTime?: number;
   modifiedTime: number;
   sortOrder: number;
   product: string;

web/app/helpers/time-ago.ts

@@ -3,7 +3,7 @@ import timeAgo from "hermes/utils/time-ago";
 
 export interface TimeAgoHelperSignature {
   Args: {
-    Positional: [time: number];
+    Positional: [time?: number];
     Named: {
       limitTo24Hours?: boolean;
     };

web/app/styles/routes/my.scss

@@ -1,7 +1,7 @@
 .my {
   .hds-table {
     td {
-      @apply h-12 py-0 pr-10;
+      @apply py-0 pr-10;
 
       > .inner {
         @apply overflow-hidden;

web/app/types/document.d.ts

@@ -13,8 +13,9 @@ export interface HermesDocument {
 
   /**
    * A timestamp in seconds. Used for sorting.
+   * Undefined when the doc was created off-app.
    */
-  createdTime: number;
+  createdTime?: number;
 
   /**
    * A timestamp in seconds. Used Translated by the `time-ago` helper

web/app/utils/time-ago.ts

@@ -6,11 +6,13 @@ import parseDate from "./parse-date";
  * Used throughout the app to format document metadata.
  */
 export default function timeAgo(
-  timeInSeconds: number,
+  timeInSeconds?: number,
   options?: {
     limitTo24Hours?: boolean;
   },
 ) {
+  if (!timeInSeconds) return "Unknown date";
+
   const now = Date.now();
   const before = new Date(timeInSeconds * 1000).getTime();
   const elapsed = now - before;

web/tests/acceptance/authenticated/document-test.ts

@@ -101,7 +101,8 @@ const PEOPLE_SELECT_REMOVE_BUTTON_SELECTOR =
   ".ember-power-select-multiple-remove-btn";
 
 const PROJECT_LINK = "[data-test-project-link]";
-const ADD_TO_PROJECT_BUTTON = "[data-test-projects-section-header] button";
+const ADD_TO_PROJECT_BUTTON =
+  "[data-test-section-header-button-for='Projects']";
 const ADD_TO_PROJECT_MODAL = "[data-test-add-to-or-create-project-modal]";
 const PROJECT_OPTION = "[data-test-project-option]";
 
@@ -1121,10 +1122,12 @@ module("Acceptance | authenticated/document", function (hooks) {
     assert
       .dom(`${APPROVERS_SELECTOR} ${EDITABLE_FIELD_READ_VALUE}`)
       .exists("read-only approvers list");
+
     assert
-      .dom(ADD_RELATED_DOCUMENT_OPTION_SELECTOR)
-      .doesNotExist("no add related resource option");
+      .dom(ADD_RELATED_RESOURCE_BUTTON_SELECTOR)
+      .hasAttribute("aria-disabled");
 
+    assert.dom(ADD_TO_PROJECT_BUTTON).hasAttribute("aria-disabled");
     assert.dom(PRODUCT_SELECT_SELECTOR).doesNotExist("no product select");
     assert.dom(DRAFT_VISIBILITY_TOGGLE_SELECTOR).isDisabled();
 

web/tests/unit/utils/time-ago-test.ts

@@ -13,6 +13,7 @@ module("Unit | Utility | time-ago", function () {
     assert.equal("1 minute ago", timeAgo(now - 60));
     assert.equal("5 minutes ago", timeAgo(now - 300));
     assert.equal("6 hours ago", timeAgo(now - 21600));
+    assert.equal("Unknown date", timeAgo(undefined));
 
     assert.equal("2 months ago", timeAgo(now - 5184000));