[Fixes #13507] Refactor of the create dataset page

geonode/geoserver/createlayer/urls.py

@@ -16,8 +16,3 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 #########################################################################
-
-from django.urls import re_path
-from . import views
-
-urlpatterns = [re_path(r"$", views.dataset_create, name="dataset_create")]

geonode/upload/api/views.py

@@ -149,7 +149,7 @@ def create(self, request, *args, **kwargs):
         }
 
         # clone the memory files into local file system
-        if "url" not in _data:
+        if "url" not in _data and not _data.get("is_empty", False):
             storage_manager = StorageManager(
                 remote_files={k: v for k, v in _data.items() if k.endswith("_file")},
                 concrete_storage_manager=FileSystemStorageManager(),

geonode/upload/celery_tasks.py

@@ -21,6 +21,7 @@
 from typing import Optional
 
 from celery import Task
+from django.db import connections
 from django.utils import timezone
 from django.utils.module_loading import import_string
 from django.utils.translation import gettext_lazy
@@ -54,6 +55,7 @@
     IMPORTER_RESOURCE_CREATION_RATE_LIMIT,
 )
 from geonode.upload.utils import (
+    DEFAULT_PK_COLUMN_NAME,
     call_rollback_function,
     call_on_failure,
     error_handler,
@@ -399,7 +401,7 @@ def publish_resource(
         _overwrite = _exec.input_params.get("overwrite_existing_layer")
 
         _publisher = DataPublisher(handler_module_path)
-
+        kwargs.update({"exec_id": execution_id})
         # extracting the crs and the resource name, are needed for publish the resource
         data = _publisher.extract_resource_to_publish(_files, action, layer_name, alternate, **kwargs)
         if data:
@@ -747,10 +749,25 @@ def _create_field(dynamic_model_schema, field, _kwargs):
                 row_to_insert.append(_create_field(dynamic_model_schema, field, _kwargs))
 
     if row_to_insert:
-        # the build creation improves the overall permformance with the DB
-        FieldSchema.objects.bulk_create(row_to_insert, 30)
+        if dynamic_model_schema.managed:
+            # If the dynamic mode schema is managed we have to save each single field
+            # one by one. Doing this will allow Django to create column in the database
+            for field in row_to_insert:
+                if field.name == DEFAULT_PK_COLUMN_NAME:
+                    # django automatically created a column name ID and use it as primary key by default
+                    # if we try to create the column FID as needed, it will raise error.
+                    # in this way we will just update the name from ID to FID
+                    with connections[os.getenv("DEFAULT_BACKEND_DATASTORE", "datastore")].cursor() as cursor:
+                        cursor.execute(
+                            f"ALTER TABLE {dynamic_model_schema.name} RENAME COLUMN id TO {DEFAULT_PK_COLUMN_NAME};"
+                        )
+                else:
+                    field.save()
+        else:
+            # the build creation improves the overall permformance with the DB
+            FieldSchema.objects.bulk_create(row_to_insert, 30)
+            # fixing the schema model in django
 
-    del row_to_insert
     return "dynamic_model", layer_name, execution_id
 
 

geonode/upload/datastore.py

@@ -44,12 +44,10 @@ def input_is_valid(self):
         """
         Perform basic validation steps
         """
-        if self.files:
-            return self.handler.is_valid(self.files, self.user, execution_id=self.execution_id)
         url = orchestrator.get_execution_object(exec_id=self.execution_id).input_params.get("url")
         if url:
             return self.handler.is_valid_url(url)
-        return False
+        return self.handler.is_valid(self.files, self.user, execution_id=self.execution_id)
 
     def _import_and_register(self, execution_id, task_name, **kwargs):
         """

geonode/upload/handlers/README.md

@@ -99,7 +99,7 @@ class BaseVectorFileHandler(BaseHandler):
         return
 
     @staticmethod
-    def create_ogr2ogr_command(files, original_name, ovverwrite_layer, alternate):
+    def create_ogr2ogr_command(files, original_name, ovverwrite_layer, alternate, **kwargs):
         """
         Define the ogr2ogr command to be executed.
         This is a default command that is needed to import a vector file. For Raster file