automation-lib 6.6.414 → 6.6.415

package/commit.bat

@@ -1,75 +1,50 @@
 @echo off
-setlocal enabledelayedexpansion
 
-:: 1. Nhập commit message
-set /p commit_message="Enter commit message: "
-
-:: 2. Commit code hien tai
-echo [1/7] Adding and committing changes...
+:: Add all changes to git
 git add .
-git commit -m "%commit_message%"
 
-:: 3. Thu pull ve
-echo [2/7] Pulling from hs toan...
-git pull hs toan --no-rebase --no-commit
+:: Commit changes with a message
+echo Committing changes...
+set /p commit_message="Enter commit message: "
+git commit -m "%commit_message%"
+sleep 2
 
-:: Kiem tra neu co xung dot (conflict)
-if %errorlevel% neq 0 (
-    echo.
-    echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-    echo PHAT HIEN XUNG DOT (CONFLICT) tai cac file sau:
-    :: Liet ke cac file dang bi Unmerged (conflict)
-    git diff --name-only --diff-filter=U
-    echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-    echo.
-    
-    set /p confirm="Ban co muon ghi de tat ca bang 'Incoming Changes' (theirs) khong? (y/n): "
-    
-    if /i "!confirm!"=="y" (
-        echo Dang ghi de file bang code tu nhanh toan...
-        :: Lenh nay se lay phan noi dung cua 'theirs' cho cac file conflict
-        git checkout --theirs .
-        git add .
-        git commit -m "fix: auto resolve conflicts by taking theirs"
-    ) else (
-        echo.
-        echo [DUNG LAI] Hay mo VS Code de sua tay cac file tren.
-        echo Sau khi sua xong, hay chay lai script hoac push thu cong.
-        pause
-        exit /b
-    )
-)
+:: Push changes to the 'main' branch of the 'cp' remote
+git pull origin toan
 
-:: 4. Tang version trong package.json
-echo [3/7] Updating version...
+:: 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:"=%
-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%
 
-:: 5. Chay npm publish
-echo [4/7] Running npm publish...
+:: Run npm publish using call
 call npm run pub
 
-:: 6. Commit package.json
-echo [5/7] Committing version bump...
 git add .
-git commit -m "chore: bump version to %newVersion%"
+sleep 1
+git commit -m "%commit_message%"
+sleep 2
+
+git push origin toan
 
-:: 7. PUSH LEN MAIN
-echo [6/7] Pushing to hs main...
-git push hs main
 
-echo [7/7] Hoan thanh ruc ro!
-pause

package/dist/index.d.mts

