automation-lib 6.6.567 → 6.6.568

package/commit.bat

@@ -1,50 +1,62 @@
-@echo off
-
-:: Add all changes to git
-git add .
-
-:: Commit changes with a message
-echo Committing changes...
-set /p commit_message="Enter commit message: "
-git commit -m "%commit_message%"
-sleep 2
-
-:: Push changes to the 'main' branch of the 'cp' remote
-git pull origin toan
-
-:: Read the current version from package.json
-for /f "tokens=2 delims=:, " %%i in ('findstr "version" package.json') do set currentVersion=%%i
-
-:: Remove quotes from the version string
-set currentVersion=%currentVersion:"=%
-
-:: Split version into its components
-for /f "tokens=1,2,3 delims=." %%a in ("%currentVersion%") do (
-    set major=%%a
-    set minor=%%b
-    set patch=%%c
-)
-
-:: Increment the patch version
-set /a patch+=1
-
-:: Create the new version string
-set newVersion=%major%.%minor%.%patch%
-
-:: Update the version in package.json
-powershell -Command "(Get-Content package.json) -replace '\"version\": \"%currentVersion%\"', '\"version\": \"%newVersion%\"' | Set-Content package.json"
-
-:: Display the new version
-echo New version: %newVersion%
-
-:: Run npm publish using call
-call npm run pub
-
-git add .
-sleep 1
-git commit -m "%commit_message%"
-sleep 2
-
-git push origin toan
-
-
+@echo off
+setlocal enabledelayedexpansion
+chcp 65001 >nul
+
+echo ===========================================
+echo    GIT AUTO PUSH - LIBRARY
+echo ===========================================
+
+set /p commit_message="Enter commit message: "
+if "%commit_message%"=="" (
+    echo [LOI] Commit message khong duoc de trong!
+    pause
+    exit /b
+)
+
+:: GIT ADD & COMMIT
+git add .
+git commit -m "%commit_message%"
+timeout /t 2 /nobreak >nul
+
+:: ===========================================
+:: PULL & PUSH HS (nhann6304 only)
+:: ===========================================
+echo.
+echo --- Switch to nhann6304 for [hs] remote ---
+gh auth switch --user nhann6304
+
+echo --- Pull from hs main ---
+git pull hs main
+
+:: Version bump
+for /f "tokens=2 delims=:, " %%i in ('findstr "version" package.json') do set currentVersion=%%i
+set currentVersion=%currentVersion:"=%
+for /f "tokens=1,2,3 delims=." %%a in ("%currentVersion%") do (
+    set major=%%a
+    set minor=%%b
+    set patch=%%c
+)
+set /a patch+=1
+set newVersion=%major%.%minor%.%patch%
+
+powershell -Command "(Get-Content package.json) -replace '\"version\": \"%currentVersion%\"', '\"version\": \"%newVersion%\"' | Set-Content package.json"
+echo New version: %newVersion%
+
+:: Publish
+call npm run pub
+
+:: Commit version bump & push
+git add .
+timeout /t 1 /nobreak >nul
+git commit -m "v%newVersion% - %commit_message%"
+timeout /t 2 /nobreak >nul
+
+echo --- Push to hs main ---
+git push hs main && echo [OK] Push hs main xong. || echo [LOI] Push hs main that bai.
+
+echo.
+echo ===========================================
+echo    HOAN TAT! Version: %newVersion%
+echo ===========================================
+pause
+endlocal

package/dist/index.d.mts

@@ -2080,6 +2080,16 @@ interface IDepartmentMember extends IBaseModel, ITrackingModel {
     member: string | IUser;
 }
 
