From 2fbd4d2834a906fcbbe511287be963acfdaaa5be Mon Sep 17 00:00:00 2001
From: HelaKaraa <hela.karaa@gmail.com>
Date: Fri, 15 Nov 2024 16:55:01 +0100
Subject: [PATCH 1/4] feat#893: add wipeData toggle button

---
 .../maif/izanami/web/ImportController.scala   |   6 +-
 conf/routes                                   |   2 +-
 izanami-frontend/src/pages/tenantSettings.tsx |  72 +++++++-----
 izanami-frontend/src/utils/queries.tsx        | 106 +++---------------
 izanami-frontend/src/utils/types.ts           |   1 +
 5 files changed, 64 insertions(+), 123 deletions(-)

diff --git a/app/fr/maif/izanami/web/ImportController.scala b/app/fr/maif/izanami/web/ImportController.scala
index c7e4510c4..42e5e13b3 100644
--- a/app/fr/maif/izanami/web/ImportController.scala
+++ b/app/fr/maif/izanami/web/ImportController.scala
@@ -194,6 +194,7 @@ class ImportController(
       version: Int,
       tenant: String,
       conflict: String,
+      wipeData: Option[Boolean],
       timezone: Option[String],
       deduceProject: Boolean,
       create: Option[Boolean],
@@ -219,7 +220,7 @@ class ImportController(
           })
           .getOrElse(BadRequest(Json.obj("message" -> "Missing timezone")).future)
       } else if (version == 2) {
-        importV2Data(request, tenant, conflict)
+        importV2Data(request, tenant, conflict, wipeData)
       } else {
         BadRequest(Json.obj("message" -> s"Invalid version: $version")).future
       }
