Add owner information to organization #6811

hotzenklotz · 2023-02-03T13:21:50Z

Added owner information to organization REST API route and organization page.
- Flo and I decided that we did not want share the whole orga owner user object through the API but rather just a string since some API calls expose the default orga without any authentication
Also added the owner name to some of the pricing tooltips to help guide people to right person.
Added a button to the tooltip/popover in case you are the owner to upgrade seamlessly.

Steps to test:

Hover over any feature that is restricted to certain plans
Check out the owner name in the organization page

Issues:

contributes to Implement Pricing Concept #6509

(Please delete unneeded items, merge only when none are left open)

Updated (unreleased) changelog
Updated (unreleased) migration guide if applicable
Updated documentation if applicable
Adapted wk-connect if datastore API changes
Adapted wk-libs python client if relevant API parts change
Needs datastore update after deployment
Ready for review

…a_owner * 'master' of github.com:scalableminds/webknossos: Fix saving allowed teams in dataset settings (#6817) Prevent Deactivaing Orga Owner (#6816) Fix some login problems (#6810)

hotzenklotz · 2023-02-06T16:35:54Z

@fm3 Please review backend parts
@philippotto Please review frontend parts.

…a_owner * 'master' of github.com:scalableminds/webknossos: Rewrite database tooling and support for postgres passwords (#6803)

hotzenklotz · 2023-02-06T16:42:52Z

frontend/javascripts/admin/organization/upgrade_plan_modal.tsx

@@ -299,6 +299,7 @@ function UpgradePricingPlanModal({
          ) : null}
        </>
      }
+      zIndex={10000} // overlay everything


@philippotto I tried to click somewhere in the background (document.body.click()) to make the menu disappear but that did not work. With the high zIndex you can at least be sure that it overlays anything.

philippotto

👍 Only left some nitpicks/suggestions. Will test later.

philippotto · 2023-02-07T08:46:26Z

frontend/javascripts/messages.tsx

+    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.`,


"Ask the owner of your organization (John Doe)" would be more idiomatic english than "organization owner", I think.
Also, I'd change the type to organizationOwnerName: string | null and then do a conditional on that so that the double space is avoided if the owner is not known.

Also, I'd change the type to organizationOwnerName: string | null and then do a conditional on that so that the double space is avoided if the owner is not known.

Mhm, I was hoping that getFeatureNotAvailabeInPlanMessage() already checks against null to avoid doing this logic in the messages module. it, does not, however, prevent a double space.

ok, i see. i don't even know whether the double space is rendered at all? I think this could get collapsed into a single space by the browser? if it's rendered, fixing the doublespace without moving the null-check could work something like this: ... owner ${organizationOwnerName}to (no space before "to") and then organizationOwnerName should have a trailing space if it's not empty...

TBH, I would not optimize for extremely unlikely case that an orga has no owner. This can only ever be the case if a DB migration was not executed correctly.

good point 👍

frontend/javascripts/admin/organization/pricing_plan_utils.ts

frontend/javascripts/components/pricing_enforcers.tsx

fm3

Thanks for looking into this! I added some suggestions for the scala code :)

app/models/user/User.scala

app/models/organization/OrganizationService.scala

…a_owner * 'master' of github.com:scalableminds/webknossos: Fix error message when trying to join an orga you are already in (#6824) Access Google Cloud Storage via NIO (#6775)

Co-authored-by: Florian M <fm3@users.noreply.github.com>

… orga_owner * 'orga_owner' of github.com:scalableminds/webknossos: Update app/models/user/User.scala

Co-authored-by: Florian M <fm3@users.noreply.github.com>

… orga_owner * 'orga_owner' of github.com:scalableminds/webknossos: Update app/models/organization/OrganizationService.scala

…a_owner * 'master' of github.com:scalableminds/webknossos: fixes loki log batching (#6828)

… orga_owner * 'orga_owner' of github.com:scalableminds/webknossos:

fm3

Backend LGTM. Did not test, though

philippotto · 2023-02-08T09:08:40Z

I noticed two things during testing:

the tooltip says "Ask the owner (...)" even when the current user is the owner actually. I think this is weird and we should try to avoid this wording in that case.
~~[ ] in case of the proofreading tool, there is no popover but still the old tooltip. is this intended?~~

Other than that, it works great 👍

hotzenklotz · 2023-02-08T09:10:18Z

in case of the proofreading tool, there is no popover but still the old tooltip. is this intended?

Yes, this is intended. The toolbar has uses a tooltip for the description of all the individual tools that was "hijacked" for this message. This keeps things simple.

philippotto · 2023-02-08T09:11:32Z

in case of the proofreading tool, there is no popover but still the old tooltip. is this intended?

Yes, this is intended. The toolbar has uses a tooltip for the description of all the individual tools that was "hijacked" for this message. This keeps things simple.

Ok, fair enough 👍

…a_owner * 'master' of github.com:scalableminds/webknossos: Loki batched insert (#6831) Fix editable text style (#6799) Fix dbtool schema scheck stderr capturing (#6830) Release 23.02.1 (#6827)

… orga_owner * 'orga_owner' of github.com:scalableminds/webknossos:

philippotto · 2023-02-08T14:17:54Z

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

@@ -236,6 +242,7 @@ export function getDisabledInfoForTools(state: OxalisState): Record<
    hasAgglomerateMappings,
    genericDisabledExplanation,
    state.activeOrganization,
+    enforceActiveUser(state.activeUser),


why enforce? getFeatureNotAvailableInPlanMessage should be able to handle null for the active user. i think this could crash currently when viewing a public annotation.

philippotto

Great 👍

added orga owner to organization REST route

a22be83

hotzenklotz added backend frontend labels Feb 3, 2023

hotzenklotz self-assigned this Feb 3, 2023

hotzenklotz added 6 commits February 3, 2023 14:32

add organization owner info to orga page

bfbde56

provide restricted plan message with owner information

cfca6c7

make option to upgrade more prominent

1574c22

Merge branch 'master' of github.com:scalableminds/webknossos into org…

b04de23

…a_owner * 'master' of github.com:scalableminds/webknossos: Fix saving allowed teams in dataset settings (#6817) Prevent Deactivaing Orga Owner (#6816) Fix some login problems (#6810)

replace tooltips with popovers

87474c4

convert owner name information to string

7de089c

hotzenklotz requested review from fm3 and philippotto and removed request for fm3 February 6, 2023 16:35

hotzenklotz added 2 commits February 6, 2023 17:36

Merge branch 'master' of github.com:scalableminds/webknossos into org…

46df119

…a_owner * 'master' of github.com:scalableminds/webknossos: Rewrite database tooling and support for postgres passwords (#6803)

updated changelog

3b33867

hotzenklotz requested a review from fm3 February 6, 2023 16:38

hotzenklotz commented Feb 6, 2023

View reviewed changes

hotzenklotz changed the title ~~Add owner information to organization (WIP)~~ Add owner information to organization Feb 6, 2023

remove unused comment

9690642

philippotto requested changes Feb 7, 2023

View reviewed changes

fm3 requested changes Feb 7, 2023

View reviewed changes

app/models/user/User.scala Outdated Show resolved Hide resolved

app/models/organization/OrganizationService.scala Outdated Show resolved Hide resolved

app/models/organization/OrganizationService.scala Outdated Show resolved Hide resolved

hotzenklotz and others added 8 commits February 7, 2023 13:44

Merge branch 'master' of github.com:scalableminds/webknossos into org…

fd01e98

…a_owner * 'master' of github.com:scalableminds/webknossos: Fix error message when trying to join an orga you are already in (#6824) Access Google Cloud Storage via NIO (#6775)

Update app/models/user/User.scala

b189713

Co-authored-by: Florian M <fm3@users.noreply.github.com>

Merge branch 'orga_owner' of github.com:scalableminds/webknossos into…

ba8780f

… orga_owner * 'orga_owner' of github.com:scalableminds/webknossos: Update app/models/user/User.scala

Update app/models/organization/OrganizationService.scala

37b549c

Co-authored-by: Florian M <fm3@users.noreply.github.com>

Merge branch 'orga_owner' of github.com:scalableminds/webknossos into…

f951c47

… orga_owner * 'orga_owner' of github.com:scalableminds/webknossos: Update app/models/organization/OrganizationService.scala

applied PR feedback

d11efcc

foo

3a9e63e

Merge branch 'master' into orga_owner

5ef0d43

hotzenklotz added 2 commits February 7, 2023 16:14

Merge branch 'master' of github.com:scalableminds/webknossos into org…

f47dd76

…a_owner * 'master' of github.com:scalableminds/webknossos: fixes loki log batching (#6828)

Merge branch 'orga_owner' of github.com:scalableminds/webknossos into…

788bee8

… orga_owner * 'orga_owner' of github.com:scalableminds/webknossos:

fm3 approved these changes Feb 7, 2023

View reviewed changes

Merge branch 'master' into orga_owner

cc1c9fb

hotzenklotz added 3 commits February 8, 2023 14:05

Merge branch 'master' of github.com:scalableminds/webknossos into org…

5dd39a2

…a_owner * 'master' of github.com:scalableminds/webknossos: Loki batched insert (#6831) Fix editable text style (#6799) Fix dbtool schema scheck stderr capturing (#6830) Release 23.02.1 (#6827)

applied PR feedback

ac034c8

Merge branch 'orga_owner' of github.com:scalableminds/webknossos into…

1926512

… orga_owner * 'orga_owner' of github.com:scalableminds/webknossos:

philippotto reviewed Feb 8, 2023

View reviewed changes

fix tests

360332c

philippotto approved these changes Feb 8, 2023

View reviewed changes

Merge branch 'master' into orga_owner

fba3c40

hotzenklotz merged commit b3673cd into master Feb 8, 2023

hotzenklotz deleted the orga_owner branch February 8, 2023 16:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add owner information to organization #6811

Add owner information to organization #6811

hotzenklotz commented Feb 3, 2023 •

edited

hotzenklotz commented Feb 6, 2023

hotzenklotz Feb 6, 2023

philippotto left a comment

philippotto Feb 7, 2023

hotzenklotz Feb 7, 2023

philippotto Feb 7, 2023

hotzenklotz Feb 7, 2023

philippotto Feb 7, 2023

fm3 left a comment

fm3 left a comment

philippotto commented Feb 8, 2023 •

edited by hotzenklotz

hotzenklotz commented Feb 8, 2023

philippotto commented Feb 8, 2023

philippotto Feb 8, 2023

philippotto left a comment

Add owner information to organization #6811

Add owner information to organization #6811

Conversation

hotzenklotz commented Feb 3, 2023 • edited

Steps to test:

Issues:

hotzenklotz commented Feb 6, 2023

hotzenklotz Feb 6, 2023

Choose a reason for hiding this comment

philippotto left a comment

Choose a reason for hiding this comment

philippotto Feb 7, 2023

Choose a reason for hiding this comment

hotzenklotz Feb 7, 2023

Choose a reason for hiding this comment

philippotto Feb 7, 2023

Choose a reason for hiding this comment

hotzenklotz Feb 7, 2023

Choose a reason for hiding this comment

philippotto Feb 7, 2023

Choose a reason for hiding this comment

fm3 left a comment

Choose a reason for hiding this comment

fm3 left a comment

Choose a reason for hiding this comment

philippotto commented Feb 8, 2023 • edited by hotzenklotz

hotzenklotz commented Feb 8, 2023

philippotto commented Feb 8, 2023

philippotto Feb 8, 2023

Choose a reason for hiding this comment

philippotto left a comment

Choose a reason for hiding this comment

hotzenklotz commented Feb 3, 2023 •

edited

philippotto commented Feb 8, 2023 •

edited by hotzenklotz