Add owner information to organization

frontend/javascripts/admin/organization/pricing_plan_utils.ts

@@ -88,9 +88,13 @@ export function isFeatureAllowedByPricingPlan(
 export function getFeatureNotAvailableInPlanMessage(
   requiredPricingPlan: PricingPlanEnum,
   organization: APIOrganization | null,
+  activeUser: APIUser | null | undefined,
 ) {
-  let organizationOwnerName = "";
+  if (activeUser?.isOrganizationOwner) {
+    return messages["organization.plan.feature_not_available.owner"](requiredPricingPlan);
+  }
 
+  let organizationOwnerName = "";
   // expected naming schema for owner: "(M. Mustermann)" | ""
   if (organization?.ownerName) {
     {

frontend/javascripts/components/pricing_enforcers.tsx

@@ -62,7 +62,7 @@ export const PricingEnforcedMenuItem: React.FunctionComponent<
       color={PRIMARY_COLOR_HEX}
       content={
         <div style={popOverStyle}>
-          {getFeatureNotAvailableInPlanMessage(requiredPricingPlan, activeOrganization)}
+          {getFeatureNotAvailableInPlanMessage(requiredPricingPlan, activeOrganization, activeUser)}
           {getUpgradeNowButton(activeUser, activeOrganization)}
         </div>
       }
@@ -100,7 +100,7 @@ export const PricingEnforcedButton: React.FunctionComponent<RequiredPricingProps
       color={PRIMARY_COLOR_HEX}
       content={
         <div style={popOverStyle}>
-          {getFeatureNotAvailableInPlanMessage(requiredPricingPlan, activeOrganization)}
+          {getFeatureNotAvailableInPlanMessage(requiredPricingPlan, activeOrganization, activeUser)}
           {getUpgradeNowButton(activeUser, activeOrganization)}
         </div>
       }
@@ -145,7 +145,7 @@ export const PricingEnforcedBlur: React.FunctionComponent<RequiredPricingProps>
       color={PRIMARY_COLOR_HEX}
       content={
         <div style={popOverStyle}>
-          {getFeatureNotAvailableInPlanMessage(requiredPricingPlan, activeOrganization)}
+          {getFeatureNotAvailableInPlanMessage(requiredPricingPlan, activeOrganization, activeUser)}
           {getUpgradeNowButton(activeUser, activeOrganization)}
         </div>
       }
@@ -172,7 +172,11 @@ export const PricingEnforcedBlur: React.FunctionComponent<RequiredPricingProps>
         >
           <Alert
             showIcon
-            message={getFeatureNotAvailableInPlanMessage(requiredPricingPlan, activeOrganization)}
+            message={getFeatureNotAvailableInPlanMessage(
+              requiredPricingPlan,
+              activeOrganization,
+              activeUser,
+            )}
             icon={<LockOutlined />}
           />
         </div>
@@ -203,7 +207,11 @@ export function PageUnavailableForYourPlanView({
         title="Feature not available"
         subTitle={
           <p style={{ maxWidth: "500px", margin: "0 auto" }}>
-            {getFeatureNotAvailableInPlanMessage(requiredPricingPlan, activeOrganization)}
+            {getFeatureNotAvailableInPlanMessage(
+              requiredPricingPlan,
+              activeOrganization,
+              activeUser,
+            )}
           </p>
         }
         extra={[

frontend/javascripts/messages.tsx

@@ -440,5 +440,7 @@ instead. Only enable this option if you understand its effect. All layers will n
     requiredPlan: string,
     organizationOwnerName: string,
   ) =>
-    `This feature is not available in your organization's plan. Ask the owner of your organization ${organizationOwnerName} to upgrade to at least a ${requiredPlan} plan.`,
+    `This feature is not available in your organization's plan. Ask the owner of your organization ${organizationOwnerName} to upgrade to a ${requiredPlan} plan or higher.`,
+  "organization.plan.feature_not_available.owner": (requiredPlan: string) =>
+    `This feature is not available in your organization's plan. Consider upgrading to a ${requiredPlan} plan or higher.`,
 };

frontend/javascripts/oxalis/model/accessors/tool_accessor.ts

@@ -9,12 +9,13 @@ import {
 } from "oxalis/model/accessors/volumetracing_accessor";
 import { getVisibleSegmentationLayer } from "oxalis/model/accessors/dataset_accessor";
 import { isMagRestrictionViolated } from "oxalis/model/accessors/flycam_accessor";
-import { APIOrganization } from "types/api_flow_types";
+import { APIOrganization, APIUser } from "types/api_flow_types";
 import {
   getFeatureNotAvailableInPlanMessage,
   isFeatureAllowedByPricingPlan,
   PricingPlanEnum,
 } from "admin/organization/pricing_plan_utils";
+import { enforceActiveUser } from "./user_accessor";
 
 const zoomInToUseToolMessage = "Please zoom in further to use this tool.";
 
@@ -113,6 +114,7 @@ function _getDisabledInfoFromArgs(
   hasAgglomerateMappings: boolean,
   genericDisabledExplanation: string,
   activeOrganization: APIOrganization | null,
+  activeUser: APIUser,
 ) {
   const isProofReadingToolAllowed = isFeatureAllowedByPricingPlan(
     activeOrganization,
@@ -166,7 +168,11 @@ function _getDisabledInfoFromArgs(
         ? !hasSkeleton
           ? disabledSkeletonExplanation
           : disabledAgglomerateMappingsExplanation
-        : getFeatureNotAvailableInPlanMessage(PricingPlanEnum.Power, activeOrganization),
+        : getFeatureNotAvailableInPlanMessage(
+            PricingPlanEnum.Power,
+            activeOrganization,
+            activeUser,
+          ),
     },
   };
 }
@@ -236,6 +242,7 @@ export function getDisabledInfoForTools(state: OxalisState): Record<
     hasAgglomerateMappings,
     genericDisabledExplanation,
     state.activeOrganization,
+    enforceActiveUser(state.activeUser),
   );
 }
 

frontend/javascripts/oxalis/view/right-border-tabs/segments_tab/segments_view.tsx

@@ -320,10 +320,15 @@ class SegmentsView extends React.Component<Props, State> {
     let disabled = true;
 
     const activeOrganization = useSelector((state: OxalisState) => state.activeOrganization);
+    const activeUser = useSelector((state: OxalisState) => state.activeUser);
     if (!isFeatureAllowedByPricingPlan(activeOrganization, PricingPlanEnum.Team)) {
       return {
         disabled: true,
-        title: getFeatureNotAvailableInPlanMessage(PricingPlanEnum.Team, activeOrganization),
+        title: getFeatureNotAvailableInPlanMessage(
+          PricingPlanEnum.Team,
+          activeOrganization,
+          activeUser,
+        ),
       };
     }