@abpjs/tenant-management 2.2.0 → 2.4.0

package/dist/index.d.ts

@@ -1,7 +1,12 @@
 /**
  * @abpjs/tenant-management
  * ABP Framework Tenant Management module for React
- * Translated from @abp/ng.tenant-management v2.2.0
+ * Translated from @abp/ng.tenant-management v2.4.0
+ *
+ * Changes in v2.4.0:
+ * - Added apiName property to TenantManagementService (defaults to 'default')
+ * - Added adminEmailAddress and adminPassword fields to AddRequest interface
+ * - UpdateRequest no longer extends AddRequest (now only has id and name)
  *
  * Changes in v2.2.0:
  * - Added openFeaturesModal(providerKey: string) to useTenantManagement hook

package/dist/index.js

@@ -33,6 +33,11 @@ module.exports = __toCommonJS(index_exports);
 // src/services/tenant-management.service.ts
 var TenantManagementService = class {
   constructor(rest) {
+    /**
+     * The API name used for REST requests.
+     * @since 2.4.0
+     */
+    this.apiName = "default";
     this.rest = rest;
   }
   /**
@@ -575,6 +580,10 @@ function TenantManagementModal({
   const [currentView, setCurrentView] = (0, import_react2.useState)(initialView);
   const [tenantName, setTenantName] = (0, import_react2.useState)("");
   const [tenantNameError, setTenantNameError] = (0, import_react2.useState)(null);
+  const [adminEmail, setAdminEmail] = (0, import_react2.useState)("");
+  const [adminEmailError, setAdminEmailError] = (0, import_react2.useState)(null);
+  const [adminPassword, setAdminPassword] = (0, import_react2.useState)("");
+  const [adminPasswordError, setAdminPasswordError] = (0, import_react2.useState)(null);
   const [localConnectionString, setLocalConnectionString] = (0, import_react2.useState)("");
   const [localUseSharedDatabase, setLocalUseSharedDatabase] = (0, import_react2.useState)(true);
   const isEditing = !!tenantId;
@@ -598,6 +607,10 @@ function TenantManagementModal({
       reset();
       setTenantName("");
       setTenantNameError(null);
+      setAdminEmail("");
+      setAdminEmailError(null);
+      setAdminPassword("");
+      setAdminPasswordError(null);
       setLocalConnectionString("");
       setLocalUseSharedDatabase(true);
     }
@@ -628,6 +641,39 @@ function TenantManagementModal({
     },
     [t]
   );
+  const validateAdminEmail = (0, import_react2.useCallback)(
+    (email) => {
+      if (!email || email.trim().length === 0) {
+        setAdminEmailError(t("AbpValidation::ThisFieldIsRequired"));
+        return false;
+      }
+      const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+      if (!emailRegex.test(email)) {
+        setAdminEmailError(t("AbpValidation::ThisFieldIsNotAValidEmailAddress"));
+        return false;
+      }
+      setAdminEmailError(null);
+      return true;
+    },
+    [t]
+  );
+  const validateAdminPassword = (0, import_react2.useCallback)(
+    (password) => {
+      if (!password || password.length === 0) {
+        setAdminPasswordError(t("AbpValidation::ThisFieldIsRequired"));
+        return false;
+      }
+      if (password.length < 6) {
+        setAdminPasswordError(
+          t("AbpValidation::ThisFieldMustBeAStringWithAMinimumLengthOf{0}", "6")
+        );
+        return false;
+      }
+      setAdminPasswordError(null);
+      return true;
+    },
+    [t]
+  );
   const handleTenantSubmit = (0, import_react2.useCallback)(async () => {
     if (!validateTenantName(tenantName)) {
       return;
@@ -636,7 +682,16 @@ function TenantManagementModal({
     if (isEditing && tenantId) {
       result = await updateTenant({ id: tenantId, name: tenantName.trim() });
     } else {
-      result = await createTenant({ name: tenantName.trim() });
+      const emailValid = validateAdminEmail(adminEmail);
+      const passwordValid = validateAdminPassword(adminPassword);
+      if (!emailValid || !passwordValid) {
+        return;
+      }
+      result = await createTenant({
+        name: tenantName.trim(),
+        adminEmailAddress: adminEmail.trim(),
+        adminPassword
+      });
     }
     if (result.success) {
       onSave?.();
@@ -644,9 +699,13 @@ function TenantManagementModal({
     }
   }, [
     tenantName,
+    adminEmail,
+    adminPassword,
     isEditing,
     tenantId,
     validateTenantName,
+    validateAdminEmail,
+    validateAdminPassword,
     createTenant,
     updateTenant,
     onSave,
@@ -686,6 +745,26 @@ function TenantManagementModal({
     },
     [tenantNameError, validateTenantName]
   );
+  const handleAdminEmailChange = (0, import_react2.useCallback)(
+    (e) => {
+      const value = e.target.value;
+      setAdminEmail(value);
+      if (adminEmailError) {
+        validateAdminEmail(value);
+      }
+    },
+    [adminEmailError, validateAdminEmail]
+  );
+  const handleAdminPasswordChange = (0, import_react2.useCallback)(
+    (e) => {
+      const value = e.target.value;
+      setAdminPassword(value);
+      if (adminPasswordError) {
+        validateAdminPassword(value);
+      }
+    },
+    [adminPasswordError, validateAdminPassword]
+  );
   const handleUseSharedDatabaseChange = (0, import_react2.useCallback)(() => {
     setLocalUseSharedDatabase((prev) => {
       const newValue = !prev;
@@ -698,26 +777,70 @@ function TenantManagementModal({
   const handleConnectionStringChange = (0, import_react2.useCallback)((e) => {
     setLocalConnectionString(e.target.value);
   }, []);
-  const renderTenantForm = () => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react3.VStack, { gap: 4, align: "stretch", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-    import_theme_shared.FormField,
-    {
-      label: t("AbpTenantManagement::TenantName"),
-      htmlFor: "tenant-name",
-      invalid: !!tenantNameError,
-      errorText: tenantNameError || void 0,
-      required: true,
-      children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-        import_react3.Input,
+  const renderTenantForm = () => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_react3.VStack, { gap: 4, align: "stretch", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+      import_theme_shared.FormField,
+      {
+        label: t("AbpTenantManagement::TenantName"),
+        htmlFor: "tenant-name",
+        invalid: !!tenantNameError,
+        errorText: tenantNameError || void 0,
+        required: true,
+        children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+          import_react3.Input,
+          {
+            id: "tenant-name",
+            value: tenantName,
+            onChange: handleTenantNameChange,
+            placeholder: t("AbpTenantManagement::TenantName"),
+            maxLength: 256
+          }
+        )
+      }
+    ),
+    !isEditing && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+        import_theme_shared.FormField,
+        {
+          label: t("AbpTenantManagement::DisplayName:AdminEmailAddress"),
+          htmlFor: "admin-email",
+          invalid: !!adminEmailError,
+          errorText: adminEmailError || void 0,
+          required: true,
+          children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+            import_react3.Input,
+            {
+              id: "admin-email",
+              type: "email",
+              value: adminEmail,
+              onChange: handleAdminEmailChange,
+              placeholder: t("AbpTenantManagement::DisplayName:AdminEmailAddress")
+            }
+          )
+        }
+      ),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+        import_theme_shared.FormField,
         {
-          id: "tenant-name",
-          value: tenantName,
-          onChange: handleTenantNameChange,
-          placeholder: t("AbpTenantManagement::TenantName"),
-          maxLength: 256
+          label: t("AbpTenantManagement::DisplayName:AdminPassword"),
+          htmlFor: "admin-password",
+          invalid: !!adminPasswordError,
+          errorText: adminPasswordError || void 0,
+          required: true,
+          children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+            import_react3.Input,
+            {
+              id: "admin-password",
+              type: "password",
+              value: adminPassword,
+              onChange: handleAdminPasswordChange,
+              placeholder: t("AbpTenantManagement::DisplayName:AdminPassword")
+            }
+          )
         }
       )
-    }
-  ) });
+    ] })
+  ] });
   const renderConnectionStringForm = () => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_react3.VStack, { gap: 4, align: "stretch", children: [
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react3.Box, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
       import_theme_shared.Checkbox,

package/dist/index.mjs

@@ -1,6 +1,11 @@
 // src/services/tenant-management.service.ts
 var TenantManagementService = class {
   constructor(rest) {
+    /**
+     * The API name used for REST requests.
+     * @since 2.4.0
+     */
+    this.apiName = "default";
     this.rest = rest;
   }
   /**
@@ -549,6 +554,10 @@ function TenantManagementModal({
   const [currentView, setCurrentView] = useState2(initialView);
   const [tenantName, setTenantName] = useState2("");
   const [tenantNameError, setTenantNameError] = useState2(null);
+  const [adminEmail, setAdminEmail] = useState2("");
+  const [adminEmailError, setAdminEmailError] = useState2(null);
+  const [adminPassword, setAdminPassword] = useState2("");
+  const [adminPasswordError, setAdminPasswordError] = useState2(null);
   const [localConnectionString, setLocalConnectionString] = useState2("");
   const [localUseSharedDatabase, setLocalUseSharedDatabase] = useState2(true);
   const isEditing = !!tenantId;
@@ -572,6 +581,10 @@ function TenantManagementModal({
       reset();
       setTenantName("");
       setTenantNameError(null);
+      setAdminEmail("");
+      setAdminEmailError(null);
+      setAdminPassword("");
+      setAdminPasswordError(null);
       setLocalConnectionString("");
       setLocalUseSharedDatabase(true);
     }
@@ -602,6 +615,39 @@ function TenantManagementModal({
     },
     [t]
   );
+  const validateAdminEmail = useCallback2(
+    (email) => {
+      if (!email || email.trim().length === 0) {
+        setAdminEmailError(t("AbpValidation::ThisFieldIsRequired"));
+        return false;
+      }
+      const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+      if (!emailRegex.test(email)) {
+        setAdminEmailError(t("AbpValidation::ThisFieldIsNotAValidEmailAddress"));
+        return false;
+      }
+      setAdminEmailError(null);
+      return true;
+    },
+    [t]
+  );
+  const validateAdminPassword = useCallback2(
+    (password) => {
+      if (!password || password.length === 0) {
+        setAdminPasswordError(t("AbpValidation::ThisFieldIsRequired"));
+        return false;
+      }
+      if (password.length < 6) {
+        setAdminPasswordError(
+          t("AbpValidation::ThisFieldMustBeAStringWithAMinimumLengthOf{0}", "6")
+        );
+        return false;
+      }
+      setAdminPasswordError(null);
+      return true;
+    },
+    [t]
+  );
   const handleTenantSubmit = useCallback2(async () => {
     if (!validateTenantName(tenantName)) {
       return;
@@ -610,7 +656,16 @@ function TenantManagementModal({
     if (isEditing && tenantId) {
       result = await updateTenant({ id: tenantId, name: tenantName.trim() });
     } else {
-      result = await createTenant({ name: tenantName.trim() });
+      const emailValid = validateAdminEmail(adminEmail);
+      const passwordValid = validateAdminPassword(adminPassword);
+      if (!emailValid || !passwordValid) {
+        return;
+      }
+      result = await createTenant({
+        name: tenantName.trim(),
+        adminEmailAddress: adminEmail.trim(),
+        adminPassword
+      });
     }
     if (result.success) {
       onSave?.();
@@ -618,9 +673,13 @@ function TenantManagementModal({
     }
   }, [
     tenantName,
+    adminEmail,
+    adminPassword,
     isEditing,
     tenantId,
     validateTenantName,
+    validateAdminEmail,
+    validateAdminPassword,
     createTenant,
     updateTenant,
     onSave,
@@ -660,6 +719,26 @@ function TenantManagementModal({
     },
     [tenantNameError, validateTenantName]
   );
+  const handleAdminEmailChange = useCallback2(
+    (e) => {
+      const value = e.target.value;
+      setAdminEmail(value);
+      if (adminEmailError) {
+        validateAdminEmail(value);
+      }
+    },
+    [adminEmailError, validateAdminEmail]
+  );
+  const handleAdminPasswordChange = useCallback2(
+    (e) => {
+      const value = e.target.value;
+      setAdminPassword(value);
+      if (adminPasswordError) {
+        validateAdminPassword(value);
+      }
+    },
+    [adminPasswordError, validateAdminPassword]
+  );
   const handleUseSharedDatabaseChange = useCallback2(() => {
     setLocalUseSharedDatabase((prev) => {
       const newValue = !prev;
@@ -672,26 +751,70 @@ function TenantManagementModal({
   const handleConnectionStringChange = useCallback2((e) => {
     setLocalConnectionString(e.target.value);
   }, []);
-  const renderTenantForm = () => /* @__PURE__ */ jsx(VStack, { gap: 4, align: "stretch", children: /* @__PURE__ */ jsx(
-    FormField,
-    {
-      label: t("AbpTenantManagement::TenantName"),
-      htmlFor: "tenant-name",
-      invalid: !!tenantNameError,
-      errorText: tenantNameError || void 0,
-      required: true,
-      children: /* @__PURE__ */ jsx(
-        Input,
+  const renderTenantForm = () => /* @__PURE__ */ jsxs(VStack, { gap: 4, align: "stretch", children: [
+    /* @__PURE__ */ jsx(
+      FormField,
+      {
+        label: t("AbpTenantManagement::TenantName"),
+        htmlFor: "tenant-name",
+        invalid: !!tenantNameError,
+        errorText: tenantNameError || void 0,
+        required: true,
+        children: /* @__PURE__ */ jsx(
+          Input,
+          {
+            id: "tenant-name",
+            value: tenantName,
+            onChange: handleTenantNameChange,
+            placeholder: t("AbpTenantManagement::TenantName"),
+            maxLength: 256
+          }
+        )
+      }
+    ),
+    !isEditing && /* @__PURE__ */ jsxs(Fragment, { children: [
+      /* @__PURE__ */ jsx(
+        FormField,
+        {
+          label: t("AbpTenantManagement::DisplayName:AdminEmailAddress"),
+          htmlFor: "admin-email",
+          invalid: !!adminEmailError,
+          errorText: adminEmailError || void 0,
+          required: true,
+          children: /* @__PURE__ */ jsx(
+            Input,
+            {
+              id: "admin-email",
+              type: "email",
+              value: adminEmail,
+              onChange: handleAdminEmailChange,
+              placeholder: t("AbpTenantManagement::DisplayName:AdminEmailAddress")
+            }
+          )
+        }
+      ),
+      /* @__PURE__ */ jsx(
+        FormField,
         {
-          id: "tenant-name",
-          value: tenantName,
-          onChange: handleTenantNameChange,
-          placeholder: t("AbpTenantManagement::TenantName"),
-          maxLength: 256
+          label: t("AbpTenantManagement::DisplayName:AdminPassword"),
+          htmlFor: "admin-password",
+          invalid: !!adminPasswordError,
+          errorText: adminPasswordError || void 0,
+          required: true,
+          children: /* @__PURE__ */ jsx(
+            Input,
+            {
+              id: "admin-password",
+              type: "password",
+              value: adminPassword,
+              onChange: handleAdminPasswordChange,
+              placeholder: t("AbpTenantManagement::DisplayName:AdminPassword")
+            }
+          )
         }
       )
-    }
-  ) });
+    ] })
+  ] });
   const renderConnectionStringForm = () => /* @__PURE__ */ jsxs(VStack, { gap: 4, align: "stretch", children: [
     /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsx(
       Checkbox,

package/dist/models/index.d.ts

@@ -1,6 +1,6 @@
 /**
  * Tenant Management module type definitions
- * Translated from @abp/ng.tenant-management v2.0.0
+ * Translated from @abp/ng.tenant-management v2.4.0
  */
 import type { ABP } from '@abpjs/core';
 /**
@@ -27,15 +27,25 @@ export declare namespace TenantManagement {
     }
     /**
      * Request payload for creating a new tenant
+     * @since 2.4.0 Added adminEmailAddress and adminPassword fields
      */
     interface AddRequest {
+        /** Admin email address for the new tenant */
+        adminEmailAddress: string;
+        /** Admin password for the new tenant */
+        adminPassword: string;
+        /** Tenant name */
         name: string;
     }
     /**
      * Request payload for updating an existing tenant
+     * @since 2.4.0 No longer extends AddRequest (only id and name needed for update)
      */
-    interface UpdateRequest extends AddRequest {
+    interface UpdateRequest {
+        /** Tenant ID */
         id: string;
+        /** Tenant name */
+        name: string;
     }
     /**
      * Request payload for updating tenant's default connection string

package/dist/services/tenant-management.service.d.ts

@@ -2,10 +2,15 @@ import { RestService, ABP } from '@abpjs/core';
 import { TenantManagement } from '../models';
 /**
  * Service for tenant management API calls
- * Translated from @abp/ng.tenant-management v1.0.0
+ * Translated from @abp/ng.tenant-management v2.4.0
  */
 export declare class TenantManagementService {
     private rest;
+    /**
+     * The API name used for REST requests.
+     * @since 2.4.0
+     */
+    apiName: string;
     constructor(rest: RestService);
     /**
      * Get all tenants (paginated)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abpjs/tenant-management",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "description": "ABP Framework tenant-management components for React - translated from @abp/ng.tenant-management",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -23,11 +23,11 @@
   "dependencies": {
     "@chakra-ui/react": "^3.2.0",
     "@emotion/react": "^11.11.0",
-    "@abpjs/theme-shared": "2.2.0",
-    "@abpjs/core": "2.2.0"
+    "@abpjs/core": "2.4.0",
+    "@abpjs/theme-shared": "2.4.0"
   },
   "devDependencies": {
-    "@abp/ng.tenant-management": "2.2.0",
+    "@abp/ng.tenant-management": "2.4.0",
     "@testing-library/jest-dom": "^6.4.0",
     "@testing-library/react": "^14.2.0",
     "@types/react": "^18.2.0",