fix(hub-discussions): remove files/fns that were duplicated between h… (

#1743)
Esri · Nov 19, 2024 · 04a7067 · 04a7067
1 parent 12b1ce9
commit 04a7067
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 398 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/discussions/package.json b/packages/discussions/package.json
@@ -13,10 +13,10 @@
   "peerDependencies": {
     "@esri/arcgis-rest-auth": "^2.14.0 || 3",
     "@esri/arcgis-rest-request": "^2.14.0 || 3",
-    "@esri/hub-common": "^15.0.0"
+    "@esri/hub-common": "^15.7.1"
   },
   "devDependencies": {
-    "@esri/hub-common": "^15.0.0",
+    "@esri/hub-common": "^15.7.1",
     "@types/geojson": "^7946.0.7",
     "typescript": "^3.8.1"
   },

diff --git a/packages/discussions/src/channels/channels.ts b/packages/discussions/src/channels/channels.ts
@@ -1,4 +1,4 @@
-import { request } from "../request";
+import { discussionsApiRequest } from "@esri/hub-common";
 import {
   ICreateChannelParams,
   IFetchChannelParams,
@@ -28,7 +28,7 @@ export function createChannel(
   options: ICreateChannelParams
 ): Promise<IChannel> {
   options.httpMethod = "POST";
-  return request(`/channels`, options);
+  return discussionsApiRequest(`/channels`, options);
 }
 
 /**
@@ -40,7 +40,7 @@ export function createChannel(
  */
 export function fetchChannel(options: IFetchChannelParams): Promise<IChannel> {
   options.httpMethod = "GET";
-  return request(`/channels/${options.channelId}`, options);
+  return discussionsApiRequest(`/channels/${options.channelId}`, options);
 }
 
 /**
@@ -56,7 +56,7 @@ export function updateChannel(
   options: IUpdateChannelParams
 ): Promise<IChannel> {
   options.httpMethod = "PATCH";
-  return request(`/channels/${options.channelId}`, options);
+  return discussionsApiRequest(`/channels/${options.channelId}`, options);
 }
 
 /**
@@ -70,7 +70,7 @@ export function removeChannel(
   options: IRemoveChannelParams
 ): Promise<IRemoveChannelResponse> {
   options.httpMethod = "DELETE";
-  return request(`/channels/${options.channelId}`, options);
+  return discussionsApiRequest(`/channels/${options.channelId}`, options);
 }
 
 /**
@@ -84,7 +84,7 @@ export function fetchChannelNotifcationOptOut(
   options: IFetchChannelNotificationOptOutParams
 ): Promise<IChannelNotificationOptOut> {
   options.httpMethod = "GET";
-  return request(
+  return discussionsApiRequest(
     `/channels/${options.channelId}/notifications/opt-out`,
     options
   );
@@ -101,7 +101,7 @@ export function createChannelNotificationOptOut(
   options: ICreateChannelNotificationOptOutParams
 ): Promise<IChannelNotificationOptOut> {
   options.httpMethod = "POST";
-  return request(
+  return discussionsApiRequest(
     `/channels/${options.channelId}/notifications/opt-out`,
     options
   );
@@ -118,7 +118,7 @@ export function removeChannelNotificationOptOut(
   options: IRemoveChannelNotificationOptOutParams
 ): Promise<IRemoveChannelNotificationOptOutResult> {
   options.httpMethod = "DELETE";
-  return request(
+  return discussionsApiRequest(
     `/channels/${options.channelId}/notifications/opt-out`,
     options
   );
@@ -135,5 +135,8 @@ export function removeChannelActivity(
   options: IRemoveChannelActivityParams
 ): Promise<IRemoveChannelActivityResult> {
   options.httpMethod = "DELETE";
-  return request(`/channels/${options.channelId}/activity`, options);
+  return discussionsApiRequest(
+    `/channels/${options.channelId}/activity`,
+    options
+  );
 }
diff --git a/packages/discussions/src/posts/posts.ts b/packages/discussions/src/posts/posts.ts
@@ -1,5 +1,5 @@
 /* tslint:disable unified-signatures */
-import { request } from "../request";
+import { discussionsApiRequest } from "@esri/hub-common";
 import {
   ICreatePostParams,
   ICreateReplyParams,
@@ -35,7 +35,7 @@ export function searchPosts(
         : acc,
     { ...(options.data ?? {}) } as any
   );
-  return request(url, {
+  return discussionsApiRequest(url, {
     ...options,
     data,
     httpMethod: "GET",
@@ -51,7 +51,7 @@ export function searchPosts(
  */
 export function createPost(options: ICreatePostParams): Promise<IPost> {
   const url = `/posts`;
-  return request(url, {
+  return discussionsApiRequest(url, {
     httpMethod: "POST",
     ...getCreateUpdateRequestParams(options),
   });
@@ -67,7 +67,7 @@ export function createPost(options: ICreatePostParams): Promise<IPost> {
  */
 export function createReply(options: ICreateReplyParams): Promise<IPost> {
   const url = `/posts/${options.postId}/reply`;
-  return request(url, {
+  return discussionsApiRequest(url, {
     httpMethod: "POST",
     ...getCreateUpdateRequestParams(options),
   });
@@ -83,7 +83,7 @@ export function createReply(options: ICreateReplyParams): Promise<IPost> {
 export function fetchPost(params: IFetchPostParams): Promise<IPost> {
   const url = `/posts/${params.postId}`;
   params.httpMethod = "GET";
-  return request(url, params);
+  return discussionsApiRequest(url, params);
 }
 
 /**
@@ -98,7 +98,7 @@ export function removePost(
 ): Promise<IRemovePostResponse> {
   const url = `/posts/${options.postId}`;
   options.httpMethod = "DELETE";
-  return request(url, options);
+  return discussionsApiRequest(url, options);
 }
 
 /**
@@ -111,7 +111,7 @@ export function removePost(
  */
 export function updatePost(options: IUpdatePostParams): Promise<IPost> {
   const url = `/posts/${options.postId}`;
-  return request(url, {
+  return discussionsApiRequest(url, {
     httpMethod: "PATCH",
     ...getCreateUpdateRequestParams(options),
   });
@@ -130,7 +130,7 @@ export function updatePostStatus(
 ): Promise<IPost> {
   const url = `/posts/${options.postId}/status`;
   options.httpMethod = "PATCH";
-  return request(url, options);
+  return discussionsApiRequest(url, options);
 }
 
 /**

diff --git a/packages/discussions/src/reactions/reactions.ts b/packages/discussions/src/reactions/reactions.ts
@@ -1,4 +1,4 @@
-import { request } from "../request";
+import { discussionsApiRequest } from "@esri/hub-common";
 import {
   ICreateReactionOptions,
   IRemoveReactionOptions,
@@ -17,7 +17,7 @@ export function createReaction(
   options: ICreateReactionOptions
 ): Promise<IReaction> {
   options.httpMethod = "POST";
-  return request(`/reactions`, options);
+  return discussionsApiRequest(`/reactions`, options);
 }
 
 /**
@@ -32,5 +32,5 @@ export function removeReaction(
 ): Promise<IRemoveReactionResponse> {
   const { reactionId } = options;
   options.httpMethod = "DELETE";
-  return request(`/reactions/${reactionId}`, options);
+  return discussionsApiRequest(`/reactions/${reactionId}`, options);
 }
diff --git a/packages/discussions/src/request.ts b/packages/discussions/src/request.ts