From a22be83e71c1b5d32f3e3d8a4e755a19d60e51e7 Mon Sep 17 00:00:00 2001
From: Tom Herold <tom.herold@scalableminds.com>
Date: Fri, 3 Feb 2023 14:15:35 +0100
Subject: [PATCH 01/14] added orga owner to organization REST route

---
 app/models/organization/OrganizationService.scala |  9 +++++++--
 app/models/user/User.scala                        | 13 +++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/models/organization/OrganizationService.scala b/app/models/organization/OrganizationService.scala
index 614bec70966..754df7bfae0 100644
--- a/app/models/organization/OrganizationService.scala
+++ b/app/models/organization/OrganizationService.scala
@@ -9,7 +9,7 @@ import javax.inject.Inject
 import models.binary.{DataStore, DataStoreDAO}
 import models.folder.{Folder, FolderDAO, FolderService}
 import models.team.{PricingPlan, Team, TeamDAO}
-import models.user.{Invite, MultiUserDAO, User, UserDAO}
+import models.user.{Invite, MultiUserDAO, User, UserDAO, UserService}
 import play.api.libs.json.{JsObject, Json}
 import utils.{ObjectId, WkConf}
 
@@ -22,6 +22,7 @@ class OrganizationService @Inject()(organizationDAO: OrganizationDAO,
                                     dataStoreDAO: DataStoreDAO,
                                     folderDAO: FolderDAO,
                                     folderService: FolderService,
+                                    userService: UserService,
                                     rpc: RPC,
                                     initialDataService: InitialDataService,
                                     conf: WkConf,
@@ -29,6 +30,7 @@ class OrganizationService @Inject()(organizationDAO: OrganizationDAO,
     extends FoxImplicits {
 
   def publicWrites(organization: Organization, requestingUser: Option[User] = None): Fox[JsObject] = {
+
     val adminOnlyInfo = if (requestingUser.exists(_.isAdminOf(organization._id))) {
       Json.obj(
         "newUserMailingList" -> organization.newUserMailingList,
@@ -38,6 +40,8 @@ class OrganizationService @Inject()(organizationDAO: OrganizationDAO,
     } else Json.obj()
     for {
       usedStorageBytes <- organizationDAO.getUsedStorage(organization._id)
+      owner <- userDAO.findOwnerByOrg(organization._id)(GlobalAccessContext)
+      ownerJson <- userService.compactWrites(owner)
     } yield
       Json.obj(
         "id" -> organization._id.toString,
@@ -49,7 +53,8 @@ class OrganizationService @Inject()(organizationDAO: OrganizationDAO,
         "paidUntil" -> organization.paidUntil,
         "includedUsers" -> organization.includedUsers,
         "includedStorageBytes" -> organization.includedStorageBytes,
-        "usedStorageBytes" -> usedStorageBytes
+        "usedStorageBytes" -> usedStorageBytes,
+        "owner" -> ownerJson
       ) ++ adminOnlyInfo
   }
 
diff --git a/app/models/user/User.scala b/app/models/user/User.scala
index 57bb39a1b48..131bdb8cb25 100644
--- a/app/models/user/User.scala
+++ b/app/models/user/User.scala
@@ -159,6 +159,19 @@ class UserDAO @Inject()(sqlClient: SqlClient)(implicit ec: ExecutionContext)
       parsed <- Fox.combined(r.toList.map(parse))
     } yield parsed
 
+  def findOwnerByOrg(organizationId: ObjectId)(implicit ctx: DBAccessContext): Fox[User] =
+    for {
+      accessQuery <- accessQueryFromAccessQ(listAccessQ)
+      r <- run(q"""select $columns
+                   from $existingCollectionName
+                   where $accessQuery
+                   and isOrganizationOwner
+                   and not isDeactivated
+                   and _organization = $organizationId
+                   order by _id""".as[UsersRow])
+      parsed <- parseFirst(r, organizationId)
+    } yield parsed
+
   def findOneByOrgaAndMultiUser(organizationId: ObjectId, multiUserId: ObjectId)(
       implicit ctx: DBAccessContext): Fox[User] =
     for {

From bfbde5646c7345ffea75e9a925955c708eacdc02 Mon Sep 17 00:00:00 2001
From: Tom Herold <tom.herold@scalableminds.com>
Date: Fri, 3 Feb 2023 14:32:50 +0100
Subject: [PATCH 02/14] add organization owner info to orga page

---
 .../admin/organization/organization_edit_view.tsx      | 10 ++++++++++
 frontend/javascripts/types/api_flow_types.ts           |  1 +
 2 files changed, 11 insertions(+)

diff --git a/frontend/javascripts/admin/organization/organization_edit_view.tsx b/frontend/javascripts/admin/organization/organization_edit_view.tsx
index 389cc2e808a..609de268056 100644
--- a/frontend/javascripts/admin/organization/organization_edit_view.tsx
+++ b/frontend/javascripts/admin/organization/organization_edit_view.tsx
@@ -7,6 +7,7 @@ import {
   CopyOutlined,
   SaveOutlined,
   IdcardOutlined,
+  UserOutlined,
 } from "@ant-design/icons";
 import { confirmAsync } from "dashboard/dataset/helper_components";
 import {
@@ -169,6 +170,7 @@ class OrganizationEditView extends React.PureComponent<Props, State> {
                     width: "calc(100% - 31px)",
                   }}
                   readOnly
+                  disabled
                 />
                 <Button
                   onClick={this.handleCopyNameButtonClicked}
@@ -176,6 +178,14 @@ class OrganizationEditView extends React.PureComponent<Props, State> {
                 />
               </Input.Group>
             </FormItem>
+            <FormItem label="Organization Owner">
+              <Input
+                prefix={<UserOutlined />}
+                value={`${this.props.organization.owner.firstName} ${this.props.organization.owner.lastName}`}
+                readOnly
+                disabled
+              />
+            </FormItem>
             <FormItem
               label="Organization Name"
               name="displayName"
diff --git a/frontend/javascripts/types/api_flow_types.ts b/frontend/javascripts/types/api_flow_types.ts
index c70cf8247b9..7fc5c24c3e0 100644
--- a/frontend/javascripts/types/api_flow_types.ts
+++ b/frontend/javascripts/types/api_flow_types.ts
@@ -518,6 +518,7 @@ export type APIOrganization = {
   readonly includedUsers: number;
   readonly includedStorageBytes: number;
   readonly usedStorageBytes: number;
+  readonly owner: APIUserCompact;
 };
 export type APIPricingPlanStatus = {
   readonly pricingPlan: PricingPlanEnum;

From cfca6c7d84ea135aec6c39d40e429601be55e7ee Mon Sep 17 00:00:00 2001
From: Tom Herold <tom.herold@scalableminds.com>
Date: Fri, 3 Feb 2023 16:24:08 +0100
Subject: [PATCH 03/14] provide restricted plan message with owner information

---
 .../admin/organization/pricing_plan_utils.ts  | 16 +++++
 .../components/pricing_enforcers.tsx          | 59 +++++++++++--------
 .../javascripts/components/secured_route.tsx  |  6 +-
 frontend/javascripts/messages.tsx             |  7 ++-
 .../oxalis/model/accessors/tool_accessor.ts   |  4 +-
 .../segments_tab/segments_view.tsx            |  4 +-
 6 files changed, 63 insertions(+), 33 deletions(-)

diff --git a/frontend/javascripts/admin/organization/pricing_plan_utils.ts b/frontend/javascripts/admin/organization/pricing_plan_utils.ts
index 1062d3d7f93..b6c74eeb118 100644
--- a/frontend/javascripts/admin/organization/pricing_plan_utils.ts
+++ b/frontend/javascripts/admin/organization/pricing_plan_utils.ts
@@ -1,3 +1,4 @@
+import messages from "messages";
 import { APIOrganization, APIUser } from "types/api_flow_types";
 
 export enum PricingPlanEnum {
@@ -83,3 +84,18 @@ export function isFeatureAllowedByPricingPlan(
 
   return isPricingPlanGreaterEqualThan(organization.pricingPlan, requiredPricingPlan);
 }
+
+export function getFeatureNotAvailabeInPlanMessage(
+  requiredPricingPlan: PricingPlanEnum,
+  organization: APIOrganization | null,
+) {
+  // expected naming schema for owner: "(M. Mustermann)" | ""
+  const organizationOwnerName = organization
+    ? `(${organization.owner.firstName[0]}. ${organization.owner.lastName})`
+    : "";
+
+  return messages["organization.plan.feature_not_available"](
+    requiredPricingPlan,
+    organizationOwnerName,
+  );
+}
diff --git a/frontend/javascripts/components/pricing_enforcers.tsx b/frontend/javascripts/components/pricing_enforcers.tsx
index c4edcc454e3..2f823fb9300 100644
--- a/frontend/javascripts/components/pricing_enforcers.tsx
+++ b/frontend/javascripts/components/pricing_enforcers.tsx
@@ -1,14 +1,14 @@
 import React from "react";
 import { useSelector } from "react-redux";
-import { Tooltip, Menu, MenuItemProps, Alert, ButtonProps, Button } from "antd";
+import { Tooltip, Menu, MenuItemProps, Alert, ButtonProps, Button, Result } from "antd";
 import { LockOutlined } from "@ant-design/icons";
 import {
+  getFeatureNotAvailabeInPlanMessage,
   isFeatureAllowedByPricingPlan,
   PricingPlanEnum,
 } from "admin/organization/pricing_plan_utils";
 import { isUserAllowedToRequestUpgrades } from "admin/organization/pricing_plan_utils";
 import { Link } from "react-router-dom";
-import messages from "messages";
 import type { MenuClickEventHandler } from "rc-menu/lib/interface";
 import type { OxalisState } from "oxalis/store";
 
@@ -34,7 +34,7 @@ export const PricingEnforcedMenuItem: React.FunctionComponent<
 
   return (
     <Tooltip
-      title={messages["organization.plan.feature_not_available"](requiredPricingPlan)}
+      title={getFeatureNotAvailabeInPlanMessage(requiredPricingPlan, activeOrganization)}
       placement="right"
     >
       <Menu.Item
@@ -64,7 +64,7 @@ export const PricingEnforcedButton: React.FunctionComponent<RequiredPricingProps
 
   return (
     <Tooltip
-      title={messages["organization.plan.feature_not_available"](requiredPricingPlan)}
+      title={getFeatureNotAvailabeInPlanMessage(requiredPricingPlan, activeOrganization)}
       placement="right"
     >
       <Button {...buttonProps} disabled>
@@ -85,7 +85,7 @@ export const PricingEnforcedBlur: React.FunctionComponent<RequiredPricingProps>
   if (isFeatureAllowed) return <>{children}</>;
 
   return (
-    <Tooltip title={messages["organization.plan.feature_not_available"](requiredPricingPlan)}>
+    <Tooltip title={getFeatureNotAvailabeInPlanMessage(requiredPricingPlan, activeOrganization)}>
       <div style={{ position: "relative", cursor: "not-allowed" }}>
         <div
           style={{
@@ -107,7 +107,7 @@ export const PricingEnforcedBlur: React.FunctionComponent<RequiredPricingProps>
         >
           <Alert
             showIcon
-            message={messages["organization.plan.feature_not_available"](requiredPricingPlan)}
+            message={getFeatureNotAvailabeInPlanMessage(requiredPricingPlan, activeOrganization)}
             icon={<LockOutlined />}
           />
         </div>
@@ -116,36 +116,43 @@ export const PricingEnforcedBlur: React.FunctionComponent<RequiredPricingProps>
   );
 };
 
-export function PageUnavailableForYourPlanView() {
+export function PageUnavailableForYourPlanView({
+  requiredPricingPlan,
+}: {
+  requiredPricingPlan: PricingPlanEnum;
+}) {
   const activeUser = useSelector((state: OxalisState) => state.activeUser);
   const activeOrganization = useSelector((state: OxalisState) => state.activeOrganization);
 
   const linkToOrganizationSettings =
     activeUser && activeOrganization && isUserAllowedToRequestUpgrades(activeUser) ? (
-      <Link to={`/organizations/${activeOrganization.name}`}>Go to Organization Settings</Link>
-    ) : null;
+      <Link to={`/organizations/${activeOrganization.name}`}>
+        <Button>Go to Organization Settings</Button>
+      </Link>
+    ) : undefined;
 
   return (
     <div className="container">
-      <Alert
-        style={{
-          maxWidth: "500px",
-          margin: "0 auto",
-        }}
-        message="Feature not available"
-        description={
-          <>
-            <p>
-              The requested feature is not available in your WEBKNOSSOS organization. Consider
-              upgrading to a higher WEBKNOSSOS plan to unlock it or ask your organization's owner to
-              upgrade.
-            </p>
-            {linkToOrganizationSettings}
-          </>
+      <Result
+        status="warning"
+        title="Feature not available"
+        subTitle={
+          <p style={{ maxWidth: "500px", margin: "0 auto" }}>
+            {getFeatureNotAvailabeInPlanMessage(requiredPricingPlan, activeOrganization)}
+          </p>
         }
-        type="error"
-        showIcon
+        extra={[
+          <Link to="/">
+            <Button type="primary">Return to Dashboard</Button>
+          </Link>,
+          linkToOrganizationSettings,
+        ]}
       />
     </div>
   );
 }
+
+// style={{
+//           maxWidth: "500px",
+//           margin: "0 auto",
+//         }}
diff --git a/frontend/javascripts/components/secured_route.tsx b/frontend/javascripts/components/secured_route.tsx
index 5dd58270925..028d86b78de 100644
--- a/frontend/javascripts/components/secured_route.tsx
+++ b/frontend/javascripts/components/secured_route.tsx
@@ -77,7 +77,11 @@ class SecuredRoute extends React.PureComponent<SecuredRouteProps, State> {
               this.props.requiredPricingPlan,
             )
           ) {
-            return <PageUnavailableForYourPlanView />;
+            return (
+              <PageUnavailableForYourPlanView
+                requiredPricingPlan={this.props.requiredPricingPlan}
+              />
+            );
           }
 
           if (Component != null) {
diff --git a/frontend/javascripts/messages.tsx b/frontend/javascripts/messages.tsx
index 1cc029b19ed..b3d72a8904d 100644
--- a/frontend/javascripts/messages.tsx
+++ b/frontend/javascripts/messages.tsx
@@ -436,6 +436,9 @@ instead. Only enable this option if you understand its effect. All layers will n
   "ui.no_form_active": "Could not set the initial form values as the form could not be loaded.",
   "organization.plan.upgrage_request_sent":
     "An email with your upgrade request has been sent to the WEBKNOSSOS sales team.",
-  "organization.plan.feature_not_available": (requiredPlan: string) =>
-    `This feature is not available in your organization's plan. Ask your organization owner to upgrade at least a ${requiredPlan} plan.`,
+  "organization.plan.feature_not_available": (
+    requiredPlan: string,
+    organizationOwnerName: string,
+  ) =>
+    `This feature is not available in your organization's plan. Ask your organization owner ${organizationOwnerName} to upgrade to at least a ${requiredPlan} plan.`,
 };
diff --git a/frontend/javascripts/oxalis/model/accessors/tool_accessor.ts b/frontend/javascripts/oxalis/model/accessors/tool_accessor.ts
index 8a24d3918f8..05426ae79c0 100644
--- a/frontend/javascripts/oxalis/model/accessors/tool_accessor.ts
+++ b/frontend/javascripts/oxalis/model/accessors/tool_accessor.ts
@@ -11,10 +11,10 @@ import { getVisibleSegmentationLayer } from "oxalis/model/accessors/dataset_acce
 import { isMagRestrictionViolated } from "oxalis/model/accessors/flycam_accessor";
 import { APIOrganization } from "types/api_flow_types";
 import {
+  getFeatureNotAvailabeInPlanMessage,
   isFeatureAllowedByPricingPlan,
   PricingPlanEnum,
 } from "admin/organization/pricing_plan_utils";
-import messages from "messages";
 
 const zoomInToUseToolMessage = "Please zoom in further to use this tool.";
 
@@ -166,7 +166,7 @@ function _getDisabledInfoFromArgs(
         ? !hasSkeleton
           ? disabledSkeletonExplanation
           : disabledAgglomerateMappingsExplanation
-        : messages["organization.plan.feature_not_available"](PricingPlanEnum.Power),
+        : getFeatureNotAvailabeInPlanMessage(PricingPlanEnum.Power, activeOrganization),
     },
   };
 }
diff --git a/frontend/javascripts/oxalis/view/right-border-tabs/segments_tab/segments_view.tsx b/frontend/javascripts/oxalis/view/right-border-tabs/segments_tab/segments_view.tsx
index bf05a157225..ce838436da2 100644
--- a/frontend/javascripts/oxalis/view/right-border-tabs/segments_tab/segments_view.tsx
+++ b/frontend/javascripts/oxalis/view/right-border-tabs/segments_tab/segments_view.tsx
@@ -53,10 +53,10 @@ import Store from "oxalis/store";
 import Toast from "libs/toast";
 import features from "features";
 import {
+  getFeatureNotAvailabeInPlanMessage,
   isFeatureAllowedByPricingPlan,
   PricingPlanEnum,
 } from "admin/organization/pricing_plan_utils";
-import messages from "messages";
 
 const { Option } = Select;
 // Interval in ms to check for running mesh file computation jobs for this dataset
@@ -323,7 +323,7 @@ class SegmentsView extends React.Component<Props, State> {
     if (!isFeatureAllowedByPricingPlan(activeOrganization, PricingPlanEnum.Team)) {
       return {
         disabled: true,
-        title: messages["organization.plan.feature_not_available"](PricingPlanEnum.Team),
+        title: getFeatureNotAvailabeInPlanMessage(PricingPlanEnum.Team, activeOrganization),
       };
     }
 

From 1574c22b681b99687b68ba92969ba923a8ac7f21 Mon Sep 17 00:00:00 2001
From: Tom Herold <tom.herold@scalableminds.com>
Date: Fri, 3 Feb 2023 16:48:22 +0100
Subject: [PATCH 04/14] make option to upgrade more prominent

---
 .../components/pricing_enforcers.tsx          | 30 ++++++++++++++++---
 frontend/javascripts/oxalis/constants.ts      |  2 +-
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/frontend/javascripts/components/pricing_enforcers.tsx b/frontend/javascripts/components/pricing_enforcers.tsx
index 2f823fb9300..567fbfb9dfc 100644
--- a/frontend/javascripts/components/pricing_enforcers.tsx
+++ b/frontend/javascripts/components/pricing_enforcers.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import { useSelector } from "react-redux";
-import { Tooltip, Menu, MenuItemProps, Alert, ButtonProps, Button, Result } from "antd";
+import { Tooltip, Menu, MenuItemProps, Alert, ButtonProps, Button, Result, Popover } from "antd";
 import { LockOutlined } from "@ant-design/icons";
 import {
   getFeatureNotAvailabeInPlanMessage,
@@ -11,6 +11,9 @@ import { isUserAllowedToRequestUpgrades } from "admin/organization/pricing_plan_
 import { Link } from "react-router-dom";
 import type { MenuClickEventHandler } from "rc-menu/lib/interface";
 import type { OxalisState } from "oxalis/store";
+import { rgbToHex } from "libs/utils";
+import { PRIMARY_COLOR } from "oxalis/constants";
+import UpgradePricingPlanModal from "admin/organization/upgrade_plan_modal";
 
 const handleMouseClick = (event: React.MouseEvent) => {
   event.preventDefault();
@@ -27,15 +30,34 @@ type RequiredPricingProps = { requiredPricingPlan: PricingPlanEnum };
 export const PricingEnforcedMenuItem: React.FunctionComponent<
   RequiredPricingProps & MenuItemProps
 > = ({ children, requiredPricingPlan, ...menuItemProps }) => {
+  const activeUser = useSelector((state: OxalisState) => state.activeUser);
   const activeOrganization = useSelector((state: OxalisState) => state.activeOrganization);
   const isFeatureAllowed = isFeatureAllowedByPricingPlan(activeOrganization, requiredPricingPlan);
 
   if (isFeatureAllowed) return <Menu.Item {...menuItemProps}>{children}</Menu.Item>;
 
+  const upgradeNowButton =
+    activeUser && activeOrganization && isUserAllowedToRequestUpgrades(activeUser) ? (
+      <Button
+        size="small"
+        onClick={() => UpgradePricingPlanModal.upgradePricingPlan(activeOrganization)}
+        style={{ marginTop: 10 }}
+      >
+        Upgrade Now
+      </Button>
+    ) : null;
+
   return (
-    <Tooltip
-      title={getFeatureNotAvailabeInPlanMessage(requiredPricingPlan, activeOrganization)}
+    <Popover
+      color={rgbToHex(PRIMARY_COLOR)}
+      content={
+        <div style={{ color: "white", maxWidth: 250 }}>
+          {getFeatureNotAvailabeInPlanMessage(requiredPricingPlan, activeOrganization)}
+          {upgradeNowButton}
+        </div>
+      }
       placement="right"
+      trigger="hover"
     >
       <Menu.Item
         onClick={handleMenuClick}
@@ -48,7 +70,7 @@ export const PricingEnforcedMenuItem: React.FunctionComponent<
         {children}
         <LockOutlined style={{ marginLeft: 5 }} />
       </Menu.Item>
-    </Tooltip>
+    </Popover>
   );
 };
 
diff --git a/frontend/javascripts/oxalis/constants.ts b/frontend/javascripts/oxalis/constants.ts
index ccc099c271e..7086833911b 100644
--- a/frontend/javascripts/oxalis/constants.ts
+++ b/frontend/javascripts/oxalis/constants.ts
@@ -335,7 +335,7 @@ export type TypedArray =
 
 export type TypedArrayWithoutBigInt = Exclude<TypedArray, BigUint64Array>;
 
-export const PRIMARY_COLOR = [86, 96, 255];
+export const PRIMARY_COLOR: Vector3 = [86, 96, 255];
 
 export enum LOG_LEVELS {
   NOTSET = "NOTSET",

From 87474c4b8170fe961e033aa4c88a00a1a5d70dab Mon Sep 17 00:00:00 2001
From: Tom Herold <tom.herold@scalableminds.com>
Date: Mon, 6 Feb 2023 17:00:41 +0100
Subject: [PATCH 05/14] replace tooltips with popovers

---
 .../admin/organization/upgrade_plan_modal.tsx |  1 +
 .../components/pricing_enforcers.tsx          | 67 +++++++++++++------
 2 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/frontend/javascripts/admin/organization/upgrade_plan_modal.tsx b/frontend/javascripts/admin/organization/upgrade_plan_modal.tsx
index 73d84b121c7..fc1c25a77ca 100644
--- a/frontend/javascripts/admin/organization/upgrade_plan_modal.tsx
+++ b/frontend/javascripts/admin/organization/upgrade_plan_modal.tsx
@@ -299,6 +299,7 @@ function UpgradePricingPlanModal({
           ) : null}
         </>
       }
+      zIndex={10000} // overlay everything
     >
       <div
         style={{
diff --git a/frontend/javascripts/components/pricing_enforcers.tsx b/frontend/javascripts/components/pricing_enforcers.tsx
index 7dc7e574a90..91ec66da190 100644
--- a/frontend/javascripts/components/pricing_enforcers.tsx
+++ b/frontend/javascripts/components/pricing_enforcers.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import { useSelector } from "react-redux";
-import { Tooltip, Menu, MenuItemProps, Alert, ButtonProps, Button, Result, Popover } from "antd";
+import { Menu, MenuItemProps, Alert, ButtonProps, Button, Result, Popover } from "antd";
 import { LockOutlined } from "@ant-design/icons";
 import {
   getFeatureNotAvailabeInPlanMessage,
@@ -15,6 +15,10 @@ import { rgbToHex } from "libs/utils";
 import { PRIMARY_COLOR } from "oxalis/constants";
 import UpgradePricingPlanModal from "admin/organization/upgrade_plan_modal";
 
+const PRIMARY_COLOR_HEX = rgbToHex(PRIMARY_COLOR);
+
+const popOverStyle = { color: "white", maxWidth: 250 };
+
 const handleMouseClick = (event: React.MouseEvent) => {
   event.preventDefault();
   event.stopPropagation();
@@ -27,33 +31,36 @@ const handleMenuClick: MenuClickEventHandler = (info) => {
 
 type RequiredPricingProps = { requiredPricingPlan: PricingPlanEnum };
 
+function getUpgradeNowButton() {
+  const activeUser = useSelector((state: OxalisState) => state.activeUser);
+  const activeOrganization = useSelector((state: OxalisState) => state.activeOrganization);
+
+  return activeUser && activeOrganization && isUserAllowedToRequestUpgrades(activeUser) ? (
+    <Button
+      size="small"
+      onClick={() => UpgradePricingPlanModal.upgradePricingPlan(activeOrganization)}
+      style={{ marginTop: 10 }}
+    >
+      Upgrade Now
+    </Button>
+  ) : null;
+}
+
 export const PricingEnforcedMenuItem: React.FunctionComponent<
   RequiredPricingProps & MenuItemProps
 > = ({ children, requiredPricingPlan, ...menuItemProps }) => {
-  const activeUser = useSelector((state: OxalisState) => state.activeUser);
   const activeOrganization = useSelector((state: OxalisState) => state.activeOrganization);
   const isFeatureAllowed = isFeatureAllowedByPricingPlan(activeOrganization, requiredPricingPlan);
 
   if (isFeatureAllowed) return <Menu.Item {...menuItemProps}>{children}</Menu.Item>;
 
-  const upgradeNowButton =
-    activeUser && activeOrganization && isUserAllowedToRequestUpgrades(activeUser) ? (
-      <Button
-        size="small"
-        onClick={() => UpgradePricingPlanModal.upgradePricingPlan(activeOrganization)}
-        style={{ marginTop: 10 }}
-      >
-        Upgrade Now
-      </Button>
-    ) : null;
-
   return (
     <Popover
-      color={rgbToHex(PRIMARY_COLOR)}
+      color={PRIMARY_COLOR_HEX}
       content={
-        <div style={{ color: "white", maxWidth: 250 }}>
+        <div style={popOverStyle}>
           {getFeatureNotAvailabeInPlanMessage(requiredPricingPlan, activeOrganization)}
-          {upgradeNowButton}
+          {getUpgradeNowButton()}
         </div>
       }
       placement="right"
@@ -85,15 +92,22 @@ export const PricingEnforcedButton: React.FunctionComponent<RequiredPricingProps
   if (isFeatureAllowed) return <Button {...buttonProps}>{children}</Button>;
 
   return (
-    <Tooltip
-      title={getFeatureNotAvailabeInPlanMessage(requiredPricingPlan, activeOrganization)}
-      placement="right"
+    <Popover
+      color={PRIMARY_COLOR_HEX}
+      content={
+        <div style={popOverStyle}>
+          {getFeatureNotAvailabeInPlanMessage(requiredPricingPlan, activeOrganization)}
+          {getUpgradeNowButton()}
+        </div>
+      }
+      placement="bottom"
+      trigger="hover"
     >
       <Button {...buttonProps} disabled>
         {children}
         <LockOutlined style={{ marginLeft: 5 }} />
       </Button>
-    </Tooltip>
+    </Popover>
   );
 };
 
@@ -122,7 +136,16 @@ export const PricingEnforcedBlur: React.FunctionComponent<RequiredPricingProps>
     );
 
   return (
-    <Tooltip title={getFeatureNotAvailabeInPlanMessage(requiredPricingPlan, activeOrganization)}>
+    <Popover
+      color={PRIMARY_COLOR_HEX}
+      content={
+        <div style={popOverStyle}>
+          {getFeatureNotAvailabeInPlanMessage(requiredPricingPlan, activeOrganization)}
+          {getUpgradeNowButton()}
+        </div>
+      }
+      trigger="hover"
+    >
       <div style={{ position: "relative", cursor: "not-allowed" }}>
         <div
           style={{
@@ -149,7 +172,7 @@ export const PricingEnforcedBlur: React.FunctionComponent<RequiredPricingProps>
           />
         </div>
       </div>
-    </Tooltip>
+    </Popover>
   );
 };
 

From 7de089ce5ae1ed09d569a22c62af6914bfab2f86 Mon Sep 17 00:00:00 2001
From: Tom Herold <tom.herold@scalableminds.com>
Date: Mon, 6 Feb 2023 17:28:36 +0100
Subject: [PATCH 06/14] convert owner name information to string

---
 .../organization/OrganizationService.scala     |  4 ++--
 .../organization/organization_edit_view.tsx    |  2 +-
 .../admin/organization/pricing_plan_utils.ts   | 11 ++++++++---
 .../components/pricing_enforcers.tsx           | 18 +++++++++++-------
 frontend/javascripts/types/api_flow_types.ts   |  2 +-
 5 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/app/models/organization/OrganizationService.scala b/app/models/organization/OrganizationService.scala
index 754df7bfae0..6ba4849ed11 100644
--- a/app/models/organization/OrganizationService.scala
+++ b/app/models/organization/OrganizationService.scala
@@ -41,7 +41,7 @@ class OrganizationService @Inject()(organizationDAO: OrganizationDAO,
     for {
       usedStorageBytes <- organizationDAO.getUsedStorage(organization._id)
       owner <- userDAO.findOwnerByOrg(organization._id)(GlobalAccessContext)
-      ownerJson <- userService.compactWrites(owner)
+      ownerName = s"${owner.firstName} ${owner.lastName}"
     } yield
       Json.obj(
         "id" -> organization._id.toString,
@@ -54,7 +54,7 @@ class OrganizationService @Inject()(organizationDAO: OrganizationDAO,
         "includedUsers" -> organization.includedUsers,
         "includedStorageBytes" -> organization.includedStorageBytes,
         "usedStorageBytes" -> usedStorageBytes,
-        "owner" -> ownerJson
+        "ownerName" -> ownerName
       ) ++ adminOnlyInfo
   }
 
diff --git a/frontend/javascripts/admin/organization/organization_edit_view.tsx b/frontend/javascripts/admin/organization/organization_edit_view.tsx
index 609de268056..839bf78c072 100644
--- a/frontend/javascripts/admin/organization/organization_edit_view.tsx
+++ b/frontend/javascripts/admin/organization/organization_edit_view.tsx
@@ -181,7 +181,7 @@ class OrganizationEditView extends React.PureComponent<Props, State> {
             <FormItem label="Organization Owner">
               <Input
                 prefix={<UserOutlined />}
-                value={`${this.props.organization.owner.firstName} ${this.props.organization.owner.lastName}`}
+                value={this.props.organization.ownerName}
                 readOnly
                 disabled
               />
diff --git a/frontend/javascripts/admin/organization/pricing_plan_utils.ts b/frontend/javascripts/admin/organization/pricing_plan_utils.ts
index b6c74eeb118..e44a273df5b 100644
--- a/frontend/javascripts/admin/organization/pricing_plan_utils.ts
+++ b/frontend/javascripts/admin/organization/pricing_plan_utils.ts
@@ -89,10 +89,15 @@ export function getFeatureNotAvailabeInPlanMessage(
   requiredPricingPlan: PricingPlanEnum,
   organization: APIOrganization | null,
 ) {
+  let organizationOwnerName = "";
+
   // expected naming schema for owner: "(M. Mustermann)" | ""
-  const organizationOwnerName = organization
-    ? `(${organization.owner.firstName[0]}. ${organization.owner.lastName})`
-    : "";
+  if (organization) {
+    {
+      const [firstName, ...rest] = organization.ownerName.split(" ");
+      organizationOwnerName = `(${firstName[0]}. ${rest.join(" ")})`;
+    }
+  }
 
   return messages["organization.plan.feature_not_available"](
     requiredPricingPlan,
diff --git a/frontend/javascripts/components/pricing_enforcers.tsx b/frontend/javascripts/components/pricing_enforcers.tsx
index 91ec66da190..2772c241c16 100644
--- a/frontend/javascripts/components/pricing_enforcers.tsx
+++ b/frontend/javascripts/components/pricing_enforcers.tsx
@@ -14,6 +14,7 @@ import type { OxalisState } from "oxalis/store";
 import { rgbToHex } from "libs/utils";
 import { PRIMARY_COLOR } from "oxalis/constants";
 import UpgradePricingPlanModal from "admin/organization/upgrade_plan_modal";
+import { APIOrganization, APIUser } from "types/api_flow_types";
 
 const PRIMARY_COLOR_HEX = rgbToHex(PRIMARY_COLOR);
 
@@ -31,10 +32,10 @@ const handleMenuClick: MenuClickEventHandler = (info) => {
 
 type RequiredPricingProps = { requiredPricingPlan: PricingPlanEnum };
 
-function getUpgradeNowButton() {
-  const activeUser = useSelector((state: OxalisState) => state.activeUser);
-  const activeOrganization = useSelector((state: OxalisState) => state.activeOrganization);
-
+function getUpgradeNowButton(
+  activeUser: APIUser | null | undefined,
+  activeOrganization: APIOrganization | undefined,
+) {
   return activeUser && activeOrganization && isUserAllowedToRequestUpgrades(activeUser) ? (
     <Button
       size="small"
@@ -49,6 +50,7 @@ function getUpgradeNowButton() {
 export const PricingEnforcedMenuItem: React.FunctionComponent<
   RequiredPricingProps & MenuItemProps
 > = ({ children, requiredPricingPlan, ...menuItemProps }) => {
+  const activeUser = useSelector((state: OxalisState) => state.activeUser);
   const activeOrganization = useSelector((state: OxalisState) => state.activeOrganization);
   const isFeatureAllowed = isFeatureAllowedByPricingPlan(activeOrganization, requiredPricingPlan);
 
@@ -60,7 +62,7 @@ export const PricingEnforcedMenuItem: React.FunctionComponent<
       content={
         <div style={popOverStyle}>
           {getFeatureNotAvailabeInPlanMessage(requiredPricingPlan, activeOrganization)}
-          {getUpgradeNowButton()}
+          {getUpgradeNowButton(activeUser, activeOrganization)}
         </div>
       }
       placement="right"
@@ -86,6 +88,7 @@ export const PricingEnforcedButton: React.FunctionComponent<RequiredPricingProps
   requiredPricingPlan,
   ...buttonProps
 }) => {
+  const activeUser = useSelector((state: OxalisState) => state.activeUser);
   const activeOrganization = useSelector((state: OxalisState) => state.activeOrganization);
   const isFeatureAllowed = isFeatureAllowedByPricingPlan(activeOrganization, requiredPricingPlan);
 
@@ -97,7 +100,7 @@ export const PricingEnforcedButton: React.FunctionComponent<RequiredPricingProps
       content={
         <div style={popOverStyle}>
           {getFeatureNotAvailabeInPlanMessage(requiredPricingPlan, activeOrganization)}
-          {getUpgradeNowButton()}
+          {getUpgradeNowButton(activeUser, activeOrganization)}
         </div>
       }
       placement="bottom"
@@ -116,6 +119,7 @@ export const PricingEnforcedBlur: React.FunctionComponent<RequiredPricingProps>
   requiredPricingPlan,
   ...restProps
 }) => {
+  const activeUser = useSelector((state: OxalisState) => state.activeUser);
   const activeOrganization = useSelector((state: OxalisState) => state.activeOrganization);
   const isFeatureAllowed = isFeatureAllowedByPricingPlan(activeOrganization, requiredPricingPlan);
 
@@ -141,7 +145,7 @@ export const PricingEnforcedBlur: React.FunctionComponent<RequiredPricingProps>
       content={
         <div style={popOverStyle}>
           {getFeatureNotAvailabeInPlanMessage(requiredPricingPlan, activeOrganization)}
-          {getUpgradeNowButton()}
+          {getUpgradeNowButton(activeUser, activeOrganization)}
         </div>
       }
       trigger="hover"
diff --git a/frontend/javascripts/types/api_flow_types.ts b/frontend/javascripts/types/api_flow_types.ts
index 7fc5c24c3e0..d09df624e65 100644
--- a/frontend/javascripts/types/api_flow_types.ts
+++ b/frontend/javascripts/types/api_flow_types.ts
@@ -518,7 +518,7 @@ export type APIOrganization = {
   readonly includedUsers: number;
   readonly includedStorageBytes: number;
   readonly usedStorageBytes: number;
-  readonly owner: APIUserCompact;
+  readonly ownerName: string;
 };
 export type APIPricingPlanStatus = {
   readonly pricingPlan: PricingPlanEnum;

From 3b33867c0a74a681627e2a2a18be01c8111d957f Mon Sep 17 00:00:00 2001
From: Tom Herold <tom.herold@scalableminds.com>
Date: Mon, 6 Feb 2023 17:36:52 +0100
Subject: [PATCH 07/14] updated changelog

---
 CHANGELOG.unreleased.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
index adc49e3a9f3..788756fc741 100644
--- a/CHANGELOG.unreleased.md
+++ b/CHANGELOG.unreleased.md
@@ -15,6 +15,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
 ### Changed
 - Limit paid team sharing features to respective organization plans. [#6767](https://github.com/scalableminds/webknossos/pull/6776)
 - Rewrite the database tools in `tools/postgres` to JavaScript and adding support for non-default Postgres username-password combinations. [#6803](https://github.com/scalableminds/webknossos/pull/6803)
+- Added owner name to organization page. [#6811](https://github.com/scalableminds/webknossos/pull/6811)
 
 ### Fixed
 - Fixed a benign error message which briefly appeared after logging in. [#6810](https://github.com/scalableminds/webknossos/pull/6810)

From 96906420f6e7ccd2c9c120cacbd387e74f2a4473 Mon Sep 17 00:00:00 2001
From: Tom Herold <tom.herold@scalableminds.com>
Date: Mon, 6 Feb 2023 17:43:43 +0100
Subject: [PATCH 08/14] remove unused comment

---
 frontend/javascripts/components/pricing_enforcers.tsx | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/frontend/javascripts/components/pricing_enforcers.tsx b/frontend/javascripts/components/pricing_enforcers.tsx
index 2772c241c16..5c171b6024e 100644
--- a/frontend/javascripts/components/pricing_enforcers.tsx
+++ b/frontend/javascripts/components/pricing_enforcers.tsx
@@ -214,9 +214,4 @@ export function PageUnavailableForYourPlanView({
       />
     </div>
   );
-}
-
-// style={{
-//           maxWidth: "500px",
-//           margin: "0 auto",
-//         }}
+}
\ No newline at end of file

From b189713b54c86070645bcd19ca9b43abb65657b2 Mon Sep 17 00:00:00 2001
From: Tom Herold <tom.herold@scalableminds.com>
Date: Tue, 7 Feb 2023 14:03:34 +0100
Subject: [PATCH 09/14] Update app/models/user/User.scala

Co-authored-by: Florian M <fm3@users.noreply.github.com>
---
 app/models/user/User.scala | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/models/user/User.scala b/app/models/user/User.scala
index 3bc25783886..e66f66126a7 100644
--- a/app/models/user/User.scala
+++ b/app/models/user/User.scala
@@ -159,16 +159,15 @@ class UserDAO @Inject()(sqlClient: SqlClient)(implicit ec: ExecutionContext)
       parsed <- Fox.combined(r.toList.map(parse))
     } yield parsed
 
-  def findOwnerByOrg(organizationId: ObjectId)(implicit ctx: DBAccessContext): Fox[User] =
+  def findOwnerByOrg(organizationId: ObjectId): Fox[User] =
     for {
-      accessQuery <- accessQueryFromAccessQ(listAccessQ)
       r <- run(q"""select $columns
                    from $existingCollectionName
-                   where $accessQuery
-                   and isOrganizationOwner
+                   where isOrganizationOwner
                    and not isDeactivated
                    and _organization = $organizationId
-                   order by _id""".as[UsersRow])
+                   order by _id
+                   limit 1""".as[UsersRow])
       parsed <- parseFirst(r, organizationId)
     } yield parsed
 

From 37b549cfcac07f6894392e01dab2d0a4f0870a80 Mon Sep 17 00:00:00 2001
From: Tom Herold <tom.herold@scalableminds.com>
Date: Tue, 7 Feb 2023 14:04:51 +0100
Subject: [PATCH 10/14] Update
 app/models/organization/OrganizationService.scala

Co-authored-by: Florian M <fm3@users.noreply.github.com>
---
 app/models/organization/OrganizationService.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/organization/OrganizationService.scala b/app/models/organization/OrganizationService.scala
index 6ba4849ed11..50d28cef249 100644
--- a/app/models/organization/OrganizationService.scala
+++ b/app/models/organization/OrganizationService.scala
@@ -40,8 +40,8 @@ class OrganizationService @Inject()(organizationDAO: OrganizationDAO,
     } else Json.obj()
     for {
       usedStorageBytes <- organizationDAO.getUsedStorage(organization._id)
-      owner <- userDAO.findOwnerByOrg(organization._id)(GlobalAccessContext)
-      ownerName = s"${owner.firstName} ${owner.lastName}"
+      ownerBox <- userDAO.findOwnerByOrg(organization._id).futureBox
+      ownerNameOpt = ownerBox.toOption.map(o => s"${o.firstName} ${o.lastName}")
     } yield
       Json.obj(
         "id" -> organization._id.toString,

From d11efcceb0dd4f4a1b393833d6db683f134be816 Mon Sep 17 00:00:00 2001
From: Tom Herold <tom.herold@scalableminds.com>
Date: Tue, 7 Feb 2023 14:14:11 +0100
Subject: [PATCH 11/14] applied PR feedback

---
 .../organization/OrganizationService.scala    |  2 +-
 .../admin/organization/pricing_plan_utils.ts  |  4 +--
 .../components/pricing_enforcers.tsx          | 31 ++++++++++---------
 frontend/javascripts/messages.tsx             |  2 +-
 .../oxalis/model/accessors/tool_accessor.ts   |  4 +--
 .../segments_tab/segments_view.tsx            |  4 +--
 frontend/javascripts/types/api_flow_types.ts  |  2 +-
 7 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/app/models/organization/OrganizationService.scala b/app/models/organization/OrganizationService.scala
index 50d28cef249..959ec566ffb 100644
--- a/app/models/organization/OrganizationService.scala
+++ b/app/models/organization/OrganizationService.scala
@@ -54,7 +54,7 @@ class OrganizationService @Inject()(organizationDAO: OrganizationDAO,
         "includedUsers" -> organization.includedUsers,
         "includedStorageBytes" -> organization.includedStorageBytes,
         "usedStorageBytes" -> usedStorageBytes,
-        "ownerName" -> ownerName
+        "ownerName" -> ownerNameOpt
       ) ++ adminOnlyInfo
   }
 
diff --git a/frontend/javascripts/admin/organization/pricing_plan_utils.ts b/frontend/javascripts/admin/organization/pricing_plan_utils.ts
index e44a273df5b..629035d3d2c 100644
--- a/frontend/javascripts/admin/organization/pricing_plan_utils.ts
+++ b/frontend/javascripts/admin/organization/pricing_plan_utils.ts
@@ -85,14 +85,14 @@ export function isFeatureAllowedByPricingPlan(
   return isPricingPlanGreaterEqualThan(organization.pricingPlan, requiredPricingPlan);
 }
 
-export function getFeatureNotAvailabeInPlanMessage(
+export function getFeatureNotAvailableInPlanMessage(
   requiredPricingPlan: PricingPlanEnum,
   organization: APIOrganization | null,
 ) {
   let organizationOwnerName = "";
 
   // expected naming schema for owner: "(M. Mustermann)" | ""
-  if (organization) {
+  if (organization?.ownerName) {
     {
       const [firstName, ...rest] = organization.ownerName.split(" ");
       organizationOwnerName = `(${firstName[0]}. ${rest.join(" ")})`;
diff --git a/frontend/javascripts/components/pricing_enforcers.tsx b/frontend/javascripts/components/pricing_enforcers.tsx
index 5c171b6024e..38d0ce83b0d 100644
--- a/frontend/javascripts/components/pricing_enforcers.tsx
+++ b/frontend/javascripts/components/pricing_enforcers.tsx
@@ -3,7 +3,7 @@ import { useSelector } from "react-redux";
 import { Menu, MenuItemProps, Alert, ButtonProps, Button, Result, Popover } from "antd";
 import { LockOutlined } from "@ant-design/icons";
 import {
-  getFeatureNotAvailabeInPlanMessage,
+  getFeatureNotAvailableInPlanMessage,
   isFeatureAllowedByPricingPlan,
   PricingPlanEnum,
 } from "admin/organization/pricing_plan_utils";
@@ -34,16 +34,17 @@ type RequiredPricingProps = { requiredPricingPlan: PricingPlanEnum };
 
 function getUpgradeNowButton(
   activeUser: APIUser | null | undefined,
-  activeOrganization: APIOrganization | undefined,
+  activeOrganization: APIOrganization | null
 ) {
   return activeUser && activeOrganization && isUserAllowedToRequestUpgrades(activeUser) ? (
-    <Button
-      size="small"
-      onClick={() => UpgradePricingPlanModal.upgradePricingPlan(activeOrganization)}
-      style={{ marginTop: 10 }}
-    >
-      Upgrade Now
-    </Button>
+    <div style={{ marginTop: 8 }}>
+      <Button
+        size="small"
+        onClick={() => UpgradePricingPlanModal.upgradePricingPlan(activeOrganization)}
+      >
+        Upgrade Now
+      </Button>
+    </div>
   ) : null;
 }
 
@@ -61,7 +62,7 @@ export const PricingEnforcedMenuItem: React.FunctionComponent<
       color={PRIMARY_COLOR_HEX}
       content={
         <div style={popOverStyle}>
-          {getFeatureNotAvailabeInPlanMessage(requiredPricingPlan, activeOrganization)}
+          {getFeatureNotAvailableInPlanMessage(requiredPricingPlan, activeOrganization)}
           {getUpgradeNowButton(activeUser, activeOrganization)}
         </div>
       }
@@ -99,7 +100,7 @@ export const PricingEnforcedButton: React.FunctionComponent<RequiredPricingProps
       color={PRIMARY_COLOR_HEX}
       content={
         <div style={popOverStyle}>
-          {getFeatureNotAvailabeInPlanMessage(requiredPricingPlan, activeOrganization)}
+          {getFeatureNotAvailableInPlanMessage(requiredPricingPlan, activeOrganization)}
           {getUpgradeNowButton(activeUser, activeOrganization)}
         </div>
       }
@@ -144,7 +145,7 @@ export const PricingEnforcedBlur: React.FunctionComponent<RequiredPricingProps>
       color={PRIMARY_COLOR_HEX}
       content={
         <div style={popOverStyle}>
-          {getFeatureNotAvailabeInPlanMessage(requiredPricingPlan, activeOrganization)}
+          {getFeatureNotAvailableInPlanMessage(requiredPricingPlan, activeOrganization)}
           {getUpgradeNowButton(activeUser, activeOrganization)}
         </div>
       }
@@ -171,7 +172,7 @@ export const PricingEnforcedBlur: React.FunctionComponent<RequiredPricingProps>
         >
           <Alert
             showIcon
-            message={getFeatureNotAvailabeInPlanMessage(requiredPricingPlan, activeOrganization)}
+            message={getFeatureNotAvailableInPlanMessage(requiredPricingPlan, activeOrganization)}
             icon={<LockOutlined />}
           />
         </div>
@@ -202,7 +203,7 @@ export function PageUnavailableForYourPlanView({
         title="Feature not available"
         subTitle={
           <p style={{ maxWidth: "500px", margin: "0 auto" }}>
-            {getFeatureNotAvailabeInPlanMessage(requiredPricingPlan, activeOrganization)}
+            {getFeatureNotAvailableInPlanMessage(requiredPricingPlan, activeOrganization)}
           </p>
         }
         extra={[
@@ -214,4 +215,4 @@ export function PageUnavailableForYourPlanView({
       />
     </div>
   );
-}
\ No newline at end of file
+}
diff --git a/frontend/javascripts/messages.tsx b/frontend/javascripts/messages.tsx
index b3d72a8904d..e180c6be5ac 100644
--- a/frontend/javascripts/messages.tsx
+++ b/frontend/javascripts/messages.tsx
@@ -440,5 +440,5 @@ 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 your organization owner ${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 at least a ${requiredPlan} plan.`,
 };
diff --git a/frontend/javascripts/oxalis/model/accessors/tool_accessor.ts b/frontend/javascripts/oxalis/model/accessors/tool_accessor.ts
index 05426ae79c0..de406a44cad 100644
--- a/frontend/javascripts/oxalis/model/accessors/tool_accessor.ts
+++ b/frontend/javascripts/oxalis/model/accessors/tool_accessor.ts
@@ -11,7 +11,7 @@ import { getVisibleSegmentationLayer } from "oxalis/model/accessors/dataset_acce
 import { isMagRestrictionViolated } from "oxalis/model/accessors/flycam_accessor";
 import { APIOrganization } from "types/api_flow_types";
 import {
-  getFeatureNotAvailabeInPlanMessage,
+  getFeatureNotAvailableInPlanMessage,
   isFeatureAllowedByPricingPlan,
   PricingPlanEnum,
 } from "admin/organization/pricing_plan_utils";
@@ -166,7 +166,7 @@ function _getDisabledInfoFromArgs(
         ? !hasSkeleton
           ? disabledSkeletonExplanation
           : disabledAgglomerateMappingsExplanation
-        : getFeatureNotAvailabeInPlanMessage(PricingPlanEnum.Power, activeOrganization),
+        : getFeatureNotAvailableInPlanMessage(PricingPlanEnum.Power, activeOrganization),
     },
   };
 }
diff --git a/frontend/javascripts/oxalis/view/right-border-tabs/segments_tab/segments_view.tsx b/frontend/javascripts/oxalis/view/right-border-tabs/segments_tab/segments_view.tsx
index ce838436da2..6e1d090a7ec 100644
--- a/frontend/javascripts/oxalis/view/right-border-tabs/segments_tab/segments_view.tsx
+++ b/frontend/javascripts/oxalis/view/right-border-tabs/segments_tab/segments_view.tsx
@@ -53,7 +53,7 @@ import Store from "oxalis/store";
 import Toast from "libs/toast";
 import features from "features";
 import {
-  getFeatureNotAvailabeInPlanMessage,
+  getFeatureNotAvailableInPlanMessage,
   isFeatureAllowedByPricingPlan,
   PricingPlanEnum,
 } from "admin/organization/pricing_plan_utils";
@@ -323,7 +323,7 @@ class SegmentsView extends React.Component<Props, State> {
     if (!isFeatureAllowedByPricingPlan(activeOrganization, PricingPlanEnum.Team)) {
       return {
         disabled: true,
-        title: getFeatureNotAvailabeInPlanMessage(PricingPlanEnum.Team, activeOrganization),
+        title: getFeatureNotAvailableInPlanMessage(PricingPlanEnum.Team, activeOrganization),
       };
     }
 
diff --git a/frontend/javascripts/types/api_flow_types.ts b/frontend/javascripts/types/api_flow_types.ts
index d09df624e65..f17e6354a0a 100644
--- a/frontend/javascripts/types/api_flow_types.ts
+++ b/frontend/javascripts/types/api_flow_types.ts
@@ -518,7 +518,7 @@ export type APIOrganization = {
   readonly includedUsers: number;
   readonly includedStorageBytes: number;
   readonly usedStorageBytes: number;
-  readonly ownerName: string;
+  readonly ownerName?: string;
 };
 export type APIPricingPlanStatus = {
   readonly pricingPlan: PricingPlanEnum;

From 3a9e63e4a66ef3bf5e10ec626fb145db4eddeb76 Mon Sep 17 00:00:00 2001
From: Tom Herold <tom.herold@scalableminds.com>
Date: Tue, 7 Feb 2023 14:14:49 +0100
Subject: [PATCH 12/14] foo

---
 frontend/javascripts/components/pricing_enforcers.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/javascripts/components/pricing_enforcers.tsx b/frontend/javascripts/components/pricing_enforcers.tsx
index 38d0ce83b0d..aa6de635501 100644
--- a/frontend/javascripts/components/pricing_enforcers.tsx
+++ b/frontend/javascripts/components/pricing_enforcers.tsx
@@ -34,7 +34,7 @@ type RequiredPricingProps = { requiredPricingPlan: PricingPlanEnum };
 
 function getUpgradeNowButton(
   activeUser: APIUser | null | undefined,
-  activeOrganization: APIOrganization | null
+  activeOrganization: APIOrganization | null,
 ) {
   return activeUser && activeOrganization && isUserAllowedToRequestUpgrades(activeUser) ? (
     <div style={{ marginTop: 8 }}>

From ac034c84cdee73c63289b6096401571f8c16d6be Mon Sep 17 00:00:00 2001
From: Tom Herold <tom.herold@scalableminds.com>
Date: Wed, 8 Feb 2023 15:12:54 +0100
Subject: [PATCH 13/14] applied PR feedback

---
 .../admin/organization/pricing_plan_utils.ts   |  6 +++++-
 .../components/pricing_enforcers.tsx           | 18 +++++++++++++-----
 frontend/javascripts/messages.tsx              |  4 +++-
 .../oxalis/model/accessors/tool_accessor.ts    | 11 +++++++++--
 .../segments_tab/segments_view.tsx             |  7 ++++++-
 5 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/frontend/javascripts/admin/organization/pricing_plan_utils.ts b/frontend/javascripts/admin/organization/pricing_plan_utils.ts
index 629035d3d2c..700eb9347a7 100644
--- a/frontend/javascripts/admin/organization/pricing_plan_utils.ts
+++ b/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) {
     {
diff --git a/frontend/javascripts/components/pricing_enforcers.tsx b/frontend/javascripts/components/pricing_enforcers.tsx
index aa6de635501..4df09e44d43 100644
--- a/frontend/javascripts/components/pricing_enforcers.tsx
+++ b/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={[
diff --git a/frontend/javascripts/messages.tsx b/frontend/javascripts/messages.tsx
index e180c6be5ac..a6e3ef9ce9d 100644
--- a/frontend/javascripts/messages.tsx
+++ b/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.`,
 };
diff --git a/frontend/javascripts/oxalis/model/accessors/tool_accessor.ts b/frontend/javascripts/oxalis/model/accessors/tool_accessor.ts
index de406a44cad..3dd21c4447f 100644
--- a/frontend/javascripts/oxalis/model/accessors/tool_accessor.ts
+++ b/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),
   );
 }
 
diff --git a/frontend/javascripts/oxalis/view/right-border-tabs/segments_tab/segments_view.tsx b/frontend/javascripts/oxalis/view/right-border-tabs/segments_tab/segments_view.tsx
index 6e1d090a7ec..4688a27b5cd 100644
--- a/frontend/javascripts/oxalis/view/right-border-tabs/segments_tab/segments_view.tsx
+++ b/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,
+        ),
       };
     }
 

From 360332cfbf6568d06beecbcd453aed58fc6544e6 Mon Sep 17 00:00:00 2001
From: Tom Herold <tom.herold@scalableminds.com>
Date: Wed, 8 Feb 2023 16:23:04 +0100
Subject: [PATCH 14/14] fix tests

---
 frontend/javascripts/oxalis/model/accessors/tool_accessor.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/frontend/javascripts/oxalis/model/accessors/tool_accessor.ts b/frontend/javascripts/oxalis/model/accessors/tool_accessor.ts
index 3dd21c4447f..234a75cc5e9 100644
--- a/frontend/javascripts/oxalis/model/accessors/tool_accessor.ts
+++ b/frontend/javascripts/oxalis/model/accessors/tool_accessor.ts
@@ -15,7 +15,6 @@ import {
   isFeatureAllowedByPricingPlan,
   PricingPlanEnum,
 } from "admin/organization/pricing_plan_utils";
-import { enforceActiveUser } from "./user_accessor";
 
 const zoomInToUseToolMessage = "Please zoom in further to use this tool.";
 
@@ -114,7 +113,7 @@ function _getDisabledInfoFromArgs(
   hasAgglomerateMappings: boolean,
   genericDisabledExplanation: string,
   activeOrganization: APIOrganization | null,
-  activeUser: APIUser,
+  activeUser: APIUser | null | undefined,
 ) {
   const isProofReadingToolAllowed = isFeatureAllowedByPricingPlan(
     activeOrganization,
@@ -242,7 +241,7 @@ export function getDisabledInfoForTools(state: OxalisState): Record<
     hasAgglomerateMappings,
     genericDisabledExplanation,
     state.activeOrganization,
-    enforceActiveUser(state.activeUser),
+    state.activeUser,
   );
 }