[Fixes #12657] Refactor supported types

geonode/upload/handlers/common/metadata.py

@@ -21,7 +21,6 @@
 from geonode.upload.handlers.utils import UploadSourcesEnum
 from geonode.upload.models import ResourceHandlerInfo
 from geonode.upload.handlers.xml.serializer import MetadataFileSerializer
-from geonode.upload.utils import ImporterRequestAction as ira
 from geonode.upload.orchestrator import orchestrator
 from django.shortcuts import get_object_or_404
 from geonode.layers.models import Dataset
@@ -35,14 +34,6 @@ class MetadataFileHandler(BaseHandler):
  It must provide the task_lists required to comple the upload
  """
 
- TASKS = {
- ira.RESOURCE_METADATA_UPLOAD.value: ("start_import", "geonode.upload.import_resource"),
- ira.ROLLBACK.value: (
- "start_rollback",
- "geonode.upload.rollback",
- ),
- }
-
  @staticmethod
  def can_handle(_data) -> bool:
  """

geonode/upload/handlers/remote/tiles3d.py

@@ -33,6 +33,10 @@
 
 class RemoteTiles3DResourceHandler(BaseRemoteResourceHandler, Tiles3DFileHandler):
 
+ @property
+ def supported_file_extension_config(self):
+ return {}
+
  @staticmethod
  def has_serializer(data) -> bool:
  if "url" in data and "3dtiles" in data.get("type", "").lower():

geonode/upload/handlers/shapefile/handler.py

@@ -58,6 +58,12 @@ class ShapeFileHandler(BaseVectorFileHandler):
  "start_rollback",
  "geonode.upload.rollback",
  ),
+ ira.REPLACE.value: (
+ "start_import",
+ "geonode.upload.import_resource",
+ "geonode.upload.publish_resource",
+ "geonode.upload.create_geonode_resource",
+ ),
  }
 
  @property

geonode/upload/handlers/sld/handler.py

@@ -22,6 +22,7 @@
 from geonode.upload.handlers.common.metadata import MetadataFileHandler
 from geonode.upload.handlers.sld.exceptions import InvalidSldException
 from owslib.etree import etree as dlxml
+from geonode.upload.utils import ImporterRequestAction as ira
 
 logger = logging.getLogger("importer")
 
@@ -32,6 +33,14 @@ class SLDFileHandler(MetadataFileHandler):
  It must provide the task_lists required to comple the upload
  """
 
+ TASKS = {
+ ira.RESOURCE_SLD_UPLOAD.value: ("start_import", "geonode.upload.import_resource"),
+ ira.ROLLBACK.value: (
+ "start_rollback",
+ "geonode.upload.rollback",
+ ),
+ }
+
  @property
  def supported_file_extension_config(self):
  return {

geonode/upload/handlers/xml/handler.py

@@ -22,6 +22,7 @@
 from geonode.upload.handlers.common.metadata import MetadataFileHandler
 from geonode.upload.handlers.xml.exceptions import InvalidXmlException
 from owslib.etree import etree as dlxml
+from geonode.upload.utils import ImporterRequestAction as ira
 
 logger = logging.getLogger("importer")
 
@@ -32,6 +33,13 @@ class XMLFileHandler(MetadataFileHandler):
  It must provide the task_lists required to comple the upload
  """
 
+ TASKS = {
+ ira.RESOURCE_METADATA_UPLOAD.value: ("start_import", "geonode.upload.import_resource"),
+ ira.ROLLBACK.value: (
+ "start_rollback",
+ "geonode.upload.rollback",
+ ),
+ }
  @property
  def supported_file_extension_config(self):
  return {

geonode/upload/utils.py

@@ -51,6 +51,7 @@ def get_max_upload_parallelism_limit(slug):
 class ImporterRequestAction(enum.Enum):
  ROLLBACK = _("rollback")
  RESOURCE_METADATA_UPLOAD = _("resource_metadata_upload")
+ RESOURCE_SLD_UPLOAD = _("resource_sld_upload")
  REPLACE = _("replace")
 
 

geonode/utils.py

@@ -1727,7 +1727,7 @@ def get_supported_datasets_file_types():
  "required_ext": ["zip"],
  "optional_ext": ["xml", "sld"],
  },
- "action": ["upload"],
+ "action": ["upload", "replace"],
  "type": "archive",
  }
  ]