feat(): pr feedback

packages/common/src/core/HubItemEntity.ts

@@ -41,7 +41,6 @@ import { AssociationType, IAssociationInfo } from "../associations/types";
 import { listAssociations } from "../associations/listAssociations";
 import { addAssociation } from "../associations/addAssociation";
 import { removeAssociation } from "../associations/removeAssociation";
-import { IEntitySetting, IWithEntitySettings } from "..";
 
 const FEATURED_IMAGE_FILENAME = "featuredImage.png";
 
@@ -57,10 +56,8 @@ export abstract class HubItemEntity<T extends IHubItemEntity>
     IWithPermissionBehavior,
     IWithDiscussionsBehavior,
     IWithFollowersBehavior,
-    IWithAssociationBehavior,
-    IWithEntitySettings
+    IWithAssociationBehavior
 {
-  entitySettings: Omit<IEntitySetting, "id"> & { id?: string };
   protected context: IArcGISContext;
   protected entity: T;
   protected isDestroyed: boolean = false;

packages/common/src/core/traits/IWithDiscussionsSettings.ts

@@ -1,8 +1,9 @@
+import { IWithEntitySettings } from "./IWithEntitySettings";
 import { IDiscussionsSettings } from "../../discussions";
 
 /**
- * Discussions-related settings
+ * Discussions-related entity settings
  */
-export interface IWithDiscussionsSettings {
+export interface IWithDiscussionsSettings extends IWithEntitySettings {
   discussionSettings: IDiscussionsSettings;
 }

packages/common/src/core/traits/IWithEntitySettings.ts

@@ -1,10 +1,6 @@
-import { IEntitySetting } from "../../discussions";
-
 /**
  * Entity settings
  */
 export interface IWithEntitySettings {
-  entitySettings: Omit<IEntitySetting, "id"> & {
-    id?: string;
-  };
+  entitySettingsId?: string;
 }

packages/common/src/core/traits/index.ts

@@ -6,5 +6,4 @@ export * from "./IWithPermissions";
 export * from "./IWithCatalog";
 export * from "./IWithViewSettings";
 export * from "./IWithDiscussions";
-export * from "./IWithEntitySettings";
 export * from "./IWithDiscussionsSettings";

packages/common/src/discussions/HubDiscussion.ts

@@ -74,7 +74,10 @@ export class HubDiscussion
     context: IArcGISContext
   ): Promise<HubDiscussion> {
     try {
-      const entity = await fetchDiscussion(identifier, context.requestOptions);
+      const entity = await fetchDiscussion(
+        identifier,
+        context.hubRequestOptions
+      );
       // create an instance of HubDiscussion from the entity
       return HubDiscussion.fromJson(entity, context);
     } catch (ex) {
@@ -123,14 +126,14 @@ export class HubDiscussion
       // update it
       this.entity = await updateDiscussion(
         this.entity,
-        this.context.userRequestOptions
+        this.context.hubRequestOptions
       );
     } else {
       const { createDiscussion } = await import("./edit");
       // create it
       this.entity = await createDiscussion(
         this.entity,
-        this.context.userRequestOptions
+        this.context.hubRequestOptions
       );
     }
 
@@ -152,7 +155,7 @@ export class HubDiscussion
     const { deleteDiscussion } = await import("./edit");
     this.isDestroyed = true;
     // Delegate to module fn
-    await deleteDiscussion(this.entity.id, this.context.userRequestOptions);
+    await deleteDiscussion(this.entity.id, this.context.hubRequestOptions);
   }
 
   /*

packages/common/src/discussions/_internal/getPropertyMap.ts

@@ -21,8 +21,12 @@ export function getPropertyMap(): IPropertyMap[] {
     storeKey: "item.properties.location",
   });
   map.push({
-    entityKey: "entitySettings.settings.discussions",
-    storeKey: "discussionSettings",
+    entityKey: "discussionSettings",
+    storeKey: "entitySettings.settings.discussions",
+  });
+  map.push({
+    entityKey: "entitySettingsId",
+    storeKey: "entitySettings.id",
   });
   return map;
 }

packages/common/src/discussions/edit.ts

@@ -1,10 +1,9 @@
-import { IUserRequestOptions } from "@esri/arcgis-rest-auth";
 import { IUserItemOptions, removeItem } from "@esri/arcgis-rest-portal";
 import { IHubDiscussion } from "../core/types";
 import { createModel, getModel, updateModel } from "../models";
 import { constructSlug, getUniqueSlug, setSlugKeyword } from "../items/slugs";
 import {
-  EntitySettingType,
+  IHubRequestOptions,
   IModel,
   cloneObject,
   createSetting,
@@ -17,6 +16,7 @@ import { getPropertyMap } from "./_internal/getPropertyMap";
 import { computeProps } from "./_internal/computeProps";
 import { DEFAULT_DISCUSSION, DEFAULT_DISCUSSION_MODEL } from "./defaults";
 import { getDefaultEntitySettings } from "../utils/internal/getDefaultEntitySettings";
+import { IUserRequestOptions } from "@esri/arcgis-rest-auth";
 
 /**
  * @private
@@ -30,7 +30,7 @@ import { getDefaultEntitySettings } from "../utils/internal/getDefaultEntitySett
  */
 export async function createDiscussion(
   partialDiscussion: Partial<IHubDiscussion>,
-  requestOptions: IUserRequestOptions
+  requestOptions: IHubRequestOptions
 ): Promise<IHubDiscussion> {
   // merge incoming with the default
   // this expansion solves the typing somehow
@@ -54,16 +54,6 @@ export async function createDiscussion(
     discussion.typeKeywords,
     discussion.isDiscussable
   );
-  // initialize discussion settings
-  discussion.discussionSettings = await createSetting({
-    data: {
-      id: discussion.id,
-      type: EntitySettingType.CONTENT,
-      settings: getDefaultEntitySettings(EntitySettingType.CONTENT),
-    },
-  }).then((result) => {
-    return result.settings.discussions;
-  });
   // Map discussion object onto a default discussion Model
   const mapper = new PropertyMapper<Partial<IHubDiscussion>, IModel>(
     getPropertyMap()
@@ -74,7 +64,20 @@ export async function createDiscussion(
     cloneObject(DEFAULT_DISCUSSION_MODEL)
   );
   // create the item
-  model = await createModel(model, requestOptions);
+  model = await createModel(model, requestOptions as IUserRequestOptions);
+  const defaultSettings = getDefaultEntitySettings("discussion");
+  // create the entity settings
+  model.entitySettings = await createSetting({
+    data: {
+      id: model.item.id,
+      type: defaultSettings.type,
+      settings: {
+        ...defaultSettings.settings,
+        ...discussion.discussionSettings,
+      },
+    },
+    ...requestOptions,
+  });
   // map the model back into a IHubDiscussion
   let newDiscussion = mapper.storeToEntity(model, {});
   newDiscussion = computeProps(model, newDiscussion, requestOptions);
@@ -91,7 +94,7 @@ export async function createDiscussion(
  */
 export async function updateDiscussion(
   discussion: IHubDiscussion,
-  requestOptions: IUserRequestOptions
+  requestOptions: IHubRequestOptions
 ): Promise<IHubDiscussion> {
   // verify that the slug is unique, excluding the current discussion
   discussion.slug = await getUniqueSlug(
@@ -113,29 +116,41 @@ export async function updateDiscussion(
   // but this is where we would apply that sort of logic
   const modelToUpdate = mapper.entityToStore(discussion, model);
   // update the backing item
-  const updatedModel = await updateModel(modelToUpdate, requestOptions);
+  const updatedModel = await updateModel(
+    modelToUpdate,
+    requestOptions as IUserRequestOptions
+  );
   // now map back into a discussion and return that
   let updatedDiscussion = mapper.storeToEntity(updatedModel, discussion);
   updatedDiscussion = computeProps(model, updatedDiscussion, requestOptions);
-  if (updatedDiscussion.discussionSettings) {
+  if (updatedDiscussion.entitySettingsId) {
     updateSetting({
-      id: updatedDiscussion.id,
+      id: updatedDiscussion.entitySettingsId,
       data: {
         settings: {
           discussions: updatedDiscussion.discussionSettings,
         },
       },
+      ...requestOptions,
     });
   } else {
-    updatedDiscussion.discussionSettings = await createSetting({
+    const defaultSettings = getDefaultEntitySettings("discussion");
+    const entitySettings = await createSetting({
       data: {
         id: updatedDiscussion.id,
-        type: EntitySettingType.CONTENT,
-        settings: getDefaultEntitySettings(EntitySettingType.CONTENT),
+        type: defaultSettings.type,
+        settings: {
+          ...defaultSettings.settings,
+          discussions: {
+            ...defaultSettings.settings.discussions,
+            ...updatedDiscussion.discussionSettings,
+          },
+        },
       },
-    }).then((result) => {
-      return result.settings.discussions;
+      ...requestOptions,
     });
+    updatedDiscussion.entitySettingsId = entitySettings.id;
+    updatedDiscussion.discussionSettings = entitySettings.settings.discussions;
   }
   // the casting is needed because modelToObject returns a `Partial<T>`
   // where as this function returns a `T`
@@ -151,12 +166,14 @@ export async function updateDiscussion(
  */
 export async function deleteDiscussion(
   id: string,
-  requestOptions: IUserRequestOptions
+  requestOptions: IHubRequestOptions
 ): Promise<void> {
-  removeSetting({ id }).catch(() => {
-    // surpressing error...
-  });
   const ro = { ...requestOptions, ...{ id } } as IUserItemOptions;
   await removeItem(ro);
+  try {
+    removeSetting({ id, ...requestOptions });
+  } catch (e) {
+    // suppress error
+  }
   return;
 }