@@ -7916,10 +7916,10 @@ interface FilterInstagramAccountRawDto extends IFilterBaseDto {
     passwordChangeStatus: EStatusChangeInfo[];
     twoFactorAuthChangeStatus: EStatusChangeInfo[];
     emailChangeStatus: EStatusChangeInfo[];
-    avatarStatus: EStatusAccountSocialRaw[];
-    coverStatus: EStatusAccountSocialRaw[];
-    bioStatus: EStatusAccountSocialRaw[];
-    linksStatus: EStatusAccountSocialRaw[];
+    avatarStatus: EStatusChangeInfo[];
+    coverStatus: EStatusChangeInfo[];
+    bioStatus: EStatusChangeInfo[];
+    linksStatus: EStatusChangeInfo[];
     hasAvatar: EHaveData[];
     hasCover: EHaveData[];
     hasBio: EHaveData[];
@@ -15341,6 +15341,11 @@ interface FilterManagerSheetDto extends IFilterBaseDto {
     niche: string[];
     typeSocial: ETypeSocial[];
     isActive: boolean;
+    startStop: string[];
+    name: string[];
+    childName: string[];
+    accountAI: string[];
+    childStartStop: string[];
 }
 interface FindOverviewManagerSheetDto {
     totalDepartments: number;
@@ -15362,7 +15367,10 @@ declare enum EFilterOptionManagerSheet {
     CreatedBy = "CreatedBy",
     UpdatedBy = "UpdatedBy",
     Ideas = "Ideas",
-    Niche = "Niche"
+    Niche = "Niche",
+    SheetName = "SheetName",
+    ChildName = "ChildName",
+    AccountAI = "AccountAI"
 }
 
 interface CreateSheetToolDto {

package/dist/index.d.ts

@@ -7916,10 +7916,10 @@ interface FilterInstagramAccountRawDto extends IFilterBaseDto {
     passwordChangeStatus: EStatusChangeInfo[];
     twoFactorAuthChangeStatus: EStatusChangeInfo[];
     emailChangeStatus: EStatusChangeInfo[];
-    avatarStatus: EStatusAccountSocialRaw[];
-    coverStatus: EStatusAccountSocialRaw[];
-    bioStatus: EStatusAccountSocialRaw[];
-    linksStatus: EStatusAccountSocialRaw[];
+    avatarStatus: EStatusChangeInfo[];
+    coverStatus: EStatusChangeInfo[];
+    bioStatus: EStatusChangeInfo[];
+    linksStatus: EStatusChangeInfo[];
     hasAvatar: EHaveData[];
     hasCover: EHaveData[];
     hasBio: EHaveData[];
@@ -15341,6 +15341,11 @@ interface FilterManagerSheetDto extends IFilterBaseDto {
     niche: string[];
     typeSocial: ETypeSocial[];
     isActive: boolean;
+    startStop: string[];
+    name: string[];
+    childName: string[];
+    accountAI: string[];
+    childStartStop: string[];
 }
 interface FindOverviewManagerSheetDto {
     totalDepartments: number;
@@ -15362,7 +15367,10 @@ declare enum EFilterOptionManagerSheet {
     CreatedBy = "CreatedBy",
     UpdatedBy = "UpdatedBy",
     Ideas = "Ideas",
-    Niche = "Niche"
+    Niche = "Niche",
+    SheetName = "SheetName",
+    ChildName = "ChildName",
+    AccountAI = "AccountAI"
 }
 
 interface CreateSheetToolDto {

package/dist/index.js

@@ -3135,6 +3135,9 @@ var EFilterOptionManagerSheet = /* @__PURE__ */ ((EFilterOptionManagerSheet2) =>
   EFilterOptionManagerSheet2["UpdatedBy"] = "UpdatedBy";
   EFilterOptionManagerSheet2["Ideas"] = "Ideas";
   EFilterOptionManagerSheet2["Niche"] = "Niche";
+  EFilterOptionManagerSheet2["SheetName"] = "SheetName";
+  EFilterOptionManagerSheet2["ChildName"] = "ChildName";
+  EFilterOptionManagerSheet2["AccountAI"] = "AccountAI";
   return EFilterOptionManagerSheet2;
 })(EFilterOptionManagerSheet || {});
 

package/dist/index.mjs

@@ -2837,6 +2837,9 @@ var EFilterOptionManagerSheet = /* @__PURE__ */ ((EFilterOptionManagerSheet2) =>
   EFilterOptionManagerSheet2["UpdatedBy"] = "UpdatedBy";
   EFilterOptionManagerSheet2["Ideas"] = "Ideas";
   EFilterOptionManagerSheet2["Niche"] = "Niche";
+  EFilterOptionManagerSheet2["SheetName"] = "SheetName";
+  EFilterOptionManagerSheet2["ChildName"] = "ChildName";
+  EFilterOptionManagerSheet2["AccountAI"] = "AccountAI";
   return EFilterOptionManagerSheet2;
 })(EFilterOptionManagerSheet || {});
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "automation-lib",
-  "version": "6.6.414",
+  "version": "6.6.415",
   "description": "Common features and type of applications auto",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -30,7 +30,7 @@
     "typescript": "^5.4.5"
   },
   "dependencies": {
-    "automation-lib": "^6.6.405",
+    "automation-lib": "^6.6.414",
     "http-status-codes": "^2.3.0",
     "nodemailer": "^6.9.13",
     "sharp": "^0.33.3"