@etsoo/smarterp-core 1.0.1 → 1.0.3

package/src/components/app/AppSwitchPopover.tsx

@@ -0,0 +1,83 @@
+import React from "react";
+import { Button, Stack, Typography } from "@mui/material";
+import { useNavigate } from "react-router-dom";
+import { ButtonPopover } from "@etsoo/materialui";
+import { AppQueryData } from "../../dto/app/AppQueryData";
+import { useRequiredAppContext } from "../../ICoreServiceApp";
+import { IdentityType } from "../../dto/IdentityType";
+
+export type AppSwitchPopoverProps = {
+  appName: string;
+};
+
+export function AppSwitchPopover(props: AppSwitchPopoverProps) {
+  // Destruct
+  const { appName } = props;
+
+  // Route
+  const navigate = useNavigate();
+
+  // App
+  const app = useRequiredAppContext();
+
+  // Labels
+  const labels = app.getLabels("more", "switchApp");
+
+  // Max items to read
+  const maxItems = 10;
+
+  // Current app
+  const currentApp = app.settings.appId;
+
+  // Layout
+  return (
+    <ButtonPopover<AppQueryData[]>
+      button={(callback) => (
+        <Typography
+          variant="h6"
+          sx={{
+            color: (theme) => theme.palette.primary.main,
+            fontWeight: "700",
+            ml: 0.5,
+            whiteSpace: "nowrap",
+            cursor: "pointer"
+          }}
+          title={labels.switchApp}
+          onClick={(e) => callback(e.currentTarget)}
+        >
+          {appName}
+        </Typography>
+      )}
+      loadData={() =>
+        app.core.appApi.getMy(
+          { maxItems, identityType: IdentityType.User },
+          { showLoading: false }
+        )
+      }
+      position="left"
+    >
+      {(data) => {
+        if (data == null) return <React.Fragment />;
+
+        // Remove the current app
+        const index = data.findIndex((a) => a.id === currentApp);
+        if (index >= 0) data.splice(index, 1);
+
+        return (
+          <Stack direction="column" margin={2}>
+            {data.map((appData) => (
+              <Button key={appData.id} onClick={async () => {}}>
+                {app.core.getAppName(appData)}
+              </Button>
+            ))}
+            {(data.length === 0 || data.length === maxItems) && (
+              <Button onClick={() => navigate("./app/my")}>
+                {labels.more}...
+              </Button>
+            )}
+          </Stack>
+        );
+      }}
+    </ButtonPopover>
+  );
+}

package/src/components/index.ts

@@ -1,2 +1,9 @@
 // Components
+export * from "./DefaultUI";
+
+// app
+export * from "./app/AppSwitchPopover";
+
+// org
+export * from "./org/OrgSwitchPopover";
 export * from "./org/OrgTiplist";

package/src/components/org/OrgSwitchPopover.tsx