@@ -228,7 +229,8 @@ class ImportController(
   def importV2Data(
       request: UserNameRequest[MultipartFormData[Files.TemporaryFile]],
       tenant: String,
-      conflict: String
+      conflict: String,
+      wipeData: Option[Boolean]
   ): Future[Result] = {
     val files: Map[String, URI] = request.body.files.map(f => (f.key, f.ref.path.toUri)).toMap
     (for (
diff --git a/conf/routes b/conf/routes
index c0dacd34a..421b73a56 100644
--- a/conf/routes
+++ b/conf/routes
@@ -96,7 +96,7 @@ PUT           /api/admin/tenants/:tenant/local-scripts/:script
 DELETE        /api/admin/local-scripts/_cache                                                      fr.maif.izanami.web.PluginController.clearWasmCache()
 DELETE        /api/admin/tenants/:tenant/local-scripts/:script                                     fr.maif.izanami.web.PluginController.deleteScript(tenant: String, script: String)
 
-POST          /api/admin/tenants/:tenant/_import                                                   fr.maif.izanami.web.ImportController.importData(version: Int, tenant: String, conflict: String, timezone: Option[String], deduceProject: Boolean ?= false, create: Option[Boolean], project: Option[String], projectPartSize: Option[Int], inlineScript: Option[Boolean])
+POST          /api/admin/tenants/:tenant/_import                                                   fr.maif.izanami.web.ImportController.importData(version: Int, tenant: String, conflict: String,wipedData : Option[Boolean], timezone: Option[String], deduceProject: Boolean ?= false, create: Option[Boolean], project: Option[String], projectPartSize: Option[Int], inlineScript: Option[Boolean])
 GET           /api/admin/tenants/:tenant/_import/:id                                               fr.maif.izanami.web.ImportController.readImportStatus(tenant: String, id: String)
 DELETE        /api/admin/tenants/:tenant/_import/:id                                               fr.maif.izanami.web.ImportController.deleteImportStatus(tenant: String, id: String)
 
diff --git a/izanami-frontend/src/pages/tenantSettings.tsx b/izanami-frontend/src/pages/tenantSettings.tsx
index f2fd78737..85d68eb28 100644
--- a/izanami-frontend/src/pages/tenantSettings.tsx
+++ b/izanami-frontend/src/pages/tenantSettings.tsx
@@ -400,15 +400,17 @@ function ImportForm(props: {
   const { cancel, submit } = props;
 
   const methods = useForm<ImportRequest>({
-    defaultValues: {},
+    defaultValues: { wipeData: false },
   });
   const {
     handleSubmit,
     register,
+    getValues,
+    watch,
     control,
     formState: { isSubmitting },
   } = methods;
-
+  watch(["wipeData"]);
   return (
     <FormProvider {...methods}>
       <form
@@ -417,35 +419,47 @@ function ImportForm(props: {
       >
         <h3 className="mt-3">Import data</h3>
         <label className="mt-3">
-          On conflict{" "}
-          <Tooltip id="import-conflict-tooltip">
-            Conflict strategy.
-            <ul>
-              <li>
-                Skip will ignore conflictual elements (they won't be overriden)
-              </li>
-              <li>Fail will fail on any conflict (except on projects)</li>
-              <li>Overwrite will write imported version over existing</li>
-            </ul>
-          </Tooltip>
-          <Controller
-            name="conflictStrategy"
-            defaultValue="skip"
-            control={control}
-            render={({ field: { onChange, value } }) => (
-              <Select
-                value={CONFLICT_STRATEGIES_OPTIONS.find(
-                  ({ value: aValue }) => value === aValue
-                )}
-                onChange={(value) => {
-                  onChange(value?.value);
-                }}
-                styles={customStyles}
-                options={CONFLICT_STRATEGIES_OPTIONS}
-              />
-            )}
+          Wipe data
+          <input
+            type="checkbox"
+            className="izanami-checkbox"
+            {...register("wipeData")}
           />
         </label>
+        {!getValues("wipeData") && (
+          <label className="mt-3">
+            On conflict{" "}
+            <Tooltip id="import-conflict-tooltip">
+              Conflict strategy.
+              <ul>
+                <li>
+                  Skip will ignore conflictual elements (they won't be
+                  overriden)
+                </li>
+                <li>Fail will fail on any conflict (except on projects)</li>
+                <li>Overwrite will write imported version over existing</li>
+              </ul>
+            </Tooltip>
+            <Controller
+              name="conflictStrategy"
+              defaultValue="skip"
+              control={control}
+              render={({ field: { onChange, value } }) => (
+                <Select
+                  value={CONFLICT_STRATEGIES_OPTIONS.find(
+                    ({ value: aValue }) => value === aValue
+                  )}
+                  onChange={(value) => {
+                    onChange(value?.value);
+                  }}
+                  styles={customStyles}
+                  options={CONFLICT_STRATEGIES_OPTIONS}
+                />
+              )}
+            />
+          </label>
+        )}
+
         <label className="mt-3">
           Exported file (ndjson)
           <Tooltip id="exported-file">
diff --git a/izanami-frontend/src/utils/queries.tsx b/izanami-frontend/src/utils/queries.tsx
index 9a9aa9bac..4348f6c1d 100644
--- a/izanami-frontend/src/utils/queries.tsx
+++ b/izanami-frontend/src/utils/queries.tsx
@@ -28,8 +28,6 @@ import {
   SearchResult,
   FeatureTypeName,
   TClassicalCondition,
-  PersonnalAccessToken,
-  TokenTenantRight,
 } from "./types";
 import { isArray } from "lodash";
 import toast from "react-hot-toast";
@@ -116,101 +114,27 @@ export function keyUserQueryKey(tenant: string, key: string) {
   return `USERS-${tenant}-${key}`;
 }
 
-export function personnalAccessTokenKey(user: string) {
-  return `PAC-${user}`;
-}
-
-export function queryPersonnalAccessTokens(
-  user: string
-): Promise<PersonnalAccessToken[]> {
-  return handleFetchJsonResponse(fetch(`/api/admin/users/${user}/tokens`)).then(
-    (t) => {
-      const tokens: PersonnalAccessToken[] = t;
-      return tokens.map((t) => {
-        let res = { ...t };
-        if ("expiresAt" in res) {
-          res.expiresAt = new Date(res.expiresAt);
-        }
-        res.createdAt = new Date(res.createdAt);
-        return res;
-      });
-    }
-  );
-}
-
-export function createPersonnalAccessToken(
-  user: string,
-  name: string,
-  expiration: Date,
-  timezone: string,
-  allRights: boolean,
-  rights: { [tenant: string]: TokenTenantRight[] }
-) {
-  const hasExpiration = expiration && !isNaN(expiration?.getTime());
-  return handleFetchJsonResponse(
-    fetch(`/api/admin/users/${user}/tokens`, {
-      method: "POST",
-      body: JSON.stringify({
-        name: name,
-        expiresAt: hasExpiration
-          ? format(expiration, "yyyy-MM-dd'T'HH:mm")
-          : undefined,
-        expirationTimezone: hasExpiration ? timezone : undefined,
-        allRights,
-        rights,
-      }),
-      headers: {
-        "content-type": "application/json",
-      },
-    })
-  );
-}
-
-export function updatePersonnalAccessToken(token: PersonnalAccessToken) {
-  const hasExpiration =
-    "expiresAt" in token && !isNaN(token.expiresAt?.getTime());
-  return handleFetchJsonResponse(
-    fetch(`/api/admin/users/${token.username}/tokens/${token.id}`, {
-      method: "PUT",
-      body: JSON.stringify({
-        ...token,
-        expirationTimezone: hasExpiration
-          ? token.expirationTimezone
-          : undefined,
-        expiresAt: hasExpiration
-          ? format(token.expiresAt, "yyyy-MM-dd'T'HH:mm")
-          : undefined,
-      }),
-      headers: {
-        "content-type": "application/json",
-      },
-    })
-  );
-}
-
-export function deletePersonnalAccessToken(user: string, id: string) {
-  return handleFetchWithoutResponse(
-    fetch(`/api/admin/users/${user}/tokens/${id}`, {
-      method: "DELETE",
-    })
-  );
-}
+keyUserQueryKey;
 
 export function importData(
   tenant: string,
   importRequest: ImportRequest
-): Promise<{ messages: string[]; conflicts?: object[] }> {
+): Promise<object[]> {
   const data = new FormData();
   data.append("export", importRequest.file.item(0)!);
-  return handleFetchJsonResponse(
-    fetch(
-      `/api/admin/tenants/${tenant}/_import?version=2&conflict=${importRequest.conflictStrategy}`,
-      {
-        method: "POST",
-        body: data,
-      }
-    )
-  );
+  return fetch(
+    `/api/admin/tenants/${tenant}/_import?version=2&conflict=${importRequest.conflictStrategy}&wipedData=${importRequest.wipeData}`,
+    {
+      method: "POST",
+      body: data,
+    }
+  ).then((resp) => {
+    if (resp.status >= 400) {
+      return resp.json();
+    } else {
+      return null;
+    }
+  });
 }
 
 export function requestExport(
diff --git a/izanami-frontend/src/utils/types.ts b/izanami-frontend/src/utils/types.ts
index 722354695..e9ebfbc51 100644
--- a/izanami-frontend/src/utils/types.ts
+++ b/izanami-frontend/src/utils/types.ts
@@ -575,6 +575,7 @@ export type IzanamiTenantExportRequest = {
 };
 
 export type ImportRequest = {
+  wipeData: boolean;
   file: FileList;
   conflictStrategy: string;
 };

From ecc4588a2d6678aa67d5e9fb5272c3feb771202c Mon Sep 17 00:00:00 2001
From: Benjamin Cavy <benjamin.cavy@gmail.com>
Date: Tue, 19 Nov 2024 15:01:42 +0100
Subject: [PATCH 2/4] fix: prevent importing v2 without import file

Fix #894
---
 izanami-frontend/src/utils/queries.tsx | 106 +++++++++++++++++++++----
 1 file changed, 91 insertions(+), 15 deletions(-)

diff --git a/izanami-frontend/src/utils/queries.tsx b/izanami-frontend/src/utils/queries.tsx
index 4348f6c1d..9a9aa9bac 100644
--- a/izanami-frontend/src/utils/queries.tsx
+++ b/izanami-frontend/src/utils/queries.tsx
@@ -28,6 +28,8 @@ import {
   SearchResult,
   FeatureTypeName,
   TClassicalCondition,
+  PersonnalAccessToken,
+  TokenTenantRight,
 } from "./types";
 import { isArray } from "lodash";
 import toast from "react-hot-toast";
@@ -114,27 +116,101 @@ export function keyUserQueryKey(tenant: string, key: string) {
   return `USERS-${tenant}-${key}`;
 }
 
-keyUserQueryKey;
+export function personnalAccessTokenKey(user: string) {
+  return `PAC-${user}`;
+}
+
+export function queryPersonnalAccessTokens(
+  user: string
+): Promise<PersonnalAccessToken[]> {
+  return handleFetchJsonResponse(fetch(`/api/admin/users/${user}/tokens`)).then(
+    (t) => {
+      const tokens: PersonnalAccessToken[] = t;
+      return tokens.map((t) => {
+        let res = { ...t };
+        if ("expiresAt" in res) {
+          res.expiresAt = new Date(res.expiresAt);
+        }
+        res.createdAt = new Date(res.createdAt);
+        return res;
+      });
+    }
+  );
+}
+
+export function createPersonnalAccessToken(
+  user: string,
+  name: string,
+  expiration: Date,
+  timezone: string,
+  allRights: boolean,
+  rights: { [tenant: string]: TokenTenantRight[] }
+) {
+  const hasExpiration = expiration && !isNaN(expiration?.getTime());
+  return handleFetchJsonResponse(
+    fetch(`/api/admin/users/${user}/tokens`, {
+      method: "POST",
+      body: JSON.stringify({
+        name: name,
+        expiresAt: hasExpiration
+          ? format(expiration, "yyyy-MM-dd'T'HH:mm")
+          : undefined,
+        expirationTimezone: hasExpiration ? timezone : undefined,
+        allRights,
+        rights,
+      }),
+      headers: {
+        "content-type": "application/json",
+      },
+    })
+  );
+}
+
+export function updatePersonnalAccessToken(token: PersonnalAccessToken) {
+  const hasExpiration =
+    "expiresAt" in token && !isNaN(token.expiresAt?.getTime());
+  return handleFetchJsonResponse(
+    fetch(`/api/admin/users/${token.username}/tokens/${token.id}`, {
+      method: "PUT",
+      body: JSON.stringify({
+        ...token,
+        expirationTimezone: hasExpiration
+          ? token.expirationTimezone
+          : undefined,
+        expiresAt: hasExpiration
+          ? format(token.expiresAt, "yyyy-MM-dd'T'HH:mm")
+          : undefined,
+      }),
+      headers: {
+        "content-type": "application/json",
+      },
+    })
+  );
+}
+
+export function deletePersonnalAccessToken(user: string, id: string) {
+  return handleFetchWithoutResponse(
+    fetch(`/api/admin/users/${user}/tokens/${id}`, {
+      method: "DELETE",
+    })
+  );
+}
 
 export function importData(
   tenant: string,
   importRequest: ImportRequest
-): Promise<object[]> {
+): Promise<{ messages: string[]; conflicts?: object[] }> {
   const data = new FormData();
   data.append("export", importRequest.file.item(0)!);
-  return fetch(
-    `/api/admin/tenants/${tenant}/_import?version=2&conflict=${importRequest.conflictStrategy}&wipedData=${importRequest.wipeData}`,
-    {
-      method: "POST",
-      body: data,
-    }
-  ).then((resp) => {
-    if (resp.status >= 400) {
-      return resp.json();
-    } else {
-      return null;
-    }
-  });
+  return handleFetchJsonResponse(
+    fetch(
+      `/api/admin/tenants/${tenant}/_import?version=2&conflict=${importRequest.conflictStrategy}`,
+      {
+        method: "POST",
+        body: data,
+      }
+    )
+  );
 }
 
 export function requestExport(

From 167698417b0bee8c3257a3ae4f1ed5908d11ff13 Mon Sep 17 00:00:00 2001
From: HelaKaraa <hela.karaa@gmail.com>
Date: Wed, 27 Nov 2024 15:00:00 +0100
Subject: [PATCH 3/4]  feat#893: Add Info tooltip for wipeData, add wipeData to
 importTenantData, Modify the UI of tenantSetting.

---
 .../datastores/ImportExportDatastore.scala    | 84 ++++++++++-------
 .../maif/izanami/web/ImportController.scala   | 28 +++---
 conf/routes                                   |  2 +-
 izanami-frontend/src/pages/tenantSettings.tsx | 89 +++++++++++--------
 izanami-frontend/src/utils/queries.tsx        |  2 +-
 5 files changed, 119 insertions(+), 86 deletions(-)

diff --git a/app/fr/maif/izanami/datastores/ImportExportDatastore.scala b/app/fr/maif/izanami/datastores/ImportExportDatastore.scala
index 5bc60ae33..01f829823 100644
--- a/app/fr/maif/izanami/datastores/ImportExportDatastore.scala
+++ b/app/fr/maif/izanami/datastores/ImportExportDatastore.scala
@@ -4,7 +4,7 @@ import fr.maif.izanami.datastores.ImportExportDatastore.TableMetadata
 import fr.maif.izanami.env.Env
 import fr.maif.izanami.env.pgimplicits.EnhancedRow
 import fr.maif.izanami.errors.{InternalServerError, IzanamiError, PartialImportFailure}
-import fr.maif.izanami.models.{ExportedType, KeyRightType, ProjectRightType, WebhookRightType}
+import fr.maif.izanami.models.{ExportedType, KeyRightType, ProjectRightType, TenantCreationRequest, WebhookRightType}
 import fr.maif.izanami.models.ExportedType.exportedTypeToString
 import fr.maif.izanami.utils.Datastore
 import fr.maif.izanami.utils.syntax.implicits.BetterJsValue
@@ -13,7 +13,7 @@ import fr.maif.izanami.web.ImportController.ImportConflictStrategy
 import fr.maif.izanami.web.{ExportController, ImportController}
 import io.vertx.core.json.JsonArray
 import io.vertx.sqlclient.SqlConnection
-import play.api.libs.json.{JsObject, Json}
+import play.api.libs.json.{JsObject, JsString, Json}
 
 import java.util.concurrent.atomic.AtomicInteger
 import scala.concurrent.Future
@@ -47,8 +47,10 @@ class ImportExportDatastore(val env: Env) extends Datastore {
 
   def importTenantData(
       tenant: String,
+      user: String,
       entries: Map[ExportedType, Seq[JsObject]],
-      conflictStrategy: ImportConflictStrategy
+      conflictStrategy: ImportConflictStrategy,
+      wipeData: Boolean
   ): Future[Either[IzanamiError, Unit]] = {
 
     Future
@@ -70,38 +72,55 @@ class ImportExportDatastore(val env: Env) extends Datastore {
               .foldLeft(Future.successful(Right(())): Future[Either[Map[ExportedType, Seq[JsObject]], Unit]])(
                 (agg, t) => {
                   agg.flatMap(previousResult => {
-                    val f = conflictStrategy match {
-                      case ImportController.MergeOverwrite                 => importTenantDataWithMergeOnConflict(tenant, t._1, t._2)
-                      case ImportController.Skip                           => importTenantDataWithSkipOnConflict(tenant, t._1, t._2)
-                      case ImportController.Fail if previousResult.isRight =>
-                        importTenantDataWithFailOnConflict(tenant, t._1, t._2, conn)
-                      case _                                               => Future.successful(Right(()))
-                    }
+                    if(wipeData) {
+                      env.datastores.tenants.deleteTenant(tenant, user).flatMap {
+                        case Left(err) => Future.successful(Left(Map(t._3 -> Seq(JsObject(Seq("error" -> JsString(err.toString)))))))
+                        case Right(_) =>
+                          env.datastores.tenants.createTenant(TenantCreationRequest(tenant), user).flatMap {
+                            case Left(err) => Future.successful(Left(Map(t._3 -> Seq(JsObject(Seq("error" -> JsString(err.toString)))))))
+                            case Right(_) => importTenantDataWithSkipOnConflict(tenant, t._1, t._2).map {
+                              case Left(failedJsons) =>
+                                Left(Map(t._3 -> failedJsons))
+                              case Right(_) =>
+                                Right(())
+                            }
+                      }
+                      }
+                    } else {
+                      val f = conflictStrategy match {
+                        case ImportController.MergeOverwrite                 => importTenantDataWithMergeOnConflict(tenant, t._1, t._2)
+                        case ImportController.Skip                         => importTenantDataWithSkipOnConflict(tenant, t._1, t._2)
+                        case ImportController.Fail if previousResult.isRight =>
+                          importTenantDataWithFailOnConflict(tenant, t._1, t._2, conn)
+                        case _                                               => Future.successful(Right(()))
 
-                    f
-                      .flatMap(e => {
-                        updateUserTenantRightIfNeeded(
-                          tenant,
-                          entries,
-                          if (conflictStrategy == ImportController.Fail) Some(conn) else None
-                        )
-                          .map(_ => e)
-                      })
-                      .map(either =>
-                        either.left.map(jsons =>
-                          jsons.map(json => Json.obj("row" -> json, "_type" -> exportedTypeToString(t._3)))
+                      }
+                      f
+                        .flatMap(e => {
+                          updateUserTenantRightIfNeeded(
+                            tenant,
+                            entries,
+                            if (conflictStrategy == ImportController.Fail) Some(conn) else None
+                          )
+                            .map(_ => e)
+                        })
+                        .map(either =>
+                          either.left.map(jsons =>
+                            jsons.map(json => Json.obj("row" -> json, "_type" -> exportedTypeToString(t._3)))
+                          )
                         )
-                      )
-                      .map(either =>
-                        (either, previousResult) match {
-                          case (Left(err), Left(errs)) => {
-                            Left(errs + (t._3 -> err))
+                        .map(either =>
+                          (either, previousResult) match {
+                            case (Left(err), Left(errs)) => {
+                              Left(errs + (t._3 -> err))
+                            }
+                            case (Left(err), Right(_))   => Left(Map(t._3 -> err))
+                            case (Right(_), Right(_))    => Right(())
+                            case (Right(_), Left(errs))  => Left(errs)
                           }
-                          case (Left(err), Right(_))   => Left(Map(t._3 -> err))
-                          case (Right(_), Right(_))    => Right(())
-                          case (Right(_), Left(errs))  => Left(errs)
-                        }
-                      )
+                        )
+                    }
+
                   })
                 }
               )
@@ -110,7 +129,6 @@ class ImportExportDatastore(val env: Env) extends Datastore {
         }
       })
   }
-
   def importTenantDataWithMergeOnConflict(
       tenant: String,
       metadata: TableMetadata,
diff --git a/app/fr/maif/izanami/web/ImportController.scala b/app/fr/maif/izanami/web/ImportController.scala
index 42e5e13b3..0a6e3690b 100644
--- a/app/fr/maif/izanami/web/ImportController.scala
+++ b/app/fr/maif/izanami/web/ImportController.scala
@@ -235,7 +235,8 @@ class ImportController(
     val files: Map[String, URI] = request.body.files.map(f => (f.key, f.ref.path.toUri)).toMap
     (for (
       conflictStrategy <- ImportController.parseStrategy(conflict);
-      uri              <- files.get("export")
+      uri              <- files.get("export");
+      wipeData <- wipeData
     ) yield {
       Try(scala.io.Source.fromFile(uri)).toEither.left
         .map(ex => {
@@ -260,19 +261,20 @@ class ImportController(
         .map(m => fixImportDataIfNeeded(tenant, m))
         .map {
           case (messages, data) => {
-            env.datastores.exportDatastore
-              .importTenantData(tenant, data, conflictStrategy)
-              .map {
-                case Left(PartialImportFailure(failedElements)) =>
-                  Conflict(
-                    Json.obj(
-                      "messages"  -> Json.toJson(messages),
-                      "conflicts" -> Json.toJson(failedElements.values.flatten)
+              env.datastores.exportDatastore
+                .importTenantData(tenant, request.user, data, conflictStrategy, wipeData)
+                .map {
+                  case Left(PartialImportFailure(failedElements)) =>
+                    Conflict(
+                      Json.obj(
+                        "messages"  -> Json.toJson(messages),
+                        "conflicts" -> Json.toJson(failedElements.values.flatten)
+                      )
                     )
-                  )
-                case Right(_)                                   => Ok(Json.obj("messages" -> Json.toJson(messages)))
-                case Left(err)                                  => err.toHttpResponse
-              }
+                  case Right(_)                                   => Ok(Json.obj("messages" -> Json.toJson(messages)))
+                  case Left(err)                                  => err.toHttpResponse
+                }
+
           }
         }
     }).toRight(Future.successful(BadRequest(Json.obj("message" -> "Missing export file")))).flatten.fold(r => r, r => r)
diff --git a/conf/routes b/conf/routes
index 421b73a56..2a0978306 100644
--- a/conf/routes
+++ b/conf/routes
@@ -96,7 +96,7 @@ PUT           /api/admin/tenants/:tenant/local-scripts/:script
 DELETE        /api/admin/local-scripts/_cache                                                      fr.maif.izanami.web.PluginController.clearWasmCache()
 DELETE        /api/admin/tenants/:tenant/local-scripts/:script                                     fr.maif.izanami.web.PluginController.deleteScript(tenant: String, script: String)
 
-POST          /api/admin/tenants/:tenant/_import                                                   fr.maif.izanami.web.ImportController.importData(version: Int, tenant: String, conflict: String,wipedData : Option[Boolean], timezone: Option[String], deduceProject: Boolean ?= false, create: Option[Boolean], project: Option[String], projectPartSize: Option[Int], inlineScript: Option[Boolean])
+POST          /api/admin/tenants/:tenant/_import                                                   fr.maif.izanami.web.ImportController.importData(version: Int, tenant: String, conflict: String,wipeData : Option[Boolean], timezone: Option[String], deduceProject: Boolean ?= false, create: Option[Boolean], project: Option[String], projectPartSize: Option[Int], inlineScript: Option[Boolean])
 GET           /api/admin/tenants/:tenant/_import/:id                                               fr.maif.izanami.web.ImportController.readImportStatus(tenant: String, id: String)
 DELETE        /api/admin/tenants/:tenant/_import/:id                                               fr.maif.izanami.web.ImportController.deleteImportStatus(tenant: String, id: String)
 
diff --git a/izanami-frontend/src/pages/tenantSettings.tsx b/izanami-frontend/src/pages/tenantSettings.tsx
index 85d68eb28..130a305ab 100644
--- a/izanami-frontend/src/pages/tenantSettings.tsx
+++ b/izanami-frontend/src/pages/tenantSettings.tsx
@@ -85,17 +85,23 @@ export function TenantSettings(props: { tenant: string }) {
 
   const navigate = useNavigate();
   const formTitleRef = React.useRef<HTMLHeadingElement | null>(null);
+  const formTitleRef2 = React.useRef<HTMLHeadingElement | null>(null);
   const [modification, setModification] = React.useState(false);
 
   if (tenantQuery.isLoading || usersQuery.isLoading) {
     return <Loader message="Loading tenant / tenant users..." />;
   }
+  if (tenantQuery.isError || usersQuery.isError) {
+    return <div>Failed to fetch tenant / tenant users</div>;
+  }
   if (tenantQuery.isSuccess && usersQuery.isSuccess) {
     return (
       <>
-        <h1>Settings for tenant {tenant}</h1>
-        <h2 className="mt-5">
-          Tenant users
+        <h1>Tenant settings</h1>
+        <hr />
+        <h4 style={{ color: "var(--color_level2)" }}>Manage permissions</h4>
+        <h5 style={{ color: "var(--color_level2)" }}>
+          Users
           <button
             type="button"
             className="btn btn-secondary btn-sm mb-2 ms-3"
@@ -103,7 +109,7 @@ export function TenantSettings(props: { tenant: string }) {
           >
             Invite new users
           </button>
-        </h2>
+        </h5>
         {inviting && (
           <InvitationForm
             submit={({ users, level }) =>
@@ -117,9 +123,9 @@ export function TenantSettings(props: { tenant: string }) {
         )}
         <TenantUsers tenant={tenant} usersData={usersQuery.data} />
         <hr />
-        <h2 className="mt-4">Update tenant information</h2>
+        <h4 style={{ color: "var(--color_level2)" }}>General settings</h4>
         <div className="d-flex align-items-center justify-content-between p-2">
-          <span>Update description for this tenant</span>
+          <span>Update description for this tenant: {tenant}</span>
 
           <button
             type="button"
@@ -162,10 +168,12 @@ export function TenantSettings(props: { tenant: string }) {
           </button>
         </div>
         <hr />
-        <h2 ref={formTitleRef}>Export / import data</h2>
+        <h4 style={{ color: "var(--color_level2)" }} ref={formTitleRef}>
+          Import data
+        </h4>
         {v1ImportDisplayed ? (
           <>
-            <h3 className="ms-2 mt-3">Import data from Izanami v1 instance</h3>
+            <h5 className="ms-2 mt-3">Import data from Izanami v1 instance</h5>
             <IzanamiV1ImportForm
               cancel={() => setV1ImportDisplayed(false)}
               submit={(data) => {
@@ -228,17 +236,6 @@ export function TenantSettings(props: { tenant: string }) {
               }}
             />
           </>
-        ) : exportDisplayed ? (
-          <div>
-            <ExportForm
-              cancel={() => setExportDisplayed(false)}
-              submit={(request: IzanamiTenantExportRequest) =>
-                requestExport(tenant, request).then(() =>
-                  setExportDisplayed(false)
-                )
-              }
-            />
-          </div>
         ) : importDisplayed ? (
           <div>
             <ImportForm
@@ -304,27 +301,42 @@ export function TenantSettings(props: { tenant: string }) {
                 Import data
               </button>
             </div>
-            <div className="d-flex align-items-center justify-content-between p-2">
-              <span>Export data to transfer them to another instance</span>
-              <button
-                type="button"
-                className="btn btn-secondary m-2 btn-sm"
-                onClick={() => {
-                  setExportDisplayed(true);
-                  requestAnimationFrame(() => {
-                    formTitleRef?.current?.scrollIntoView(true);
-                  });
-                }}
-              >
-                Export data
-              </button>
-            </div>
           </>
         )}
+        <hr />
+        <h4 style={{ color: "var(--color_level2)" }} ref={formTitleRef2}>
+          Export Data
+        </h4>
+        {!exportDisplayed ? (
+          <div className="d-flex align-items-center justify-content-between p-2">
+            <span>Export data to transfer them to another instance</span>
+            <button
+              type="button"
+              className="btn btn-secondary m-2 btn-sm"
+              onClick={() => {
+                setExportDisplayed(true);
+                requestAnimationFrame(() => {
+                  formTitleRef2?.current?.scrollIntoView(true);
+                });
+              }}
+            >
+              Export data
+            </button>
+          </div>
+        ) : (
+          <div>
+            <ExportForm
+              cancel={() => setExportDisplayed(false)}
+              submit={(request: IzanamiTenantExportRequest) =>
+                requestExport(tenant, request).then(() =>
+                  setExportDisplayed(false)
+                )
+              }
+            />
+          </div>
+        )}
       </>
     );
-  } else {
-    return <div>Failed to fetch tenant / tenant users</div>;
   }
 }
 
@@ -417,9 +429,11 @@ function ImportForm(props: {
         className="sub_container d-flex flex-column"
         onSubmit={handleSubmit((data) => submit(data))}
       >
-        <h3 className="mt-3">Import data</h3>
         <label className="mt-3">
           Wipe data
+          <Tooltip id="import-wipeData-tooltip">
+            Delete and recreate tenant.{" "}
+          </Tooltip>
           <input
             type="checkbox"
             className="izanami-checkbox"
@@ -723,7 +737,6 @@ function ExportForm(props: {
             paddingLeft: "12px",
           }}
         >
-          <h3 className="mt-3">Export data</h3>
           <label className="mt-3">
             Export all projects
             <Tooltip id="export-projects-list">
diff --git a/izanami-frontend/src/utils/queries.tsx b/izanami-frontend/src/utils/queries.tsx
index 9a9aa9bac..ef65bd827 100644
--- a/izanami-frontend/src/utils/queries.tsx
+++ b/izanami-frontend/src/utils/queries.tsx
@@ -204,7 +204,7 @@ export function importData(
   data.append("export", importRequest.file.item(0)!);
   return handleFetchJsonResponse(
     fetch(
-      `/api/admin/tenants/${tenant}/_import?version=2&conflict=${importRequest.conflictStrategy}`,
+      `/api/admin/tenants/${tenant}/_import?version=2&conflict=${importRequest.conflictStrategy}&wipeData=${importRequest.wipeData}`,
       {
         method: "POST",
         body: data,

From 249aad66d877de824116e4e05bd49b493c814d13 Mon Sep 17 00:00:00 2001
From: HelaKaraa <hela.karaa@gmail.com>
Date: Mon, 9 Dec 2024 16:35:26 +0100
Subject: [PATCH 4/4] feat#893: Heading Modification + renaming the import data
 V1

---
 izanami-frontend/src/pages/tenantSettings.tsx | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/izanami-frontend/src/pages/tenantSettings.tsx b/izanami-frontend/src/pages/tenantSettings.tsx
index 130a305ab..7eb758e15 100644
--- a/izanami-frontend/src/pages/tenantSettings.tsx
+++ b/izanami-frontend/src/pages/tenantSettings.tsx
@@ -85,7 +85,7 @@ export function TenantSettings(props: { tenant: string }) {
 
   const navigate = useNavigate();
   const formTitleRef = React.useRef<HTMLHeadingElement | null>(null);
-  const formTitleRef2 = React.useRef<HTMLHeadingElement | null>(null);
+  const formExportTitleRef = React.useRef<HTMLHeadingElement | null>(null);
   const [modification, setModification] = React.useState(false);
 
   if (tenantQuery.isLoading || usersQuery.isLoading) {
@@ -99,8 +99,8 @@ export function TenantSettings(props: { tenant: string }) {
       <>
         <h1>Tenant settings</h1>
         <hr />
-        <h4 style={{ color: "var(--color_level2)" }}>Manage permissions</h4>
-        <h5 style={{ color: "var(--color_level2)" }}>
+        <h2>Manage permissions</h2>
+        <h3 style={{ color: "var(--color_level2)" }}>
           Users
           <button
             type="button"
@@ -109,7 +109,7 @@ export function TenantSettings(props: { tenant: string }) {
           >
             Invite new users
           </button>
-        </h5>
+        </h3>
         {inviting && (
           <InvitationForm
             submit={({ users, level }) =>
@@ -123,7 +123,7 @@ export function TenantSettings(props: { tenant: string }) {
         )}
         <TenantUsers tenant={tenant} usersData={usersQuery.data} />
         <hr />
-        <h4 style={{ color: "var(--color_level2)" }}>General settings</h4>
+        <h2>General settings</h2>
         <div className="d-flex align-items-center justify-content-between p-2">
           <span>Update description for this tenant: {tenant}</span>
 
@@ -168,12 +168,10 @@ export function TenantSettings(props: { tenant: string }) {
           </button>
         </div>
         <hr />
-        <h4 style={{ color: "var(--color_level2)" }} ref={formTitleRef}>
-          Import data
-        </h4>
+        <h2 ref={formTitleRef}>Import data</h2>
         {v1ImportDisplayed ? (
           <>
-            <h5 className="ms-2 mt-3">Import data from Izanami v1 instance</h5>
+            <h3 className="ms-2 mt-3">Import data from Izanami v1 instance</h3>
             <IzanamiV1ImportForm
               cancel={() => setV1ImportDisplayed(false)}
               submit={(data) => {
@@ -271,7 +269,7 @@ export function TenantSettings(props: { tenant: string }) {
         ) : (
           <>
             <div className="d-flex align-items-center justify-content-between p-2">
-              <span>Import data from V1 Izanami instance</span>
+              <span>Import data from 1.x Izanami instance</span>
 
               <button
                 type="button"
@@ -283,7 +281,7 @@ export function TenantSettings(props: { tenant: string }) {
                   });
                 }}
               >
-                Import V1 data
+                Import data from 1.x
               </button>
             </div>
             <div className="d-flex align-items-center justify-content-between p-2">
@@ -304,9 +302,7 @@ export function TenantSettings(props: { tenant: string }) {
           </>
         )}
         <hr />
-        <h4 style={{ color: "var(--color_level2)" }} ref={formTitleRef2}>
-          Export Data
-        </h4>
+        <h2 ref={formExportTitleRef}>Export Data</h2>
         {!exportDisplayed ? (
           <div className="d-flex align-items-center justify-content-between p-2">
             <span>Export data to transfer them to another instance</span>
@@ -316,7 +312,7 @@ export function TenantSettings(props: { tenant: string }) {
               onClick={() => {
                 setExportDisplayed(true);
                 requestAnimationFrame(() => {
-                  formTitleRef2?.current?.scrollIntoView(true);
+                  formExportTitleRef?.current?.scrollIntoView(true);
                 });
               }}
             >