Download Sample Datasets

app/models/binary/DataStore.scala

@@ -82,6 +82,12 @@ class DataStoreDAO @Inject()(sqlClient: SQLClient)(implicit ec: ExecutionContext
       parsed
     }
 
+  override def findAll(implicit ctx: DBAccessContext): Fox[List[DataStore]] =
+    for {
+      r <- run(sql"select #${columns} from webknossos.datastores_ order by name".as[DatastoresRow])
+      parsed <- Fox.combined(r.toList.map(parse))
+    } yield parsed
+
   def updateUrlByName(name: String, url: String)(implicit ctx: DBAccessContext): Fox[Unit] = {
     val q = for { row <- Datastores if notdel(row) && row.name === name } yield row.url
     for { _ <- run(q.update(url)) } yield ()

conf/messages

@@ -82,6 +82,7 @@ dataSet.notImported=Dataset {0} is not imported
 dataSet.name.invalid=A dataset name can only contain letters, digits and underscores
 dataSet.import.impossible.name=Import impossible. Dataset name can only consist of a-Z, 0-9, "-" and "_".
 dataSet.name.alreadyTaken=This dataset name is already in use.
+dataSet.name.notInSamples=This dataset name is not one of the available sample datasets.
 dataSet.source.notFound=The data source for the data source couldn’t be found
 dataSet.import.success=The import of the dataset was successful
 dataSet.import.failed=Failed to import the dataset
@@ -93,6 +94,8 @@ dataSet.list.failed=Failed to retrieve list of data sets.
 dataSet.url.missing=URL missing in the supplied json
 dataSet.dataStore.missing=dataStore missing in the supplied json
 dataSet.dataSet.missing=dataSet missing in the supplied json
+dataSet.downloadAlreadyRunning=Sample dataset download already running.
+dataSet.alreadyPresent=Sample dataset is already present.
 
 dataSource.notFound=Datasource not found on datastore server
 

frontend/javascripts/admin/admin_rest_api.js

@@ -21,6 +21,7 @@ import {
   type APIProjectProgressReport,
   type APIProjectUpdater,
   type APIProjectWithAssignments,
+  type APISampleDataset,
   type APIScript,
   type APIScriptCreator,
   type APIScriptUpdater,
@@ -882,6 +883,28 @@ export async function getMappingsForDatasetLayer(
   );
 }
 
+export function getSampleDatasets(
+  datastoreUrl: string,
+  organizationName: string,
+): Promise<Array<APISampleDataset>> {
+  return doWithToken(token =>
+    Request.receiveJSON(`${datastoreUrl}/data/datasets/sample/${organizationName}?token=${token}`),
+  );
+}
+
+export async function triggerSampleDatasetDownload(
+  datastoreUrl: string,
+  organizationName: string,
+  datasetName: string,
+) {
+  await doWithToken(token =>
+    Request.triggerRequest(
+      `${datastoreUrl}/data/datasets/sample/${organizationName}/${datasetName}/download?token=${token}`,
+      { method: "POST" },
+    ),
+  );
+}
+
 // #### Datastores
 export async function getDatastores(): Promise<Array<APIDataStore>> {
   const datastores = await Request.receiveJSON("/api/datastores");

frontend/javascripts/admin/api_flow_types.js

@@ -135,6 +135,11 @@ export type APIDataset = APIDatasetBase & {
   +isActive: true,
 };
 
+export type APISampleDataset = {
+  name: string,
+  status: "available" | "downloading" | "present",
+};
+
 export type APIDataSourceWithMessages = {
   +dataSource?: APIDataSource,
   +messages: Array<APIMessage>,

frontend/javascripts/admin/dataset/dataset_add_foreign_view.js

@@ -78,7 +78,7 @@ class DatasetAddForeignView extends React.PureComponent<Props> {
 
     return (
       <div className="container" style={{ paddingTop: 20 }}>
-        <Card title={<h3>Add Dataset</h3>}>
+        <Card title={<h3>Add Dataset</h3>} bordered={false}>
           <p>
             Specify the Dataset in the following format:
             <br />
@@ -112,7 +112,7 @@ class DatasetAddForeignView extends React.PureComponent<Props> {
               )}
             </FormItem>
             <FormItem>
-              <Button type="primary" htmlType="submit">
+              <Button size="large" type="primary" htmlType="submit" style={{ width: "100%" }}>
                 Add Dataset
               </Button>
             </FormItem>

frontend/javascripts/admin/dataset/dataset_add_view.js

@@ -2,49 +2,84 @@
 import { type RouterHistory, withRouter } from "react-router-dom";
 import { Tabs, Icon } from "antd";
 import React from "react";
+import { connect } from "react-redux";
+import _ from "lodash";
 
+import type { APIUser } from "admin/api_flow_types";
+import type { OxalisState } from "oxalis/store";
+import { enforceActiveUser } from "oxalis/model/accessors/user_accessor";
 import DatasetAddForeignView from "admin/dataset/dataset_add_foreign_view";
 import DatasetUploadView from "admin/dataset/dataset_upload_view";
+import SampleDatasetsModal from "dashboard/dataset/sample_datasets_modal";
 import features from "features";
+import renderIndependently from "libs/render_independently";
 
 const { TabPane } = Tabs;
 
-type Props = {
+type Props = {|
+  activeUser: APIUser,
+|};
+type PropsWithRouter = {|
+  ...Props,
   history: RouterHistory,
+|};
+
+const renderSampleDatasetsModal = (user: APIUser, history: RouterHistory) => {
+  renderIndependently(destroy => (
+    <SampleDatasetsModal
+      organizationName={user.organization}
+      destroy={destroy}
+      onOk={() => history.push("/dashboard/datasets")}
+    />
+  ));
 };
 
-const DatasetAddView = ({ history }: Props) => (
-  <Tabs defaultActiveKey="1" className="container">
-    <TabPane
-      tab={
-        <span>
-          <Icon type="upload" />
-          Upload Dataset
-        </span>
-      }
-      key="1"
-    >
-      <DatasetUploadView
-        onUploaded={(organization: string, datasetName: string) => {
-          const url = `/datasets/${organization}/${datasetName}/import`;
-          history.push(url);
-        }}
-      />
-    </TabPane>
-    {features().addForeignDataset ? (
+const DatasetAddView = ({ history, activeUser }: PropsWithRouter) => (
+  <React.Fragment>
+    <Tabs defaultActiveKey="1" className="container">
       <TabPane
         tab={
           <span>
-            <Icon type="bars" />
-            Add foreign Dataset
+            <Icon type="upload" />
+            Upload Dataset
           </span>
         }
-        key="2"
+        key="1"
       >
-        <DatasetAddForeignView onAdded={() => history.push("/dashboard")} />
+        <DatasetUploadView
+          onUploaded={(organization: string, datasetName: string) => {
+            const url = `/datasets/${organization}/${datasetName}/import`;
+            history.push(url);
+          }}
+        />
       </TabPane>
-    ) : null}
-  </Tabs>
+      {features().addForeignDataset ? (
+        <TabPane
+          tab={
+            <span>
+              <Icon type="bars" />
+              Add foreign Dataset
+            </span>
+          }
+          key="2"
+        >
+          <DatasetAddForeignView onAdded={() => history.push("/dashboard")} />
+        </TabPane>
+      ) : null}
+    </Tabs>
+    <div style={{ textAlign: "center" }}>
+      <p>or</p>
+      <p>
+        <a href="#" onClick={() => renderSampleDatasetsModal(activeUser, history)}>
+          Add a Sample Dataset
+        </a>
+      </p>
+    </div>
+  </React.Fragment>
 );
 
-export default withRouter(DatasetAddView);
+const mapStateToProps = (state: OxalisState) => ({
+  activeUser: enforceActiveUser(state.activeUser),
+});
+
+export default connect<Props, {||}, _, _, _, _>(mapStateToProps)(withRouter(DatasetAddView));