Fix registration for setups with one organization (#4559)

* fix login and remove defaultOrganization from application.conf feature block
* update changelog and migration guide
* Merge branch 'master' into fix-register
* remove unused var
* Merge branch 'fix-register' of github.com:scalableminds/webknossos into fix-register
* update snapshots
* Merge branch 'master' into fix-register

Author: philippotto

CHANGELOG.md

@@ -32,6 +32,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.md).
 - The datastore checks if a organization folder can be created before creating a new organization. [#4501](https://github.com/scalableminds/webknossos/pull/4501)
 - Fixed a bug where under certain circumstances groups in the tree tab were not sorted by name. [#4542](https://github.com/scalableminds/webknossos/pull/4542)
 - Fixed that `segmentationOpacity` could not be set anymore as part of the recommended settings for a task type. [#4545](https://github.com/scalableminds/webknossos/pull/4545)
+- Fixed registration for setups with one organization and not configured defaultOrganization. [#4559](https://github.com/scalableminds/webknossos/pull/4559)
 - Fixed a rendering error which could make some layers disappear in certain circumstances. [#4556](https://github.com/scalableminds/webknossos/pull/4556)
 
 ### Removed

MIGRATIONS.md

@@ -5,6 +5,7 @@ This project adheres to [Calendar Versioning](http://calver.org/) `0Y.0M.MICRO`.
 User-facing changes are documented in the [changelog](CHANGELOG.md).
 
 ## Unreleased
+- The optional `defaultOrganization` attribute from the `features` block in `application.conf` is not used anymore and can be removed. [#4559](https://github.com/scalableminds/webknossos/pull/4559)
 
 ### Postgres Evolutions:
 

conf/application.conf

@@ -84,7 +84,6 @@ features {
   # this part of the config is exposed as JSON via /api/features
   discussionBoard = "https://support.webknossos.org"
   discussionBoardRequiresAdmin = false
-  defaultOrganization = ""
   addForeignDataset = false
   hideNavbarLogin = false
   # if isDemoInstance is true, / will always be the /spotlight page

frontend/javascripts/admin/admin_rest_api.js

@@ -1126,7 +1126,7 @@ export async function getOpenTasksReport(teamId: string): Promise<Array<APIOpenT
 // ### Organizations
 export async function getDefaultOrganization(): Promise<?APIOrganization> {
   // Only returns an organization if the webKnossos instance only has one organization
-  await Request.receiveJSON("/api/organizations/default");
+  return Request.receiveJSON("/api/organizations/default");
 }
 
 export function getOrganization(organizationName: string): Promise<APIOrganization> {

frontend/javascripts/admin/api_flow_types.js

@@ -517,7 +517,6 @@ export type APIBuildInfo = {
 export type APIFeatureToggles = {
   +discussionBoard: string | false,
   +discussionBoardRequiresAdmin: boolean,
-  +defaultOrganization: string,
   +addForeignDataset: boolean,
   +hideNavbarLogin: boolean,
   +isDemoInstance: boolean,

frontend/javascripts/admin/auth/registration_form.js

@@ -8,7 +8,6 @@ import { setActiveUserAction } from "oxalis/model/actions/user_actions";
 import Request from "libs/request";
 import Store from "oxalis/throttled_store";
 import messages from "messages";
-import features from "features";
 import { setHasOrganizationsAction } from "oxalis/model/actions/ui_actions";
 
 const FormItem = Form.Item;
@@ -140,9 +139,6 @@ class RegistrationForm extends React.PureComponent<Props, State> {
       );
     }
 
-    const { defaultOrganization } = features();
-    const doesDefaultOrganizationExist = this.state.organization != null;
-
     return (
       <>
         <FormItem style={{ display: "none" }}>
@@ -158,7 +154,7 @@ class RegistrationForm extends React.PureComponent<Props, State> {
                 message: messages["auth.registration_org_input"],
               },
             ],
-            initialValue: doesDefaultOrganizationExist ? defaultOrganization : undefined,
+            initialValue: this.props.organizationName,
           })(<Input type="text" disabled />)}
         </FormItem>
       </>

frontend/javascripts/admin/auth/registration_view.js

@@ -4,30 +4,30 @@ import { Link, useHistory } from "react-router-dom";
 import { Spin, Row, Col, Card } from "antd";
 import messages from "messages";
 import Toast from "libs/toast";
-import { getOrganization } from "admin/admin_rest_api";
+import { getOrganization, getDefaultOrganization } from "admin/admin_rest_api";
 import features from "features";
 import RegistrationForm from "./registration_form";
 
 type Props = {
-  organizationName: string,
+  organizationName?: string,
 };
 
-function RegistrationView({ organizationName = "default" }: Props) {
+function RegistrationView({ organizationName }: Props) {
   const history = useHistory();
   const [organization, setOrganization] = useState(null);
   const [isLoading, setIsLoading] = useState(true);
 
   useEffect(() => {
     (async () => {
-      if (organizationName) {
-        try {
-          setIsLoading(true);
+      setIsLoading(true);
+      try {
+        if (organizationName != null) {
           setOrganization(await getOrganization(organizationName));
-        } finally {
-          setIsLoading(false);
+        } else {
+          const defaultOrg = await getDefaultOrganization();
+          setOrganization(defaultOrg);
         }
-      } else {
-        setOrganization(null);
+      } finally {
         setIsLoading(false);
       }
     })();
@@ -45,8 +45,8 @@ function RegistrationView({ organizationName = "default" }: Props) {
         <RegistrationForm
           // The key is used to enforce a remount in case the organizationName changes.
           // That way, we ensure that the organization field is cleared.
-          key={organizationName}
-          organizationName={organizationName}
+          key={organization.name}
+          organizationName={organization.name}
           onRegistered={(isUserLoggedIn?: boolean) => {
             if (isUserLoggedIn) {
               history.goBack();
@@ -65,11 +65,13 @@ function RegistrationView({ organizationName = "default" }: Props) {
   } else {
     content = (
       <Card style={{ marginBottom: 24 }}>
-        We could not find your organization.
+        {organizationName != null
+          ? "We could not find your organization."
+          : "We could not find a default organization to sign up for."}
         <br /> Please check your link or{" "}
         {features().isDemoInstance ? (
           <>
-            <Link to="/onboarding">create a new organization</Link>.
+            <Link to="/">create a new organization</Link>.
           </>
         ) : (
           <>

frontend/javascripts/admin/onboarding.js

@@ -257,7 +257,7 @@ const OrganizationForm = Form.create()(({ form, onComplete }) => {
           >
             {getFieldDecorator("organizationName", {
               rules: [{ required: true, message: "Please enter an organization name!" }],
-              initialValue: features().defaultOrganization,
+              initialValue: "",
             })(
               <AutoComplete
                 size="large"

frontend/javascripts/pages/frontpage/pricing_view.js

@@ -6,7 +6,7 @@ import CreditsFooter from "components/credits_footer";
 import { SocialMediaBlock } from "pages/frontpage/features_view";
 import { trackAction } from "oxalis/model/helpers/analytics";
 
-export const bgColorLight = "hsl(208, 30%, 88%)";
+export const bgColorLight = "hsl(214, 28%, 95%)";
 export const bgColorDark = "hsl(208, 100%, 46%)";
 
 const PricingColumn = ({

frontend/javascripts/test/snapshots/public/test-bundle/test/backend-snapshot-tests/misc.e2e.js.md

@@ -65,7 +65,6 @@ Generated by [AVA](https://ava.li).
     {
       addForeignDataset: false,
       autoBrushReadyDatasets: [],
-      defaultOrganization: '',
       discussionBoard: 'https://support.webknossos.org',
       discussionBoardRequiresAdmin: false,
       hideNavbarLogin: false,

frontend/javascripts/test/snapshots/public/test-bundle/test/backend-snapshot-tests/misc.e2e.js.snap

@@ -52,13 +52,6 @@ Generated by [AVA](https://ava.li).
       },
     ]
 
-## teams-getOrganizationNames()
-
-    [
-      'Organization_X',
-      'Organization_Y',
-    ]
-
 ## teams-getTeams()
 
     [