Merge pull request #1633 from pierotofy/projshare

Share Project Links

Author: pierotofy

app/api/potree.py

@@ -3,6 +3,7 @@
 from rest_framework.response import Response
 from rest_framework import exceptions
 
+
 class Scene(TaskNestedView):
     def get(self, request, pk=None, project_pk=None):
         """
@@ -17,7 +18,7 @@ def post(self, request, pk=None, project_pk=None):
         Store potree scene information (except camera view)
         """
         task = self.get_and_check_task(request, pk)
-        if (not task.public) or (task.public and not task.public_edit):
+        if task.check_public_edit():
             get_and_check_project(request, project_pk, perms=("change_project", ))
         scene = request.data
 
@@ -38,7 +39,7 @@ def post(self, request, pk=None, project_pk=None):
         Store camera view information
         """
         task = self.get_and_check_task(request, pk)
-        if (not task.public) or (task.public and not task.public_edit):
+        if task.check_public_edit():
             get_and_check_project(request, project_pk, perms=("change_project", ))
 
         view = request.data

app/api/tasks.py

@@ -213,7 +213,7 @@ def retrieve(self, request, pk=None, project_pk=None):
         except (ObjectDoesNotExist, ValidationError):
             raise exceptions.NotFound()
 
-        if not task.public:
+        if not (task.public or task.project.public):
             get_and_check_project(request, task.project.id)
 
         serializer = TaskSerializer(task)
@@ -372,7 +372,7 @@ def get_and_check_task(self, request, pk, annotate={}):
             raise exceptions.NotFound()
 
         # Check for permissions, unless the task is public
-        if not task.public:
+        if not (task.public or task.project.public):
             get_and_check_project(request, task.project.id)
 
         return task

app/migrations/0042_auto_20250321_1630.py

@@ -0,0 +1,28 @@
+# Generated by Django 2.2.27 on 2025-03-21 16:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0041_auto_20250311_2007'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='project',
+            name='public',
+            field=models.BooleanField(default=False, help_text='A flag indicating whether this project is available to the public', verbose_name='Public'),
+        ),
+        migrations.AddField(
+            model_name='project',
+            name='public_edit',
+            field=models.BooleanField(default=False, help_text='A flag indicating whether this public project can be edited', verbose_name='Public Edit'),
+        ),
+        migrations.AddField(
+            model_name='project',
+            name='public_id',
+            field=models.UUIDField(blank=True, db_index=True, default=None, help_text='Public identifier of the project', null=True, unique=True, verbose_name='Public Id'),
+        ),
+    ]

app/models/project.py

@@ -1,4 +1,5 @@
 import logging
+import uuid
 
 from django.conf import settings
 from django.db import models
@@ -26,7 +27,11 @@ class Project(models.Model):
     created_at = models.DateTimeField(default=timezone.now, help_text=_("Creation date"), verbose_name=_("Created at"))
     deleting = models.BooleanField(db_index=True, default=False, help_text=_("Whether this project has been marked for deletion. Projects that have running tasks need to wait for tasks to be properly cleaned up before they can be deleted."), verbose_name=_("Deleting"))
     tags = models.TextField(db_index=True, default="", blank=True, help_text=_("Project tags"), verbose_name=_("Tags"))
+    public = models.BooleanField(default=False, help_text=_("A flag indicating whether this project is available to the public"), verbose_name=_("Public"))
+    public_edit = models.BooleanField(default=False, help_text=_("A flag indicating whether this public project can be edited"), verbose_name=_("Public Edit"))
+    public_id = models.UUIDField(db_index=True, default=None, unique=True, blank=True, null=True, help_text=_("Public identifier of the project"), verbose_name=_("Public Id"))
 
+
     def delete(self, *args):
         # No tasks?
         if self.task_set.count() == 0:
@@ -56,7 +61,15 @@ def get_map_items(self):
                     status=status_codes.COMPLETED
                 ).filter(Q(orthophoto_extent__isnull=False) | Q(dsm_extent__isnull=False) | Q(dtm_extent__isnull=False))
                 .only('id', 'project_id')]
-    
+
+    def get_public_info(self):
+        return {
+            'id': self.id,
+            'public': self.public,
+            'public_id': str(self.public_id) if self.public_id is not None else None,
+            'public_edit': self.public_edit
+        }
+
     def duplicate(self, new_owner=None):
         try:
             with transaction.atomic():
@@ -84,7 +97,12 @@ def duplicate(self, new_owner=None):
 
         return False
 
+    def save(self, *args, **kwargs):
+        # Assign a public ID if missing and public = True
+        if self.public and self.public_id is None:
+            self.public_id = uuid.uuid4()
 
+        super(Project, self).save(*args, **kwargs)
 
     class Meta:
         verbose_name = _("Project")

app/models/task.py

@@ -1173,6 +1173,16 @@ def compact(self):
         self.compacted = True
         self.update_size(commit=True)
 
+    def check_public_edit(self):
+        """
+        Returns whether we need to check change permissions on this task
+        during an API call that needs to make edits
+        """
+        public = self.public or self.project.public
+        public_edit = self.public_edit or self.project.public_edit
+
+        return (not public) or (public and not public_edit)
+
     def set_failure(self, error_message):
         logger.error("FAILURE FOR {}: {}".format(self, error_message))
         self.last_error = error_message

app/static/app/js/MapView.jsx

@@ -13,7 +13,8 @@ class MapView extends React.Component {
     public: false,
     publicEdit: false,
     shareButtons: true,
-    permissions: ["view"]
+    permissions: ["view"],
+    project: null
   };
 
   static propTypes = {
@@ -23,7 +24,8 @@ class MapView extends React.Component {
       public: PropTypes.bool,
       publicEdit: PropTypes.bool,
       shareButtons: PropTypes.bool,
-      permissions: PropTypes.array
+      permissions: PropTypes.array,
+      project: PropTypes.object
   };
 
   constructor(props){
@@ -171,6 +173,7 @@ class MapView extends React.Component {
                 shareButtons={this.props.shareButtons}
                 permissions={this.props.permissions}
                 thermal={isThermal}
+                project={this.props.project}
             />
         </div>
       </div>);

app/static/app/js/components/Map.jsx

@@ -50,7 +50,8 @@ class Map extends React.Component {
     publicEdit: PropTypes.bool,
     shareButtons: PropTypes.bool,
     permissions: PropTypes.array,
-    thermal: PropTypes.bool
+    thermal: PropTypes.bool,
+    project: PropTypes.object
   };
 
   constructor(props) {
@@ -837,15 +838,18 @@ _('Example:'),
         />
 
         <div className="actionButtons">
+          
           {this.state.pluginActionButtons.map((button, i) => <div key={i}>{button}</div>)}
-          {(this.props.shareButtons && !this.props.public && this.state.singleTask !== null) ? 
+          {((this.state.singleTask || this.props.project) && this.props.shareButtons && !this.props.public) ? 
             <ShareButton 
               ref={(ref) => { this.shareButton = ref; }}
-              task={this.state.singleTask} 
+              task={this.state.singleTask}
+              project={this.props.project}
               linksTarget="map"
               queryParams={{t: this.props.mapType}}
             />
           : ""}
+          
           <SwitchModeButton 
             task={this.state.singleTask}
             type="mapToModel" 

app/static/app/js/components/ShareButton.jsx

@@ -7,10 +7,12 @@ import { _ } from '../classes/gettext';
 class ShareButton extends React.Component {
   static defaultProps = {
     task: null,
+    project: null,
     popupPlacement: 'top'
   };
   static propTypes = {
-    task: PropTypes.object.isRequired,
+    task: PropTypes.object,
+    project: PropTypes.object,
     linksTarget: PropTypes.oneOf(['map', '3d']).isRequired,
     popupPlacement: PropTypes.string,
     queryParams: PropTypes.object
@@ -21,11 +23,13 @@ class ShareButton extends React.Component {
 
     this.state = { 
       showPopup: false,
-      task: props.task
+      task: props.task,
+      project: props.project
     };
 
     this.handleClick = this.handleClick.bind(this);
     this.handleTaskChanged = this.handleTaskChanged.bind(this);
+    this.handleProjectChanged = this.handleProjectChanged.bind(this);
   }
 
   handleClick(e){
@@ -40,14 +44,23 @@ class ShareButton extends React.Component {
     this.setState({task});
   }
 
+  handleProjectChanged(project){
+    this.setState({project});
+  }
+
   render() {
     const popup = <SharePopup 
             task={this.state.task}
             taskChanged={this.handleTaskChanged}
+            project={this.state.project}
+            projectChanged={this.handleProjectChanged}
+            
             placement={this.props.popupPlacement}
             linksTarget={this.props.linksTarget}
             queryParams={this.props.queryParams}
           />;
+    
+    const isPublic = this.state.task ? this.state.task.public : this.state.project.public;
 
     return (
       <div className="shareButton" onClick={e => { e.stopPropagation(); }}>
@@ -56,7 +69,7 @@ class ShareButton extends React.Component {
         <button 
           type="button"
           onClick={this.handleClick}
-          className={"shareButton btn btn-sm " + (this.state.task.public ? "btn-primary" : "btn-secondary")}>
+          className={"shareButton btn btn-sm " + (isPublic ? "btn-primary" : "btn-secondary")}>
           <i className="fa fa-share-alt"></i> {_("Share")}
         </button>
         {this.props.popupPlacement === 'bottom' && this.state.showPopup ?