@@ -0,0 +1,99 @@
+import React from "react";
+import { Button, ButtonGroup, Stack } from "@mui/material";
+import AccountTreeIcon from "@mui/icons-material/AccountTree";
+import { useNavigate } from "react-router-dom";
+import { ButtonPopover } from "@etsoo/materialui";
+import { OrgGetMyData } from "../../dto/org/OrgGetMyData";
+import { useRequiredAppContext } from "../../ICoreServiceApp";
+
+export type OrgSwitchPopoverProps = {
+  organizationName?: string;
+};
+
+export function OrgSwitchPopover(props: OrgSwitchPopoverProps) {
+  // Destruct
+  const { organizationName } = props;
+
+  // Route
+  const navigate = useNavigate();
+
+  // App
+  const app = useRequiredAppContext();
+
+  // Labels
+  const labels = app.getLabels("currentOrg", "more", "switchOrg");
+
+  // Refs
+  const anchorRef = React.useRef<HTMLButtonElement>(null);
+
+  // Max items to read
+  const maxItems = 10;
+
+  // Current organization
+  const currentOrg = app.userData?.organization;
+
+  // Layout
+  return (
+    <ButtonPopover<OrgGetMyData[]>
+      button={(callback) => (
+        <React.Fragment>
+          <ButtonGroup variant="text">
+            <Button
+              sx={{ display: { xs: "none", md: "block" } }}
+              title={labels.currentOrg}
+              onClick={() => callback(anchorRef.current!)}
+            >
+              {organizationName ?? labels.switchOrg}
+            </Button>
+            <Button
+              title={labels.switchOrg}
+              onClick={(e) => callback(e.currentTarget)}
+              ref={anchorRef}
+            >
+              <AccountTreeIcon />
+            </Button>
+          </ButtonGroup>
+        </React.Fragment>
+      )}
+      loadData={() =>
+        app.core.orgApi.getMy({ maxItems }, { showLoading: false })
+      }
+    >
+      {(data) => {
+        if (data == null) return <React.Fragment />;
+
+        // Remove the current organization
+        if (currentOrg != null) {
+          const index = data.findIndex((org) => org.id === currentOrg);
+          if (index >= 0) data.splice(index, 1);
+        }
+
+        return (
+          <Stack direction="column" margin={2}>
+            {data.map((org) => (
+              <Button
+                key={org.id}
+                onClick={async () => {
+                  const result = await app.switchOrg(org.id);
+                  if (result == null) return;
+
+                  if (!result.ok) {
+                    app.alertResult(result);
+                    return;
+                  }
+                }}
+              >
+                {org.name}
+              </Button>
+            ))}
+            {(data.length === 0 || data.length === maxItems) && (
+              <Button onClick={() => navigate("./org/my")}>
+                {labels.more}...
+              </Button>
+            )}
+          </Stack>
+        );
+      }}
+    </ButtonPopover>
+  );
+}

package/src/components/org/OrgTiplist.tsx

@@ -1,35 +1,22 @@
-import { Tiplist } from "@etsoo/materialui";
+import { Tiplist, TiplistProps } from "@etsoo/materialui";
 import { OrgListDto } from "../../dto/org/OrgListDto";
-import { CoreApp } from "../../CoreApp";
+import { useRequiredAppContext } from "../../ICoreServiceApp";
 
 /**
  * Organization tiplist properties
  * 机构提示列表属性
  */
