Merge branch 'master' into move-symlinks-on-dataset-delete

Author: frcroth

CHANGELOG.unreleased.md

@@ -33,6 +33,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
 - Fixed the alignment of the button that allows restricting floodfill operations to a bounding box. [#8388](https://github.com/scalableminds/webknossos/pull/8388) 
 - Fixed a bug for rotated dataset where volume tools were disabled although the dataset was rendered untransformed. [#8432](https://github.com/scalableminds/webknossos/pull/8432)
 - Fixed rare bug where saving got stuck. [#8409](https://github.com/scalableminds/webknossos/pull/8409)
+- Re-enabled jobs planned to be paid with credits for organizations without a paid plan. [#8478](https://github.com/scalableminds/webknossos/pull/8478)
 - Fixed that the dataset extent tooltip in the right details bar in the dashboard did not properly update when switching datasets. [#8477](https://github.com/scalableminds/webknossos/pull/8477)
 - Fixed some rendering bugs for float datasets that used a large dynamic range. [#8325](https://github.com/scalableminds/webknossos/pull/8325)
 - Fixed a bug where reverting annotations could get stuck if some of its layers had been deleted in the meantime. [#8405](https://github.com/scalableminds/webknossos/pull/8405)

app/controllers/JobController.scala

@@ -294,6 +294,7 @@ class JobController @Inject()(jobDAO: JobDAO,
           _ <- datasetService.assertValidDatasetName(newDatasetName)
           _ <- datasetService.assertValidLayerNameLax(layerName)
           multiUser <- multiUserDAO.findOne(request.identity._multiUser)
+          _ <- bool2Fox(multiUser.isSuperUser) ?~> "job.inferMitochondria.notAllowed.onlySuperUsers"
           command = JobCommand.infer_mitochondria
           parsedBoundingBox <- BoundingBox.fromLiteral(bbox).toFox
           _ <- Fox.runIf(!multiUser.isSuperUser)(jobService.assertBoundingBoxLimits(bbox, None))
@@ -335,8 +336,6 @@ class JobController @Inject()(jobDAO: JobDAO,
             .dataSourceFor(dataset)
             .flatMap(_.toUsable)
             .map(_.boundingBox) ?~> "dataset.boundingBox.unset"
-          multiUser <- multiUserDAO.findOne(request.identity._multiUser)
-          _ <- Fox.runIf(!multiUser.isSuperUser)(jobService.assertBoundingBoxLimits(datasetBoundingBox.toLiteral, None))
           command = JobCommand.align_sections
           commandArgs = Json.obj(
             "dataset_id" -> dataset._id,

app/models/organization/OrganizationService.scala

@@ -182,9 +182,8 @@ class OrganizationService @Inject()(organizationDAO: OrganizationDAO,
       _ <- organizationDAO.acceptTermsOfService(organizationId, version, Instant.now)
     } yield ()
 
-  def assertOrganizationHasPaidPlan(organizationId: String): Fox[Unit] =
-    for {
-      organization <- organizationDAO.findOne(organizationId)(GlobalAccessContext)
-      _ <- bool2Fox(PricingPlan.isPaidPlan(organization.pricingPlan)) ?~> "creditTransaction.notPaidPlan"
-    } yield ()
+  // Currently disabled as in the credit system trail phase all organizations should be able to start paid jobs.
+  // See tracking issue: https://github.com/scalableminds/webknossos/issues/8458
+  def assertOrganizationHasPaidPlan(organizationId: String): Fox[Unit] = Fox.successful(())
+
 }

conf/evolutions/130-replace-text-types.sql

@@ -21,7 +21,8 @@ ALTER TABLE webknossos.annotations ADD CONSTRAINT _team_objectId CHECK (_team ~
 ALTER TABLE webknossos.annotations ALTER COLUMN _user SET DATA TYPE TEXT;
 ALTER TABLE webknossos.annotations ADD CONSTRAINT _user_objectId CHECK (_user ~ '^[0-9a-f]{24}$');
 ALTER TABLE webknossos.annotations ALTER COLUMN _publication SET DATA TYPE TEXT;
-ALTER TABLE webknossos.annotations ADD CONSTRAINT _publication_objectId CHECK (_publication ~ '^[0-9a-f]{24}$');
+-- Dropped because there are publication ids that are not valid objectIds
+-- ALTER TABLE webknossos.annotations ADD CONSTRAINT _publication_objectId CHECK (_publication ~ '^[0-9a-f]{24}$');
 ALTER TABLE webknossos.annotations ALTER COLUMN name SET DATA TYPE TEXT;
 ALTER TABLE webknossos.annotations ALTER COLUMN name SET DEFAULT ''::TEXT;
 ALTER TABLE webknossos.annotations ALTER COLUMN tags SET DATA TYPE TEXT[];
@@ -69,7 +70,8 @@ COMMIT TRANSACTION;
 START TRANSACTION;
 DROP VIEW webknossos.publications_;
 ALTER TABLE webknossos.publications ALTER COLUMN _id SET DATA TYPE TEXT;
-ALTER TABLE webknossos.publications ADD CONSTRAINT _id_objectId CHECK (_id ~ '^[0-9a-f]{24}$');
+-- Dropped because there are publication ids that are not valid objectIds
+--ALTER TABLE webknossos.publications ADD CONSTRAINT _id_objectId CHECK (_id ~ '^[0-9a-f]{24}$');
 ALTER TABLE webknossos.publications ALTER COLUMN imageUrl SET DATA TYPE TEXT;
 ALTER TABLE webknossos.publications ALTER COLUMN title SET DATA TYPE TEXT;
 CREATE VIEW webknossos.publications_ AS SELECT * FROM webknossos.publications WHERE NOT isDeleted;
@@ -82,7 +84,8 @@ ALTER TABLE webknossos.datasets ADD CONSTRAINT _id_objectId CHECK (_id ~ '^[0-9a
 ALTER TABLE webknossos.datasets ALTER COLUMN _dataStore SET DATA TYPE TEXT;
 ALTER TABLE webknossos.datasets ALTER COLUMN _organization SET DATA TYPE TEXT;
 ALTER TABLE webknossos.datasets ALTER COLUMN _publication SET DATA TYPE TEXT;
-ALTER TABLE webknossos.datasets ADD CONSTRAINT _publication_objectId CHECK (_publication ~ '^[0-9a-f]{24}$');
+-- Dropped because there are publication ids that are not valid objectIds
+--ALTER TABLE webknossos.datasets ADD CONSTRAINT _publication_objectId CHECK (_publication ~ '^[0-9a-f]{24}$');
 ALTER TABLE webknossos.datasets ALTER COLUMN _uploader SET DATA TYPE TEXT;
 ALTER TABLE webknossos.datasets ADD CONSTRAINT _uploader_objectId CHECK (_uploader ~ '^[0-9a-f]{24}$');
 ALTER TABLE webknossos.datasets ALTER COLUMN _folder SET DATA TYPE TEXT;

conf/messages

@@ -340,6 +340,7 @@ job.convertToWkw.notAllowed.organization = Converting to WKW is only allowed for
 job.inferNuclei.notAllowed.organization = Currently nuclei inferral is only allowed for datasets of your own organization.
 job.inferNeurons.notAllowed.organization = Currently neuron inferral is only allowed for datasets of your own organization.
 job.inferNeurons.annotationIdEvalParamsMissing=A evaluation of the neuron inferral jobs was requested but no annotation was supplied.
+job.inferMitochondria.notAllowed.onlySuperUsers=Currently mitochondria inferral is only allowed for super users.
 job.meshFile.notAllowed.organization = Calculating mesh files is only allowed for datasets of your own organization.
 job.exportTiff.notAllowed.organization=Exporting tiff files is only allowed for datasets of your own organization.
 job.segmentIndexFile.notAllowed.organization = Calculating segment index files is only allowed for datasets of your own organization.
@@ -354,7 +355,6 @@ job.trainModel.notAllowed.organization = Training AI models is only allowed for
 job.runInference.notAllowed.organization = Running inference is only allowed for datasets of your own organization.
 job.paidJob.notAllowed.noPaidPlan = You are not allowed to run this job because your organization does not have a paid plan.
 job.notEnoughCredits = Your organization does not have enough WEBKNOSSOS credits to run this job.
-
 creditTransaction.notPaidPlan = Your organization does not have a paid plan.
 
 voxelytics.disabled = Voxelytics workflow reporting and logging are not enabled for this WEBKNOSSOS instance.

frontend/javascripts/oxalis/view/action-bar/starting_job_modals.tsx

@@ -675,13 +675,23 @@ function useCurrentlySelectedBoundingBox(
 ): UserBoundingBox | undefined {
   const selectedBoundingBoxId = Form.useWatch("boundingBoxId", form);
   const currentlySelectedLayerName = Form.useWatch("layerName", form);
-  const currentSelectedLayer = layers.find((layer) => layer.name === currentlySelectedLayerName);
-  const indexOfLayer = currentSelectedLayer ? layers.indexOf(currentSelectedLayer) : -1;
-  return isBoundingBoxConfigurable
-    ? userBoundingBoxes.find((bbox) => bbox.id === selectedBoundingBoxId)
-    : indexOfLayer >= 0
-      ? defaultBBForLayers[indexOfLayer]
-      : undefined;
+  const [currentlySelectedBoundingBox, setCurrentlySelectedBoundingBox] = useState<
+    UserBoundingBox | undefined
+  >(undefined);
+  // userBoundingBoxes, defaultBBForLayers, layers are different objects with each calls,
+  // but they shouldn't be able to change while the modal is open
+  // biome-ignore lint/correctness/useExhaustiveDependencies: see above
+  useEffect(() => {
+    const currentSelectedLayer = layers.find((layer) => layer.name === currentlySelectedLayerName);
+    const indexOfLayer = currentSelectedLayer ? layers.indexOf(currentSelectedLayer) : -1;
+    const newCurrentlySelectedBoundingBox = isBoundingBoxConfigurable
+      ? userBoundingBoxes.find((bbox) => bbox.id === selectedBoundingBoxId)
+      : indexOfLayer >= 0
+        ? defaultBBForLayers[indexOfLayer]
+        : undefined;
+    setCurrentlySelectedBoundingBox(newCurrentlySelectedBoundingBox);
+  }, [selectedBoundingBoxId, currentlySelectedLayerName, isBoundingBoxConfigurable]);
+  return currentlySelectedBoundingBox;
 }
 
 function StartJobForm(props: StartJobFormProps) {

tools/postgres/schema.sql

@@ -34,7 +34,7 @@ CREATE TABLE webknossos.annotations(
   _task TEXT CONSTRAINT _task_objectId CHECK (_task ~ '^[0-9a-f]{24}$'),
   _team TEXT CONSTRAINT _team_objectId CHECK (_team ~ '^[0-9a-f]{24}$') NOT NULL,
   _user TEXT CONSTRAINT _user_objectId CHECK (_user ~ '^[0-9a-f]{24}$') NOT NULL,
-  _publication TEXT CONSTRAINT _publication_objectId CHECK (_publication ~ '^[0-9a-f]{24}$'),
+  _publication TEXT,
   description TEXT NOT NULL DEFAULT '',
   visibility webknossos.ANNOTATION_VISIBILITY NOT NULL DEFAULT 'Internal',
   name TEXT NOT NULL DEFAULT '',
@@ -93,7 +93,7 @@ CREATE TABLE webknossos.meshes(
 );
 
 CREATE TABLE webknossos.publications(
-  _id TEXT CONSTRAINT _id_objectId CHECK (_id ~ '^[0-9a-f]{24}$') PRIMARY KEY,
+  _id TEXT PRIMARY KEY,
   publicationDate TIMESTAMPTZ,
   imageUrl TEXT,
   title TEXT,
@@ -107,7 +107,7 @@ CREATE TABLE webknossos.datasets(
   _id TEXT CONSTRAINT _id_objectId CHECK (_id ~ '^[0-9a-f]{24}$') PRIMARY KEY,
   _dataStore TEXT NOT NULL,
   _organization TEXT NOT NULL,
-  _publication TEXT CONSTRAINT _publication_objectId CHECK (_publication ~ '^[0-9a-f]{24}$'),
+  _publication TEXT,
   _uploader TEXT CONSTRAINT _uploader_objectId CHECK (_uploader ~ '^[0-9a-f]{24}$'),
   _folder TEXT CONSTRAINT _folder_objectId CHECK (_folder ~ '^[0-9a-f]{24}$') NOT NULL,
   inboxSourceHash INT,