Skip to content

Commit 97da683

Browse files
V1.9.2 (#1138)
2 parents 0103705 + bd37797 commit 97da683

File tree

17 files changed

+31
-32
lines changed

17 files changed

+31
-32
lines changed

apps/api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@impler/api",
3-
"version": "1.9.0",
3+
"version": "1.9.2",
44
"author": "implerhq",
55
"license": "MIT",
66
"private": true,

apps/api/src/app/shared/services/file/file.service.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ export class ExcelFileService {
1313
async convertToCsv(file: Express.Multer.File, sheetName?: string): Promise<string> {
1414
return new Promise(async (resolve, reject) => {
1515
try {
16-
const wb = XLSX.read(file.buffer);
16+
const wb = XLSX.read(file.buffer as any, { cellDates: true, cellText: false });
1717
const ws = sheetName && wb.SheetNames.includes(sheetName) ? wb.Sheets[sheetName] : wb.Sheets[wb.SheetNames[0]];
1818
resolve(
1919
XLSX.utils.sheet_to_csv(ws, {
2020
blankrows: false,
2121
skipHidden: true,
2222
forceQuotes: true,
23+
dateNF: Defaults.DATE_FORMAT.toLowerCase(),
2324
// rawNumbers: true, // was converting 12:12:12 to 1.3945645673
2425
})
2526
);
@@ -156,7 +157,7 @@ export class ExcelFileService {
156157
return new Promise(async (resolve, reject) => {
157158
try {
158159
const workbook = new exceljs.Workbook();
159-
await workbook.xlsx.load(file.buffer);
160+
await workbook.xlsx.load(file.buffer as any);
160161
const worksheet = workbook.getWorksheet(sheetName || workbook.worksheets[0].name);
161162

162163
resolve({

apps/queue-manager/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@impler/queue-manager",
3-
"version": "1.9.0",
3+
"version": "1.9.2",
44
"author": "implerhq",
55
"license": "MIT",
66
"private": true,

apps/web/hooks/useActiveSubscriptionDetails.tsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ import { useQuery } from '@tanstack/react-query';
22
import { API_KEYS, NOTIFICATION_KEYS } from '@config';
33
import { IErrorObject, ISubscriptionData } from '@impler/shared';
44
import { usePlanMetaData } from 'store/planmeta.store.context';
5-
import { useAppState } from 'store/app.context';
5+
import { commonApi } from '@libs/api';
66
import { useSubOSIntegration } from './useSubOSIntegration';
77
import { IPlanMeta } from '@types';
8-
import { subscriptionApi } from 'subos-frontend';
98
import { notify } from '@libs/notify';
109

1110
interface UseActiveSubscriptionDetailProps {
@@ -14,7 +13,6 @@ interface UseActiveSubscriptionDetailProps {
1413

1514
export function useActiveSubscriptionDetails({ projectId }: UseActiveSubscriptionDetailProps) {
1615
const subOSIntegration = useSubOSIntegration();
17-
const { profileInfo } = useAppState();
1816
const { meta, setPlanMeta } = usePlanMetaData();
1917

2018
const {
@@ -25,9 +23,7 @@ export function useActiveSubscriptionDetails({ projectId }: UseActiveSubscriptio
2523
} = useQuery<unknown, IErrorObject, ISubscriptionData, [string | undefined]>(
2624
[API_KEYS.FETCH_ACTIVE_SUBSCRIPTION],
2725
async () => {
28-
const activeSubscription = await subscriptionApi.getActiveSubscription(profileInfo!.email);
29-
30-
return activeSubscription?.data;
26+
return await commonApi(API_KEYS.FETCH_ACTIVE_SUBSCRIPTION as any, {});
3127
},
3228
{
3329
enabled: !!projectId,
@@ -36,6 +32,8 @@ export function useActiveSubscriptionDetails({ projectId }: UseActiveSubscriptio
3632
refetchOnReconnect: true,
3733
onSuccess: (data) => {
3834
data?.meta && setPlanMeta(data.meta as IPlanMeta);
35+
36+
return data.meta as IPlanMeta;
3937
},
4038
onError: () => {
4139
notify(NOTIFICATION_KEYS.ERROR_FETCHING_SUBSCRIPTION_DETAILS, {

apps/web/hooks/useHistory.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ export function useHistory() {
3939
{
4040
enabled: !!profileInfo,
4141
keepPreviousData: true,
42-
refetchInterval: 3000,
4342
refetchIntervalInBackground: false,
4443
}
4544
);

apps/web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@impler/web",
3-
"version": "1.9.0",
3+
"version": "1.9.2",
44
"author": "implerhq",
55
"license": "MIT",
66
"private": true,

apps/widget/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@impler/widget",
3-
"version": "1.9.0",
3+
"version": "1.9.2",
44
"author": "implerhq",
55
"license": "MIT",
66
"private": true,

docker/docker-compose.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
version: "3"
1+
version: '3'
22
services:
33
mongodb:
44
image: mongo
55
container_name: mongodb
66
logging:
7-
driver: "none"
7+
driver: 'none'
88
environment:
99
- PUID=1000
1010
- PGID=1000
@@ -18,7 +18,7 @@ services:
1818

1919
api:
2020
privileged: true
21-
image: "ghcr.io/implerhq/impler/api:1.9.0"
21+
image: 'ghcr.io/implerhq/impler/api:1.9.2'
2222
depends_on:
2323
- mongodb
2424
- rabbitmq
@@ -51,12 +51,12 @@ services:
5151
ALERT_EMAIL_FROM: ${ALERT_EMAIL_FROM}
5252
LEAD_MAKE_WEBHOOK_URL: ${LEAD_MAKE_WEBHOOK_URL}
5353
ports:
54-
- "3000:3000"
54+
- '3000:3000'
5555
networks:
5656
- impler
5757

5858
queue-manager:
59-
image: "ghcr.io/implerhq/impler/queue-manager:1.9.0"
59+
image: 'ghcr.io/implerhq/impler/queue-manager:1.9.2'
6060
depends_on:
6161
- api
6262
- rabbitmq
@@ -84,7 +84,7 @@ services:
8484
- impler
8585

8686
widget:
87-
image: "ghcr.io/implerhq/impler/widget:1.9.0"
87+
image: 'ghcr.io/implerhq/impler/widget:1.9.2'
8888
depends_on:
8989
- api
9090
container_name: widget
@@ -102,7 +102,7 @@ services:
102102
embed:
103103
depends_on:
104104
- widget
105-
image: "ghcr.io/implerhq/impler/embed:1.9.0"
105+
image: 'ghcr.io/implerhq/impler/embed:1.9.2'
106106
container_name: embed
107107
environment:
108108
WIDGET_URL: ${WIDGET_BASE_URL}
@@ -114,7 +114,7 @@ services:
114114
web:
115115
depends_on:
116116
- api
117-
image: "ghcr.io/implerhq/impler/web:1.9.0"
117+
image: 'ghcr.io/implerhq/impler/web:1.9.2'
118118
container_name: web
119119
environment:
120120
NEXT_PUBLIC_API_BASE_URL: ${API_ROOT_URL}
@@ -129,12 +129,12 @@ services:
129129

130130
rabbitmq:
131131
image: rabbitmq:3-alpine
132-
container_name: "rabbitmq"
132+
container_name: 'rabbitmq'
133133
restart: always
134134
ports:
135135
- 5672:5672
136136
healthcheck:
137-
test: ["CMD", "nc", "-z", "localhost", "5672"]
137+
test: ['CMD', 'nc', '-z', 'localhost', '5672']
138138
interval: 5s
139139
timeout: 15s
140140
retries: 1
@@ -153,7 +153,7 @@ services:
153153
- 9001:9001
154154
command: server /data --console-address ":9001"
155155
healthcheck:
156-
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
156+
test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live']
157157
interval: 30s
158158
timeout: 20s
159159
retries: 3

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"npmClient": "pnpm",
44
"useNx": true,
55
"packages": ["apps/*", "libs/*", "packages/*"],
6-
"version": "1.9.0"
6+
"version": "1.9.2"
77
}

libs/dal/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@impler/dal",
3-
"version": "1.9.0",
3+
"version": "1.9.2",
44
"author": "implerhq",
55
"license": "MIT",
66
"main": "dist/index.js",

0 commit comments

Comments
 (0)