+interface ITeamRole extends IBaseModel, ITrackingModel {
+    team: string | ITeam;
+    role: string | IRole;
+}
+
+interface ITeamMember extends IBaseModel, ITrackingModel {
+    team: string | ITeam;
+    member: string | IUser;
+}
+
 interface FindOverViewDepartmentDto {
     totalDepartments: number;
     totalLeaders: number;
@@ -2108,6 +2118,17 @@ interface FindDepartmentDto extends IFindBaseDto, IDepartment {
         user: string;
         roles: string[];
     }>;
+    department_leaderDetail?: IUser[];
+    department_teamsDetail?: ITeam[];
+    department_membersDetail?: IUser[];
+    department_rolesTeamsDetail?: Array<{
+        team: ITeam;
+        roles: IRole[];
+    }>;
+    department_rolesUserDetail?: Array<{
+        user: IUser;
+        roles: IRole[];
+    }>;
 }
 interface FilterDepartmentDto extends IFilterBaseDto {
     departmentName: string[];
@@ -2174,6 +2195,9 @@ interface FindRoleDto extends IFindBaseDto, IRole {
     departments: string[];
     teams: string[];
     users: string[];
+    departmentsDetail?: IDepartment[];
+    teamsDetail?: ITeam[];
+    usersDetail?: IUser[];
     featuresRoles: {
         [module: string]: {
             [submodule: string]: {
@@ -2214,16 +2238,6 @@ declare enum EFilterOptionRole {
     UpdatedBy = "UpdatedBy"
 }
 
-interface ITeamRole extends IBaseModel, ITrackingModel {
-    team: string | ITeam;
-    role: string | IRole;
-}
-
-interface ITeamMember extends IBaseModel, ITrackingModel {
-    team: string | ITeam;
-    member: string | IUser;
-}
-
 interface FindMemberForAddTeamDto {
     userId: string;
     userName: string;
@@ -2264,6 +2278,7 @@ interface FindTeamDto extends Omit<IFindBaseDto, 'department' | 'leader'>, ITeam
     listRoles: IRole[];
     listMembers: IUser[];
     listLarks: string[];
+    listLarksDetail?: ILark[];
 }
 interface FilterTeamDto extends IFilterBaseDto {
     roles: string[];

package/dist/index.d.ts

@@ -2080,6 +2080,16 @@ interface IDepartmentMember extends IBaseModel, ITrackingModel {
     member: string | IUser;
 }
 
+interface ITeamRole extends IBaseModel, ITrackingModel {
+    team: string | ITeam;
+    role: string | IRole;
+}
+
+interface ITeamMember extends IBaseModel, ITrackingModel {
+    team: string | ITeam;
+    member: string | IUser;
+}
+
 interface FindOverViewDepartmentDto {
     totalDepartments: number;
     totalLeaders: number;
@@ -2108,6 +2118,17 @@ interface FindDepartmentDto extends IFindBaseDto, IDepartment {
         user: string;
         roles: string[];
     }>;
+    department_leaderDetail?: IUser[];
+    department_teamsDetail?: ITeam[];
+    department_membersDetail?: IUser[];
+    department_rolesTeamsDetail?: Array<{
+        team: ITeam;
+        roles: IRole[];
+    }>;
+    department_rolesUserDetail?: Array<{
+        user: IUser;
+        roles: IRole[];
+    }>;
 }
 interface FilterDepartmentDto extends IFilterBaseDto {
     departmentName: string[];
@@ -2174,6 +2195,9 @@ interface FindRoleDto extends IFindBaseDto, IRole {
     departments: string[];
     teams: string[];
     users: string[];
+    departmentsDetail?: IDepartment[];
+    teamsDetail?: ITeam[];
+    usersDetail?: IUser[];
     featuresRoles: {
         [module: string]: {
             [submodule: string]: {
@@ -2214,16 +2238,6 @@ declare enum EFilterOptionRole {
     UpdatedBy = "UpdatedBy"
 }
 
-interface ITeamRole extends IBaseModel, ITrackingModel {
-    team: string | ITeam;
-    role: string | IRole;
-}
-
-interface ITeamMember extends IBaseModel, ITrackingModel {
-    team: string | ITeam;
-    member: string | IUser;
-}
-
 interface FindMemberForAddTeamDto {
     userId: string;
     userName: string;
@@ -2264,6 +2278,7 @@ interface FindTeamDto extends Omit<IFindBaseDto, 'department' | 'leader'>, ITeam
     listRoles: IRole[];
     listMembers: IUser[];
     listLarks: string[];
+    listLarksDetail?: ILark[];
 }
 interface FilterTeamDto extends IFilterBaseDto {
     roles: string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "automation-lib",
-  "version": "6.6.567",
+  "version": "6.6.568",
   "description": "Common features and type of applications auto",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",