@streamoid/settings 0.8.0 → 0.8.1

package/dist/index.d.mts

@@ -876,7 +876,11 @@ interface SettingsApiAdapter {
         invitationId?: string;
     }) => Promise<void>;
     resendInvite: (invitationId: string) => Promise<void>;
-    /** CXO-only: promote one or more members to admin in a single call. */
+    /**
+     * @deprecated No longer called: `updateMemberRole` makes a member an admin by
+     * itself, and promoting first made that request fail. Kept so existing
+     * adapters still type-check.
+     */
     promoteAsAdmin?: (userIds: string[]) => Promise<void>;
     /** CXO-only: fetch granular per-user details (services, scopes, etc.). */
     getUserDetail?: (userId: string) => Promise<WorkspaceMember | null>;
@@ -1241,6 +1245,24 @@ declare function BillingContent({ embedded, showPlans: showPlansProp, onShowPlan
     onShowPerUserLimitsChange?: (open: boolean) => void;
 }): react__default.JSX.Element;
 
+/**
+ * The one `updateMemberRole` request that saving a member sends, or `null`
+ * when there is nothing to save.
+ *
+ * `change-user-role` makes a member an admin by itself (role, flags, and
+ * dropping their app and store grants), so nothing is sent before it. Calling
+ * `promoteAsAdmin` first made the user admin and then had this request refused
+ * with 403 "Already present as admin.".
+ *
+ * An admin kept as admin has no other field to change (the modal hides the
+ * permissions for an admin), so that save sends nothing.
+ */
+declare function memberRoleUpdate(current: {
+    userId: string;
+    role: UserPermissions["role"];
+}, permissions: UserPermissions, services: ServiceItem[]): ({
+    userId: string;
+} & MemberPermissionsPayload) | null;
 declare function TeamsContent({ embedded, onInviteOpen, onInviteOpenChange, workspaceName, workspaceImageUrl, organizationName, hiddenApps, }?: {
     embedded?: boolean;
     onInviteOpen?: boolean;
@@ -1757,4 +1779,4 @@ declare function SettingsAdaptersProvider({ adapters, children, }: {
  */
 declare function useSettingsAdapters(): SettingsAdapters;
 
-export { APP_KEYS, type ApiToken, type AppKey, type AvailableCreditsResponse, BillingContent, type BillingEventPayload, type BillingProduct, type BillingSubscription, BuyCreditsModal, type BuyCreditsPayload, type BuyCreditsResponse, ConfirmDeleteModal, ConfirmLeaveModal, type ConnectedApp, ConnectedAppsContent, type CreatedToken, type CreditCycleUnit, type CreditLimitValidation, type CustomCreditInfo, type CustomCreditResponse, DEFAULT_PERMISSIONS, DEFAULT_USER_LANGUAGE, ExportDateModal, InviteUpdateModal, type InvoicePdfResponse, type MemberCreditLimit, MemberCreditLimitModal, type MemberCreditLimitRow, type MemberCreditLimitSource, type MemberCreditLimitsResponse, MemberListFrame, type MemberListFrameProps, type MemberListTab, MemberListToolbar, type MemberListToolbarProps, type MemberPermissionsPayload, OrganizationContent, type OrganizationData, OrganizationIntegrationsContent, type OrganizationInvite, type OrganizationJoinRequest, type OrganizationJoinableWorkspace, type OrganizationMember, OrganizationMemberModal, type OrganizationMemberModalProps, OrganizationModal, type OrganizationView, type OrganizationWorkspaceItem, PerUserLimitsView, type Price, type PriceMetadata, type ProductsResponse, ProfileAvatar, ProfileTab, ReferralTab, SCOPE_LABELS, ScopeHeader, type ScopeHeaderProps, type ServiceItem, type SettingsAdapters, SettingsAdaptersProvider, type SettingsApiAdapter, type SettingsAuthAdapter, type SettingsAuthUser, SettingsContent, type SettingsContentProps, type SettingsImageUploadAdapter, type SettingsIntegrationsAdapter, type SettingsNavigationAdapter, type SettingsOrganizationAdapter, type SettingsOrganizationCurrent, type SettingsOrganizationListItem, type SettingsScope, type SettingsTab, type SettingsToastAdapter, SettingsTooltip, type SettingsTooltipPlacement, type SettingsTooltipProps, type SettingsWorkspaceAdapter, type SettingsWorkspaceCurrent, type SettingsWorkspaceListItem, SiconKey, type StoreItem, type SubscriptionPlan, type SubscriptionResponse, TAB_DESCRIPTIONS, TAB_LABELS, TAB_SCOPE, TAB_TO_URL, type TeamMember, TeamsContent, type TokenExpiry, TokensContent, URL_TO_TAB, USER_LANGUAGES, type UpdateSubscriptionPayload, type UpdateSubscriptionResponse, type UsageHistoryItem, type UsageHistoryResponse, type UserLanguage, type UserPermissions, WORKSPACE_LIST_PAGE_SIZE, type WorkspaceData, WorkspaceGeneralTab, type WorkspaceGeneralTabProps, type WorkspaceInvite, type WorkspaceListOrganization, WorkspaceListTab, type WorkspaceMember, WorkspaceModal, type WorkspaceOrganization, type WorkspaceOrganizationRequest, WorkspacePicker, type WorkspacePickerItem, type WorkspacePickerProps, WorkspaceTab, type WorkspaceUsageResponse, belowUsageReason, cleanCreditLimitInput, countLabel, creditCycleUnit, describeDefaultLimit, describeMemberLimit, formatCreditLimit, formatCredits, groupWorkspaceList, isLimitBelowUsage, joinMembersWithLimits, lastUsedLabel, limitBelowUsageUsed, limitSourceLabel, loadWorkspaceOrganization, minimumCreditLimit, resolveSettingsTabFromPath, roundCredits, useSettingsAdapters, useWorkspaceOrganization, userLanguageLabel, validateCreditLimitInput, validateDefaultCreditLimitInput };
+export { APP_KEYS, type ApiToken, type AppKey, type AvailableCreditsResponse, BillingContent, type BillingEventPayload, type BillingProduct, type BillingSubscription, BuyCreditsModal, type BuyCreditsPayload, type BuyCreditsResponse, ConfirmDeleteModal, ConfirmLeaveModal, type ConnectedApp, ConnectedAppsContent, type CreatedToken, type CreditCycleUnit, type CreditLimitValidation, type CustomCreditInfo, type CustomCreditResponse, DEFAULT_PERMISSIONS, DEFAULT_USER_LANGUAGE, ExportDateModal, InviteUpdateModal, type InvoicePdfResponse, type MemberCreditLimit, MemberCreditLimitModal, type MemberCreditLimitRow, type MemberCreditLimitSource, type MemberCreditLimitsResponse, MemberListFrame, type MemberListFrameProps, type MemberListTab, MemberListToolbar, type MemberListToolbarProps, type MemberPermissionsPayload, OrganizationContent, type OrganizationData, OrganizationIntegrationsContent, type OrganizationInvite, type OrganizationJoinRequest, type OrganizationJoinableWorkspace, type OrganizationMember, OrganizationMemberModal, type OrganizationMemberModalProps, OrganizationModal, type OrganizationView, type OrganizationWorkspaceItem, PerUserLimitsView, type Price, type PriceMetadata, type ProductsResponse, ProfileAvatar, ProfileTab, ReferralTab, SCOPE_LABELS, ScopeHeader, type ScopeHeaderProps, type ServiceItem, type SettingsAdapters, SettingsAdaptersProvider, type SettingsApiAdapter, type SettingsAuthAdapter, type SettingsAuthUser, SettingsContent, type SettingsContentProps, type SettingsImageUploadAdapter, type SettingsIntegrationsAdapter, type SettingsNavigationAdapter, type SettingsOrganizationAdapter, type SettingsOrganizationCurrent, type SettingsOrganizationListItem, type SettingsScope, type SettingsTab, type SettingsToastAdapter, SettingsTooltip, type SettingsTooltipPlacement, type SettingsTooltipProps, type SettingsWorkspaceAdapter, type SettingsWorkspaceCurrent, type SettingsWorkspaceListItem, SiconKey, type StoreItem, type SubscriptionPlan, type SubscriptionResponse, TAB_DESCRIPTIONS, TAB_LABELS, TAB_SCOPE, TAB_TO_URL, type TeamMember, TeamsContent, type TokenExpiry, TokensContent, URL_TO_TAB, USER_LANGUAGES, type UpdateSubscriptionPayload, type UpdateSubscriptionResponse, type UsageHistoryItem, type UsageHistoryResponse, type UserLanguage, type UserPermissions, WORKSPACE_LIST_PAGE_SIZE, type WorkspaceData, WorkspaceGeneralTab, type WorkspaceGeneralTabProps, type WorkspaceInvite, type WorkspaceListOrganization, WorkspaceListTab, type WorkspaceMember, WorkspaceModal, type WorkspaceOrganization, type WorkspaceOrganizationRequest, WorkspacePicker, type WorkspacePickerItem, type WorkspacePickerProps, WorkspaceTab, type WorkspaceUsageResponse, belowUsageReason, cleanCreditLimitInput, countLabel, creditCycleUnit, describeDefaultLimit, describeMemberLimit, formatCreditLimit, formatCredits, groupWorkspaceList, isLimitBelowUsage, joinMembersWithLimits, lastUsedLabel, limitBelowUsageUsed, limitSourceLabel, loadWorkspaceOrganization, memberRoleUpdate, minimumCreditLimit, resolveSettingsTabFromPath, roundCredits, useSettingsAdapters, useWorkspaceOrganization, userLanguageLabel, validateCreditLimitInput, validateDefaultCreditLimitInput };

package/dist/index.d.ts

@@ -876,7 +876,11 @@ interface SettingsApiAdapter {
         invitationId?: string;
     }) => Promise<void>;
     resendInvite: (invitationId: string) => Promise<void>;
-    /** CXO-only: promote one or more members to admin in a single call. */
+    /**
+     * @deprecated No longer called: `updateMemberRole` makes a member an admin by
+     * itself, and promoting first made that request fail. Kept so existing
+     * adapters still type-check.
+     */
     promoteAsAdmin?: (userIds: string[]) => Promise<void>;
     /** CXO-only: fetch granular per-user details (services, scopes, etc.). */
     getUserDetail?: (userId: string) => Promise<WorkspaceMember | null>;
@@ -1241,6 +1245,24 @@ declare function BillingContent({ embedded, showPlans: showPlansProp, onShowPlan
     onShowPerUserLimitsChange?: (open: boolean) => void;
 }): react__default.JSX.Element;
 
+/**
+ * The one `updateMemberRole` request that saving a member sends, or `null`
+ * when there is nothing to save.
+ *
+ * `change-user-role` makes a member an admin by itself (role, flags, and
+ * dropping their app and store grants), so nothing is sent before it. Calling
+ * `promoteAsAdmin` first made the user admin and then had this request refused
+ * with 403 "Already present as admin.".
+ *
+ * An admin kept as admin has no other field to change (the modal hides the
+ * permissions for an admin), so that save sends nothing.
+ */
+declare function memberRoleUpdate(current: {
+    userId: string;
+    role: UserPermissions["role"];
+}, permissions: UserPermissions, services: ServiceItem[]): ({
+    userId: string;
+} & MemberPermissionsPayload) | null;
 declare function TeamsContent({ embedded, onInviteOpen, onInviteOpenChange, workspaceName, workspaceImageUrl, organizationName, hiddenApps, }?: {
     embedded?: boolean;
     onInviteOpen?: boolean;
@@ -1757,4 +1779,4 @@ declare function SettingsAdaptersProvider({ adapters, children, }: {
  */
 declare function useSettingsAdapters(): SettingsAdapters;
 
-export { APP_KEYS, type ApiToken, type AppKey, type AvailableCreditsResponse, BillingContent, type BillingEventPayload, type BillingProduct, type BillingSubscription, BuyCreditsModal, type BuyCreditsPayload, type BuyCreditsResponse, ConfirmDeleteModal, ConfirmLeaveModal, type ConnectedApp, ConnectedAppsContent, type CreatedToken, type CreditCycleUnit, type CreditLimitValidation, type CustomCreditInfo, type CustomCreditResponse, DEFAULT_PERMISSIONS, DEFAULT_USER_LANGUAGE, ExportDateModal, InviteUpdateModal, type InvoicePdfResponse, type MemberCreditLimit, MemberCreditLimitModal, type MemberCreditLimitRow, type MemberCreditLimitSource, type MemberCreditLimitsResponse, MemberListFrame, type MemberListFrameProps, type MemberListTab, MemberListToolbar, type MemberListToolbarProps, type MemberPermissionsPayload, OrganizationContent, type OrganizationData, OrganizationIntegrationsContent, type OrganizationInvite, type OrganizationJoinRequest, type OrganizationJoinableWorkspace, type OrganizationMember, OrganizationMemberModal, type OrganizationMemberModalProps, OrganizationModal, type OrganizationView, type OrganizationWorkspaceItem, PerUserLimitsView, type Price, type PriceMetadata, type ProductsResponse, ProfileAvatar, ProfileTab, ReferralTab, SCOPE_LABELS, ScopeHeader, type ScopeHeaderProps, type ServiceItem, type SettingsAdapters, SettingsAdaptersProvider, type SettingsApiAdapter, type SettingsAuthAdapter, type SettingsAuthUser, SettingsContent, type SettingsContentProps, type SettingsImageUploadAdapter, type SettingsIntegrationsAdapter, type SettingsNavigationAdapter, type SettingsOrganizationAdapter, type SettingsOrganizationCurrent, type SettingsOrganizationListItem, type SettingsScope, type SettingsTab, type SettingsToastAdapter, SettingsTooltip, type SettingsTooltipPlacement, type SettingsTooltipProps, type SettingsWorkspaceAdapter, type SettingsWorkspaceCurrent, type SettingsWorkspaceListItem, SiconKey, type StoreItem, type SubscriptionPlan, type SubscriptionResponse, TAB_DESCRIPTIONS, TAB_LABELS, TAB_SCOPE, TAB_TO_URL, type TeamMember, TeamsContent, type TokenExpiry, TokensContent, URL_TO_TAB, USER_LANGUAGES, type UpdateSubscriptionPayload, type UpdateSubscriptionResponse, type UsageHistoryItem, type UsageHistoryResponse, type UserLanguage, type UserPermissions, WORKSPACE_LIST_PAGE_SIZE, type WorkspaceData, WorkspaceGeneralTab, type WorkspaceGeneralTabProps, type WorkspaceInvite, type WorkspaceListOrganization, WorkspaceListTab, type WorkspaceMember, WorkspaceModal, type WorkspaceOrganization, type WorkspaceOrganizationRequest, WorkspacePicker, type WorkspacePickerItem, type WorkspacePickerProps, WorkspaceTab, type WorkspaceUsageResponse, belowUsageReason, cleanCreditLimitInput, countLabel, creditCycleUnit, describeDefaultLimit, describeMemberLimit, formatCreditLimit, formatCredits, groupWorkspaceList, isLimitBelowUsage, joinMembersWithLimits, lastUsedLabel, limitBelowUsageUsed, limitSourceLabel, loadWorkspaceOrganization, minimumCreditLimit, resolveSettingsTabFromPath, roundCredits, useSettingsAdapters, useWorkspaceOrganization, userLanguageLabel, validateCreditLimitInput, validateDefaultCreditLimitInput };
+export { APP_KEYS, type ApiToken, type AppKey, type AvailableCreditsResponse, BillingContent, type BillingEventPayload, type BillingProduct, type BillingSubscription, BuyCreditsModal, type BuyCreditsPayload, type BuyCreditsResponse, ConfirmDeleteModal, ConfirmLeaveModal, type ConnectedApp, ConnectedAppsContent, type CreatedToken, type CreditCycleUnit, type CreditLimitValidation, type CustomCreditInfo, type CustomCreditResponse, DEFAULT_PERMISSIONS, DEFAULT_USER_LANGUAGE, ExportDateModal, InviteUpdateModal, type InvoicePdfResponse, type MemberCreditLimit, MemberCreditLimitModal, type MemberCreditLimitRow, type MemberCreditLimitSource, type MemberCreditLimitsResponse, MemberListFrame, type MemberListFrameProps, type MemberListTab, MemberListToolbar, type MemberListToolbarProps, type MemberPermissionsPayload, OrganizationContent, type OrganizationData, OrganizationIntegrationsContent, type OrganizationInvite, type OrganizationJoinRequest, type OrganizationJoinableWorkspace, type OrganizationMember, OrganizationMemberModal, type OrganizationMemberModalProps, OrganizationModal, type OrganizationView, type OrganizationWorkspaceItem, PerUserLimitsView, type Price, type PriceMetadata, type ProductsResponse, ProfileAvatar, ProfileTab, ReferralTab, SCOPE_LABELS, ScopeHeader, type ScopeHeaderProps, type ServiceItem, type SettingsAdapters, SettingsAdaptersProvider, type SettingsApiAdapter, type SettingsAuthAdapter, type SettingsAuthUser, SettingsContent, type SettingsContentProps, type SettingsImageUploadAdapter, type SettingsIntegrationsAdapter, type SettingsNavigationAdapter, type SettingsOrganizationAdapter, type SettingsOrganizationCurrent, type SettingsOrganizationListItem, type SettingsScope, type SettingsTab, type SettingsToastAdapter, SettingsTooltip, type SettingsTooltipPlacement, type SettingsTooltipProps, type SettingsWorkspaceAdapter, type SettingsWorkspaceCurrent, type SettingsWorkspaceListItem, SiconKey, type StoreItem, type SubscriptionPlan, type SubscriptionResponse, TAB_DESCRIPTIONS, TAB_LABELS, TAB_SCOPE, TAB_TO_URL, type TeamMember, TeamsContent, type TokenExpiry, TokensContent, URL_TO_TAB, USER_LANGUAGES, type UpdateSubscriptionPayload, type UpdateSubscriptionResponse, type UsageHistoryItem, type UsageHistoryResponse, type UserLanguage, type UserPermissions, WORKSPACE_LIST_PAGE_SIZE, type WorkspaceData, WorkspaceGeneralTab, type WorkspaceGeneralTabProps, type WorkspaceInvite, type WorkspaceListOrganization, WorkspaceListTab, type WorkspaceMember, WorkspaceModal, type WorkspaceOrganization, type WorkspaceOrganizationRequest, WorkspacePicker, type WorkspacePickerItem, type WorkspacePickerProps, WorkspaceTab, type WorkspaceUsageResponse, belowUsageReason, cleanCreditLimitInput, countLabel, creditCycleUnit, describeDefaultLimit, describeMemberLimit, formatCreditLimit, formatCredits, groupWorkspaceList, isLimitBelowUsage, joinMembersWithLimits, lastUsedLabel, limitBelowUsageUsed, limitSourceLabel, loadWorkspaceOrganization, memberRoleUpdate, minimumCreditLimit, resolveSettingsTabFromPath, roundCredits, useSettingsAdapters, useWorkspaceOrganization, userLanguageLabel, validateCreditLimitInput, validateDefaultCreditLimitInput };

package/dist/index.js

@@ -76,6 +76,7 @@ __export(index_exports, {
   limitBelowUsageUsed: () => limitBelowUsageUsed,
   limitSourceLabel: () => limitSourceLabel,
   loadWorkspaceOrganization: () => loadWorkspaceOrganization,
+  memberRoleUpdate: () => memberRoleUpdate,
   minimumCreditLimit: () => minimumCreditLimit,
   resolveSettingsTabFromPath: () => resolveSettingsTabFromPath,
   roundCredits: () => roundCredits,
@@ -4435,6 +4436,17 @@ function permissionServiceIds(services, permissions) {
     return false;
   }).map((s) => s._id);
 }
+function memberRoleUpdate(current, permissions, services) {
+  if (current.role === "admin" && permissions.role === "admin") return null;
+  return {
+    userId: current.userId,
+    role: permissions.role,
+    creditAccess: permissions.canUseCredits,
+    inviteAccess: permissions.canInviteUser,
+    serviceIds: permissions.role === "admin" ? [] : permissionServiceIds(services, permissions),
+    storeIds: permissions.catalogixStores || []
+  };
+}
 function uniqueNonEmpty(values) {
   return Array.from(new Set(values.map((v) => v.trim()).filter(Boolean)));
 }
@@ -5030,19 +5042,17 @@ function TeamsContent({
         return;
       }
     }
-    const serviceIds = permissions.role === "admin" ? [] : permissionServiceIds(allServices, permissions);
+    const request = memberRoleUpdate(
+      { userId: modal.target.userId, role: modal.target.permissions.role },
+      permissions,
+      allServices
+    );
+    if (!request) {
+      closeModal();
+      return;
+    }
     try {
-      if (modal.target.permissions.role === "member" && permissions.role === "admin") {
-        await api.promoteAsAdmin?.([modal.target.userId]);
-      }
-      await api.updateMemberRole({
-        userId: modal.target.userId,
-        role: permissions.role,
-        creditAccess: permissions.canUseCredits,
-        inviteAccess: permissions.canInviteUser,
-        serviceIds,
-        storeIds: permissions.catalogixStores || []
-      });
+      await api.updateMemberRole(request);
       toast.success("User permissions updated");
     } catch (err) {
       const msg = errorMessage(err, { method: "POST" });

package/dist/index.mjs

@@ -4392,6 +4392,17 @@ function permissionServiceIds(services, permissions) {
     return false;
   }).map((s) => s._id);
 }
+function memberRoleUpdate(current, permissions, services) {
+  if (current.role === "admin" && permissions.role === "admin") return null;
+  return {
+    userId: current.userId,
+    role: permissions.role,
+    creditAccess: permissions.canUseCredits,
+    inviteAccess: permissions.canInviteUser,
+    serviceIds: permissions.role === "admin" ? [] : permissionServiceIds(services, permissions),
+    storeIds: permissions.catalogixStores || []
+  };
+}
 function uniqueNonEmpty(values) {
   return Array.from(new Set(values.map((v) => v.trim()).filter(Boolean)));
 }
@@ -4987,19 +4998,17 @@ function TeamsContent({
         return;
       }
     }
-    const serviceIds = permissions.role === "admin" ? [] : permissionServiceIds(allServices, permissions);
+    const request = memberRoleUpdate(
+      { userId: modal.target.userId, role: modal.target.permissions.role },
+      permissions,
+      allServices
+    );
+    if (!request) {
+      closeModal();
+      return;
+    }
     try {
-      if (modal.target.permissions.role === "member" && permissions.role === "admin") {
-        await api.promoteAsAdmin?.([modal.target.userId]);
-      }
-      await api.updateMemberRole({
-        userId: modal.target.userId,
-        role: permissions.role,
-        creditAccess: permissions.canUseCredits,
-        inviteAccess: permissions.canInviteUser,
-        serviceIds,
-        storeIds: permissions.catalogixStores || []
-      });
+      await api.updateMemberRole(request);
       toast.success("User permissions updated");
     } catch (err) {
       const msg = errorMessage(err, { method: "POST" });
@@ -14378,6 +14387,7 @@ export {
   limitBelowUsageUsed,
   limitSourceLabel,
   loadWorkspaceOrganization,
+  memberRoleUpdate,
   minimumCreditLimit,
   resolveSettingsTabFromPath,
   roundCredits,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamoid/settings",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",