-export type OrgTiplistProps = {
-  /**
-   * API Application
-   * 接口应用
-   */
-  api: CoreApp;
-
+export type OrgTiplistProps = Omit<
+  TiplistProps<OrgListDto, "id">,
+  "loadData" | "label" | "name"
+> & {
   /**
    * Label
-   * 标签
    */
   label?: string;
 
-  /**
-   * Max items
-   * 最大项目
-   * @default 10
-   */
-  maxItems?: number;
-
   /**
    * Name
-   * 名称
-   * @default 'organizationId'
    */
   name?: string;
 };
@@ -41,33 +28,42 @@ export type OrgTiplistProps = {
  * @returns Component
  */
 export function OrgTiplist(props: OrgTiplistProps) {
+  // App
+  const app = useRequiredAppContext();
+
   // Destruct
   const {
-    api,
-    label = api.app.get("org")!,
+    fullWidth = true,
+    label = app.get("org")!,
     maxItems = 10,
-    name = "organizationId"
+    getOptionLabel = (data) => data.name + "(" + data.pin + ")",
+    name = "organizationId",
+    ...rest
   } = props;
 
   // Layout
   return (
     <Tiplist<OrgListDto>
       label={label}
-      getOptionLabel={(data) => data.name + "(" + data.pin + ")"}
+      getOptionLabel={getOptionLabel}
       name={name}
-      fullWidth
+      fullWidth={fullWidth}
       maxItems={maxItems}
       loadData={(keyword, id, maxItems) =>
-        api.orgApi.list({
-          enabled: true,
-          keyword,
-          id,
-          queryPaging: {
-            batchSize: maxItems,
-            orderBy: [{ field: "name" }]
-          }
-        })
+        app.core.orgApi.list(
+          {
+            enabled: true,
+            keyword,
+            id,
+            queryPaging: {
+              batchSize: maxItems,
+              orderBy: [{ field: "CoreOrganization.Name" }]
+            }
+          },
+          { showLoading: false, defaultValue: [] }
+        )
       }
+      {...rest}
     />
   );
 }

package/src/dto/app/AppQueryData.ts

@@ -17,6 +17,12 @@ export type AppQueryData = {
    */
   name: string;
 
+  /**
+   * Local name
+   * 本地名称
+   */
+  localName?: string;
+
   /**
    * Identity type
    * 身份类型

package/src/dto/app/AppReadDto.ts

@@ -0,0 +1,75 @@
+import { EntityStatus } from "@etsoo/appscript";
+import { IdentityType } from "../IdentityType";
+
+/**
+ * App read data
+ * 应用读取数据
+ */
+export type AppReadDto = {
+  /**
+   * Id
+   */
+  id: number;
+
+  /**
+   * App global name
+   */
+  name: string;
+
+  /**
+   * Global app id
+   */
+  appId: number;
+
+  /**
+   * App key
+   */
+  appKey?: string;
+
+  /**
+   * Local name
+   */
+  localName?: string;
+
+  /**
+   * Local URL
+   */
+  localUrl?: string;
+
+  /**
+   * Local help URL
+   */
+  localHelpUrl?: string;
+
+  /**
+   * Local APIs
+   */
+  localApis?: string[];
+
+  /**
+   * Expiry
+   */
+  expiry?: Date | string;
+
+  /**
+   * Expiry days
+   */
+  expiryDays?: number;
+
+  /**
+   * Identity type
+   * 身份类型
+   */
+  identityType: IdentityType;
+
+  /**
+   * Status
+   */
+  status: EntityStatus;
+
+  /**
+   * Creation
+   * 创建时间
+   */
+  creation: string | Date;
+};

package/src/dto/app/AppUpdateReadDto.ts

@@ -0,0 +1,42 @@
+import { EntityStatus } from "@etsoo/appscript";
+
+/**
+ * App read for update data
+ * 应用更新数据
+ */
+export type AppUpdateReadDto = {
+  /**
+   * Id
+   */
+  id: number;
+
+  /**
+   * App global name
+   */
+  name: string;
+
+  /**
+   * Local name
+   */
+  localName?: string;
+
+  /**
+   * Local URL
+   */
+  localUrl?: string;
+
+  /**
+   * Local help URL
+   */
+  localHelpUrl?: string;
+
+  /**
+   * Local APIs
+   */
+  localApis?: string[];
+
+  /**
+   * Status
+   */
+  status: EntityStatus;
+};

package/src/dto/app/CreateApiKeyData.ts

@@ -0,0 +1,17 @@
+/**
+ * Result of creating an API key
+ * 创建API密钥结果
+ */
+export type CreateApiKeyData = {
+  /**
+   * App key
+   * 应用键
+   */
+  appKey: string;
+
+  /**
+   * App secret
+   * 应用密钥
+   */
+  appSecret: string;
+};

package/src/dto/authCode/AuthCodeAction.ts

@@ -0,0 +1,13 @@
+/**
+ * Enum for auth code action
+ */
+export enum AuthCodeAction {
+  UserRegistrationSMSCode = 1,
+  UserRegistrationEmailCode = 2,
+  UserCallbackSMSCode = 3,
+  UserCallbackEmailCode = 4,
+  UserVerificationSMSCode = 5,
+  UserVerificationEmailCode = 6,
+
+  MemberInvitationEmailCode = 20
+}

package/src/dto/member/MemberQueryDto.ts

@@ -36,6 +36,11 @@ export type MemberQueryDto = {
    */
   isOwner: boolean;
 
+  /**
+   * Is editable
+   */
+  isEditable: boolean;
+
   /**
    * Creation
    */

package/src/dto/member/MemberReadDto.ts

@@ -0,0 +1,68 @@
+import { EntityStatus, UserRole } from "@etsoo/appscript";
+import { IdentityType } from "../IdentityType";
+
+/**
+ * Member read for view data
+ * 读取成员查看数据
+ */
+export type MemberReadDto = {
+  /**
+   * Id
+   */
+  id: number;
+
+  /**
+   * Name
+   */
+  name: string;
+
+  /**
+   * User role
+   */
+  userRole: UserRole;
+
+  /**
+   * Identity type
+   */
+  identityType: IdentityType;
+
+  /**
+   * Custom name
+   */
+  localName?: string;
+
+  /**
+   * Custom avatar
+   */
+  localAvatar?: string;
+
+  /**
+   * Assigned id
+   */
+  assignedId?: string;
+
+  /**
+   * Creation
+   */
+  creation: string | Date;
+
+  /**
+   * Expiry
+   */
+  expiry?: string | Date;
+
+  /**
+   * Refresh time
+   */
+  refreshTime: string | Date;
+
+  /**
+   * Status
+   */
+  status: EntityStatus;
+
+  /**
+   * Inviter
+   */
+  inviter?: string;
+};

package/src/dto/member/MemberUpdateReadDto.ts

@@ -0,0 +1,47 @@
+import { EntityStatus, UserRole } from "@etsoo/appscript";
+
+/**
+ * Member read for update data
+ * 读取成员更新数据
+ */
+export type MemberUpdateReadDto = {
+  /**
+   * Id
+   */
+  id: number;
+
+  /**
+   * Name
+   */
+  name: string;
+
+  /**
+   * Is self
+   */
+  isSelf: boolean;
+
+  /**
+   * User role
+   */
+  userRole: UserRole;
+
+  /**
+   * Custom name
+   */
+  localName?: string;
+
+  /**
+   * Assigned id
+   */
+  assignedId?: string;
+
+  /**
+   * Expiry
+   */
+  expiry?: string | Date;
+
+  /**
+   * Status
+   */
+  status: EntityStatus;
+};

package/src/dto/org/OrgQueryDto.ts

@@ -44,4 +44,14 @@ export type OrgQueryDto = {
    * Creation
    */
   creation: Date | string;
+
+  /**
+   * User status
+   */
+  userStatus: EntityStatus;
+
+  /**
+   * Is user expired
+   */
+  isUserExpired: boolean;
 };

package/src/dto/org/OrgReadDto.ts

@@ -10,6 +10,11 @@ export type OrgReadDto = {
    */
   id: number;
 
+  /**
+   * Current user is the owner of the organization
+   */
+  isOwner: boolean;
+
   /**
    * Owner name
    */
@@ -35,6 +40,11 @@ export type OrgReadDto = {
    */
   pin?: string;
 
+  /**
+   * Parent id
+   */
+  parentId?: number;
+
   /**
    * Parent name
    */
@@ -54,4 +64,14 @@ export type OrgReadDto = {
    * Query Keyword
    */
   queryKeyword?: string;
+
+  /**
+   * User status
+   */
+  userStatus: EntityStatus;
+
+  /**
+   * User expiry
+   */
+  userExpiry?: string | Date;
 };

package/src/dto/org/OrgUpdateReadDto.ts

@@ -20,11 +20,6 @@ export type OrgUpdateReadDto = {
    */
   brand?: string;
 
-  /**
-   * Logo
-   */
-  logo?: string;
-
   /**
    * PIN
    */

package/src/dto/public/MemberInvitationDto.ts

@@ -0,0 +1,34 @@
+/**
+ * Member invitation data
+ */
+export type MemberInvitationDto = {
+  /**
+   * Email
+   */
+  email: string;
+
+  /**
+   * Inviter's name
+   */
+  inviter: string;
+
+  /**
+   * Organization name
+   */
+  orgName: string;
+
+  /**
+   * Is expired or not
+   */
+  isExpired: boolean;
+
+  /**
+   * Is accepted or not
+   */
+  isAccepted: boolean;
+
+  /**
+   * User exists or not
+   */
+  userExists: boolean;
+};