Revert "feat: add IHubOrganization with fetch and hubSearch support (#…

…1808)"

This reverts commit ef89d09.

packages/common/src/content/get-family.ts

@@ -52,9 +52,6 @@ export function getFamily(type: string) {
     case "hub initiative":
       family = "initiative";
       break;
-    case "organization":
-      family = "organization";
-      break;
     default:
       // by default derive from collection
       family = collectionToFamily(getCollection(type));

packages/common/src/core/fetchHubEntity.ts

@@ -13,7 +13,6 @@ import { fetchInitiativeTemplate } from "../initiative-templates/fetch";
 import { fetchSurvey } from "../surveys/fetch";
 import { fetchEvent } from "../events/fetch";
 import { convertUserToHubUser, fetchHubUser } from "../users";
-import { fetchOrganization } from "../org/fetch";
 
 /**
  * Fetch a Hub entity by identifier (id or slug)
@@ -59,9 +58,6 @@ export async function fetchHubEntity(
     case "event":
       result = await fetchEvent(identifier, context.hubRequestOptions);
       break;
-    case "organization":
-      result = await fetchOrganization(identifier, context.requestOptions);
-      break;
     case "initiativeTemplate":
       result = await fetchInitiativeTemplate(
         identifier,

packages/common/src/core/types/HubEntity.ts

@@ -8,17 +8,15 @@ import { IHubTemplate } from "./IHubTemplate";
 import { IHubSurvey } from "./IHubSurvey";
 import { IHubEvent } from "./IHubEvent";
 import { IHubUser } from "./IHubUser";
-import { IHubOrganization } from "../..";
 
 export type HubEntity =
+  | IHubSite
+  | IHubProject
   | IHubDiscussion
-  | IHubEvent
-  | IHubGroup
   | IHubInitiative
-  | IHubOrganization
   | IHubPage
-  | IHubProject
-  | IHubSite
-  | IHubSurvey
+  | IHubGroup
   | IHubTemplate
+  | IHubSurvey
+  | IHubEvent
   | IHubUser;

packages/common/src/core/types/HubEntityType.ts

@@ -5,8 +5,7 @@ export const HUB_ENTITY_TYPES = [
   "group",
   "initiative",
   "initiativeTemplate",
-  "org", // TODO: Remove at next breaking change
-  "organization",
+  "org",
   "page",
   "project",
   "site",

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

@@ -19,7 +19,6 @@ export * from "./IHubItemEntity";
 export * from "./IHubLayout";
 export * from "./IHubLocation";
 export * from "./IHubMapSettings";
-export * from "./IHubOrganization";
 export * from "./IHubPage";
 export * from "./IHubProject";
 export * from "./IHubTemplate";

packages/common/src/discussions/api/settings/getDefaultEntitySettings.ts

@@ -22,7 +22,6 @@ const DEFAULT_ENTITY_SETTINGS_BY_ENTITY_TYPE: Record<
   initiativeTemplate: null,
   page: null,
   content: null,
-  organization: null,
   org: null,
   group: null,
   template: null,

packages/common/src/org/index.ts

@@ -1,3 +1,2 @@
 export * from "./fetch-org";
 export * from "./fetchOrgLimits";
-export * from "./fetch";

packages/common/src/search/hubSearch.ts

@@ -20,7 +20,6 @@ import { hubSearchItems } from "./_internal/hubSearchItems";
 import { hubSearchChannels } from "./_internal/hubSearchChannels";
 import { hubSearchEvents } from "./_internal/hubSearchEvents";
 import { hubSearchEventAttendees } from "./_internal/hubSearchEventAttendees";
-import { portalFetchOrgs } from "./_internal/portalFetchOrgs";
 
 /**
  * Main entrypoint for searching via Hub
@@ -84,7 +83,6 @@ export async function hubSearch(
       portalUser: searchPortalUsers,
       communityUser: searchCommunityUsers,
       groupMember: portalSearchGroupMembers,
-      organization: portalFetchOrgs,
     },
     "arcgis-hub": {
       item: hubSearchItems,

packages/common/src/search/types/IHubCatalog.ts

@@ -97,7 +97,6 @@ export const targetEntities = [
   "channel",
   "discussionPost",
   "eventAttendee",
-  "organization",
 ] as const;
 export type EntityType = (typeof targetEntities)[number];
 

packages/common/src/search/utils.ts

@@ -319,13 +319,12 @@ export function getScopeGroupPredicate(scope: IQuery): IPredicate {
  * @returns
  */
 export function getGroupPredicate(query: IQuery): IPredicate {
-  const predicate = "group";
   const expandedQuery = expandQuery(query);
-  const isTargetPredicate = (p: IPredicate) => !!p[predicate];
-  const filter = expandedQuery.filters.find((f) =>
-    f.predicates.find(isTargetPredicate)
+  const isGroupPredicate = (predicate: IPredicate) => !!predicate.group;
+  const groupFilter = expandedQuery.filters.find((f) =>
+    f.predicates.find(isGroupPredicate)
   );
-  return filter && filter.predicates.find(isTargetPredicate);
+  return groupFilter && groupFilter.predicates.find(isGroupPredicate);
 }
 
 /**

packages/common/src/types.ts

@@ -192,7 +192,6 @@ export const HubFamilies = [
   "channel",
   "discussion",
   "eventAttendee",
-  "organization",
 ] as const;
 
 /**

packages/common/test/content/get-family.test.ts

@@ -1,4 +1,4 @@
-import { getFamily, getFamilyTypes } from "../../src";
+import { getFamilyTypes } from "../../src";
 
 describe("getFamily", () => {
   beforeAll(() => {
@@ -91,11 +91,4 @@ describe("getFamily", () => {
       expect(types).toBeUndefined();
     });
   });
-
-  describe("getFamily", () => {
-    it("can get types any other valid family", () => {
-      const type = getFamily("organization");
-      expect(type).toBe("organization");
-    });
-  });
 });