diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts
index c1cb18a..a49eb1c 100644
--- a/src/app/app.routing.ts
+++ b/src/app/app.routing.ts
@@ -423,11 +423,11 @@ export const appRoutes: Route[] = [
).then((m: any) => m.PaymentLogModule),
},
{
- path: 'sessionin-info',
+ path: 'user-session',
loadChildren: () =>
import(
- 'app/modules/admin/report/sessionin-info/sessionin-info.module'
- ).then((m: any) => m.SessioninInfoModule),
+ 'app/modules/admin/report/user-session/user-session.module'
+ ).then((m: any) => m.UserSessionModule),
},
{
path: 'sessionin-overlap',
diff --git a/src/app/mock-api/apps/report/sessionin-info/api.ts b/src/app/mock-api/apps/report/user-session/api.ts
similarity index 64%
rename from src/app/mock-api/apps/report/sessionin-info/api.ts
rename to src/app/mock-api/apps/report/user-session/api.ts
index 1aca46a..0190620 100644
--- a/src/app/mock-api/apps/report/sessionin-info/api.ts
+++ b/src/app/mock-api/apps/report/user-session/api.ts
@@ -1,13 +1,13 @@
import { Injectable } from '@angular/core';
import { assign, cloneDeep } from 'lodash-es';
import { FuseMockApiService, FuseMockApiUtils } from '@fuse/lib/mock-api';
-import { sessioninInfos as sessioninInfosData } from './data';
+import { userSessions as userSessionsData } from './data';
@Injectable({
providedIn: 'root',
})
-export class ReportSessioninInfoMockApi {
- private _sessioninInfos: any[] = sessioninInfosData;
+export class ReportUserSessionMockApi {
+ private _userSessions: any[] = userSessionsData;
/**
* Constructor
@@ -26,10 +26,10 @@ export class ReportSessioninInfoMockApi {
*/
registerHandlers(): void {
// -----------------------------------------------------------------------------------------------------
- // @ SessioninInfos - GET
+ // @ UserSessions - GET
// -----------------------------------------------------------------------------------------------------
this._fuseMockApiService
- .onGet('api/apps/report/sessionin-info/sessionin-infos', 300)
+ .onGet('api/apps/report/user-session/user-sessions', 300)
.reply(({ request }) => {
// Get available queries
const search = request.params.get('search');
@@ -38,12 +38,12 @@ export class ReportSessioninInfoMockApi {
const page = parseInt(request.params.get('page') ?? '1', 10);
const size = parseInt(request.params.get('size') ?? '10', 10);
- // Clone the sessioninInfos
- let sessioninInfos: any[] | null = cloneDeep(this._sessioninInfos);
+ // Clone the userSessions
+ let userSessions: any[] | null = cloneDeep(this._userSessions);
- // Sort the sessioninInfos
+ // Sort the userSessions
if (sort === 'signinId' || sort === 'nickname') {
- sessioninInfos.sort((a, b) => {
+ userSessions.sort((a, b) => {
const fieldA = a[sort].toString().toUpperCase();
const fieldB = b[sort].toString().toUpperCase();
return order === 'asc'
@@ -51,15 +51,15 @@ export class ReportSessioninInfoMockApi {
: fieldB.localeCompare(fieldA);
});
} else {
- sessioninInfos.sort((a, b) =>
+ userSessions.sort((a, b) =>
order === 'asc' ? a[sort] - b[sort] : b[sort] - a[sort]
);
}
// If search exists...
if (search) {
- // Filter the sessioninInfos
- sessioninInfos = sessioninInfos.filter(
+ // Filter the userSessions
+ userSessions = userSessions.filter(
(contact: any) =>
contact.name &&
contact.name.toLowerCase().includes(search.toLowerCase())
@@ -67,32 +67,32 @@ export class ReportSessioninInfoMockApi {
}
// Paginate - Start
- const sessioninInfosLength = sessioninInfos.length;
+ const userSessionsLength = userSessions.length;
// Calculate pagination details
const begin = page * size;
- const end = Math.min(size * (page + 1), sessioninInfosLength);
- const lastPage = Math.max(Math.ceil(sessioninInfosLength / size), 1);
+ const end = Math.min(size * (page + 1), userSessionsLength);
+ const lastPage = Math.max(Math.ceil(userSessionsLength / size), 1);
// Prepare the pagination object
let pagination = {};
// If the requested page number is bigger than
// the last possible page number, return null for
- // sessioninInfos but also send the last possible page so
+ // userSessions but also send the last possible page so
// the app can navigate to there
if (page > lastPage) {
- sessioninInfos = null;
+ userSessions = null;
pagination = {
lastPage,
};
} else {
// Paginate the results by size
- sessioninInfos = sessioninInfos.slice(begin, end);
+ userSessions = userSessions.slice(begin, end);
// Prepare the pagination mock-api
pagination = {
- length: sessioninInfosLength,
+ length: userSessionsLength,
size: size,
page: page,
lastPage: lastPage,
@@ -105,41 +105,39 @@ export class ReportSessioninInfoMockApi {
return [
200,
{
- sessioninInfos,
+ userSessions,
pagination,
},
];
});
// -----------------------------------------------------------------------------------------------------
- // @ SessioninInfo - GET
+ // @ UserSession - GET
// -----------------------------------------------------------------------------------------------------
this._fuseMockApiService
- .onGet('api/apps/report/sessionin-info/sessionin-info')
+ .onGet('api/apps/report/user-session/user-session')
.reply(({ request }) => {
// Get the id from the params
const id = request.params.get('id');
- // Clone the sessioninInfos
- const sessioninInfos = cloneDeep(this._sessioninInfos);
+ // Clone the userSessions
+ const userSessions = cloneDeep(this._userSessions);
- // Find the sessioninInfo
- const sessioninInfo = sessioninInfos.find(
- (item: any) => item.id === id
- );
+ // Find the userSession
+ const userSession = userSessions.find((item: any) => item.id === id);
// Return the response
- return [200, sessioninInfo];
+ return [200, userSession];
});
// -----------------------------------------------------------------------------------------------------
- // @ SessioninInfo - POST
+ // @ UserSession - POST
// -----------------------------------------------------------------------------------------------------
this._fuseMockApiService
- .onPost('api/apps/report/sessionin-info/sessionin-info')
+ .onPost('api/apps/report/user-session/user-session')
.reply(() => {
- // Generate a new sessioninInfo
- const newSessioninInfo = {
+ // Generate a new userSession
+ const newUserSession = {
id: FuseMockApiUtils.guid(),
category: '',
name: 'A New User',
@@ -161,58 +159,54 @@ export class ReportSessioninInfoMockApi {
active: false,
};
- // Unshift the new sessioninInfo
- this._sessioninInfos.unshift(newSessioninInfo);
+ // Unshift the new userSession
+ this._userSessions.unshift(newUserSession);
// Return the response
- return [200, newSessioninInfo];
+ return [200, newUserSession];
});
// -----------------------------------------------------------------------------------------------------
- // @ SessioninInfo - PATCH
+ // @ UserSession - PATCH
// -----------------------------------------------------------------------------------------------------
this._fuseMockApiService
- .onPatch('api/apps/report/sessionin-info/sessionin-info')
+ .onPatch('api/apps/report/user-session/user-session')
.reply(({ request }) => {
- // Get the id and sessioninInfo
+ // Get the id and userSession
const id = request.body.id;
- const sessioninInfo = cloneDeep(request.body.sessioninInfo);
+ const userSession = cloneDeep(request.body.userSession);
- // Prepare the updated sessioninInfo
- let updatedSessioninInfo = null;
+ // Prepare the updated userSession
+ let updatedUserSession = null;
- // Find the sessioninInfo and update it
- this._sessioninInfos.forEach((item, index, sessioninInfos) => {
+ // Find the userSession and update it
+ this._userSessions.forEach((item, index, userSessions) => {
if (item.id === id) {
- // Update the sessioninInfo
- sessioninInfos[index] = assign(
- {},
- sessioninInfos[index],
- sessioninInfo
- );
+ // Update the userSession
+ userSessions[index] = assign({}, userSessions[index], userSession);
- // Store the updated sessioninInfo
- updatedSessioninInfo = sessioninInfos[index];
+ // Store the updated userSession
+ updatedUserSession = userSessions[index];
}
});
// Return the response
- return [200, updatedSessioninInfo];
+ return [200, updatedUserSession];
});
// -----------------------------------------------------------------------------------------------------
- // @ SessioninInfo - DELETE
+ // @ UserSession - DELETE
// -----------------------------------------------------------------------------------------------------
this._fuseMockApiService
- .onDelete('api/apps/report/sessionin-info/sessionin-info')
+ .onDelete('api/apps/report/user-session/user-session')
.reply(({ request }) => {
// Get the id
const id = request.params.get('id');
- // Find the sessioninInfo and delete it
- this._sessioninInfos.forEach((item, index) => {
+ // Find the userSession and delete it
+ this._userSessions.forEach((item, index) => {
if (item.id === id) {
- this._sessioninInfos.splice(index, 1);
+ this._userSessions.splice(index, 1);
}
});
diff --git a/src/app/mock-api/apps/report/sessionin-info/data.ts b/src/app/mock-api/apps/report/user-session/data.ts
similarity index 97%
rename from src/app/mock-api/apps/report/sessionin-info/data.ts
rename to src/app/mock-api/apps/report/user-session/data.ts
index ad41ca6..31e7a2f 100644
--- a/src/app/mock-api/apps/report/sessionin-info/data.ts
+++ b/src/app/mock-api/apps/report/user-session/data.ts
@@ -1,6 +1,6 @@
/* eslint-disable */
-export const sessioninInfos = [
+export const userSessions = [
{
id: '1',
signinId: 'lala1',
diff --git a/src/app/mock-api/common/navigation/data.ts b/src/app/mock-api/common/navigation/data.ts
index 1e4f359..ab2bc9c 100644
--- a/src/app/mock-api/common/navigation/data.ts
+++ b/src/app/mock-api/common/navigation/data.ts
@@ -315,11 +315,11 @@ export const defaultNavigation: FuseNavigationItem[] = [
link: '/report/payment-log',
},
{
- id: 'report.sessionin-info',
- title: 'Sessionin Info',
+ id: 'report.user-session',
+ title: 'User Session',
type: 'basic',
icon: 'heroicons_outline:academic-cap',
- link: '/report/sessionin-info',
+ link: '/report/user-session',
},
{
id: 'report.sessionin-overlap',
diff --git a/src/app/mock-api/index.ts b/src/app/mock-api/index.ts
index ed07b09..6c7e565 100644
--- a/src/app/mock-api/index.ts
+++ b/src/app/mock-api/index.ts
@@ -58,7 +58,7 @@ import { ReportMoneyLogMockApi } from './apps/report/money-log/api';
import { ReportCompLogMockApi } from './apps/report/comp-log/api';
import { ReportModificationLogMockApi } from './apps/report/modification-log/api';
import { ReportPaymentLogMockApi } from './apps/report/payment-log/api';
-import { ReportSessioninInfoMockApi } from './apps/report/sessionin-info/api';
+import { ReportUserSessionMockApi } from './apps/report/user-session/api';
import { ReportSessioninOverlapMockApi } from './apps/report/sessionin-overlap/api';
import { ReportAdminSessionMockApi } from './apps/report/admin-session/api';
import { ReportExcelLogMockApi } from './apps/report/excel-log/api';
@@ -131,7 +131,7 @@ export const mockApiServices = [
ReportCompLogMockApi,
ReportModificationLogMockApi,
ReportPaymentLogMockApi,
- ReportSessioninInfoMockApi,
+ ReportUserSessionMockApi,
ReportSessioninOverlapMockApi,
ReportAdminSessionMockApi,
ReportExcelLogMockApi,
diff --git a/src/app/modules/admin/report/sessionin-info/components/index.ts b/src/app/modules/admin/report/user-session/components/index.ts
similarity index 100%
rename from src/app/modules/admin/report/sessionin-info/components/index.ts
rename to src/app/modules/admin/report/user-session/components/index.ts
diff --git a/src/app/modules/admin/report/sessionin-info/components/list.component.html b/src/app/modules/admin/report/user-session/components/list.component.html
similarity index 95%
rename from src/app/modules/admin/report/sessionin-info/components/list.component.html
rename to src/app/modules/admin/report/user-session/components/list.component.html
index a680b8a..1c6a536 100644
--- a/src/app/modules/admin/report/sessionin-info/components/list.component.html
+++ b/src/app/modules/admin/report/user-session/components/list.component.html
@@ -99,8 +99,8 @@
-
- 0; else noUser">
+
+ 0; else noUserSession">
-
+
-
+
diff --git a/src/app/modules/admin/report/sessionin-info/components/list.component.ts b/src/app/modules/admin/report/user-session/components/list.component.ts
similarity index 90%
rename from src/app/modules/admin/report/sessionin-info/components/list.component.ts
rename to src/app/modules/admin/report/user-session/components/list.component.ts
index 520f9b7..7ea21c4 100644
--- a/src/app/modules/admin/report/sessionin-info/components/list.component.ts
+++ b/src/app/modules/admin/report/user-session/components/list.component.ts
@@ -30,9 +30,9 @@ import { fuseAnimations } from '@fuse/animations';
import { FuseConfirmationService } from '@fuse/services/confirmation';
import { User } from '../../../member/user/models/user';
-import { SessioninInfo } from '../models/sessionin-info';
-import { SessioninInfoPagination } from '../models/sessionin-info-pagination';
-import { SessioninInfoService } from '../services/sessionin-info.service';
+import { UserSession } from '../models/user-session';
+import { UserSessionPagination } from '../models/user-session-pagination';
+import { UserSessionService } from '../services/user-session.service';
import { Router } from '@angular/router';
@Component({
@@ -66,13 +66,13 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
@ViewChild(MatPaginator) private _paginator!: MatPaginator;
@ViewChild(MatSort) private _sort!: MatSort;
- sessioninInfos$!: Observable
;
+ userSessions$!: Observable;
users$!: Observable;
isLoading = false;
searchInputControl = new FormControl();
- selectedSessioninInfo?: SessioninInfo;
- pagination?: SessioninInfoPagination;
+ selectedUserSession?: UserSession;
+ pagination?: UserSessionPagination;
__isSearchOpened = false;
ipBlockConfigForm!: FormGroup;
@@ -87,7 +87,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
private _changeDetectorRef: ChangeDetectorRef,
private _fuseConfirmationService: FuseConfirmationService,
private _formBuilder: FormBuilder,
- private _sessioninInfoService: SessioninInfoService,
+ private _userSessionService: UserSessionService,
private router: Router
) {}
@@ -100,9 +100,9 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
*/
ngOnInit(): void {
// Get the pagination
- this._sessioninInfoService.pagination$
+ this._userSessionService.pagination$
.pipe(takeUntil(this._unsubscribeAll))
- .subscribe((pagination: SessioninInfoPagination | undefined) => {
+ .subscribe((pagination: UserSessionPagination | undefined) => {
// Update the pagination
this.pagination = pagination;
@@ -111,7 +111,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
});
// Get the products
- this.sessioninInfos$ = this._sessioninInfoService.sessioninInfos$;
+ this.userSessions$ = this._userSessionService.userSessions$;
this.__idBlockConfirmConfig();
this.__ipBlockConfirmConfig();
@@ -132,7 +132,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
// Mark for check
this._changeDetectorRef.markForCheck();
- // If the sessioninInfo changes the sort order...
+ // If the userSession changes the sort order...
this._sort.sortChange
.pipe(takeUntil(this._unsubscribeAll))
.subscribe(() => {
@@ -145,7 +145,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
.pipe(
switchMap(() => {
this.isLoading = true;
- return this._sessioninInfoService.getSessioninInfos(
+ return this._userSessionService.getUserSessions(
this._paginator.pageIndex,
this._paginator.pageSize,
this._sort.active,
diff --git a/src/app/modules/admin/report/sessionin-info/models/sessionin-info-pagination.ts b/src/app/modules/admin/report/user-session/models/user-session-pagination.ts
similarity index 72%
rename from src/app/modules/admin/report/sessionin-info/models/sessionin-info-pagination.ts
rename to src/app/modules/admin/report/user-session/models/user-session-pagination.ts
index 67dcc9c..eb93374 100644
--- a/src/app/modules/admin/report/sessionin-info/models/sessionin-info-pagination.ts
+++ b/src/app/modules/admin/report/user-session/models/user-session-pagination.ts
@@ -1,4 +1,4 @@
-export interface SessioninInfoPagination {
+export interface UserSessionPagination {
length: number;
size: number;
page: number;
diff --git a/src/app/modules/admin/report/sessionin-info/models/sessionin-info.ts b/src/app/modules/admin/report/user-session/models/user-session.ts
similarity index 85%
rename from src/app/modules/admin/report/sessionin-info/models/sessionin-info.ts
rename to src/app/modules/admin/report/user-session/models/user-session.ts
index 58de398..edad303 100644
--- a/src/app/modules/admin/report/sessionin-info/models/sessionin-info.ts
+++ b/src/app/modules/admin/report/user-session/models/user-session.ts
@@ -1,4 +1,4 @@
-export interface SessioninInfo {
+export interface UserSession {
id?: string;
signinId?: string;
nickname?: string;
diff --git a/src/app/modules/admin/report/sessionin-info/resolvers/sessionin-info.resolver.ts b/src/app/modules/admin/report/user-session/resolvers/user-session.resolver.ts
similarity index 69%
rename from src/app/modules/admin/report/sessionin-info/resolvers/sessionin-info.resolver.ts
rename to src/app/modules/admin/report/user-session/resolvers/user-session.resolver.ts
index 5ec1abe..80505db 100644
--- a/src/app/modules/admin/report/sessionin-info/resolvers/sessionin-info.resolver.ts
+++ b/src/app/modules/admin/report/user-session/resolvers/user-session.resolver.ts
@@ -7,19 +7,19 @@ import {
} from '@angular/router';
import { catchError, Observable, throwError } from 'rxjs';
-import { SessioninInfo } from '../models/sessionin-info';
-import { SessioninInfoPagination } from '../models/sessionin-info-pagination';
-import { SessioninInfoService } from '../services/sessionin-info.service';
+import { UserSession } from '../models/user-session';
+import { UserSessionPagination } from '../models/user-session-pagination';
+import { UserSessionService } from '../services/user-session.service';
@Injectable({
providedIn: 'root',
})
-export class SessioninInfoResolver implements Resolve {
+export class UserSessionResolver implements Resolve {
/**
* Constructor
*/
constructor(
- private _sessioninInfoService: SessioninInfoService,
+ private _userSessionService: UserSessionService,
private _router: Router
) {}
@@ -36,9 +36,9 @@ export class SessioninInfoResolver implements Resolve {
resolve(
route: ActivatedRouteSnapshot,
state: RouterStateSnapshot
- ): Observable {
- return this._sessioninInfoService
- .getSessioninInfoById(route.paramMap.get('id'))
+ ): Observable {
+ return this._userSessionService
+ .getUserSessionById(route.paramMap.get('id'))
.pipe(
// Error here means the requested product is not available
catchError((error) => {
@@ -61,11 +61,11 @@ export class SessioninInfoResolver implements Resolve {
@Injectable({
providedIn: 'root',
})
-export class SessioninInfosResolver implements Resolve {
+export class UserSessionsResolver implements Resolve {
/**
* Constructor
*/
- constructor(private _sessioninInfoService: SessioninInfoService) {}
+ constructor(private _userSessionService: UserSessionService) {}
// -----------------------------------------------------------------------------------------------------
// @ Public methods
@@ -81,9 +81,9 @@ export class SessioninInfosResolver implements Resolve {
route: ActivatedRouteSnapshot,
state: RouterStateSnapshot
): Observable<{
- pagination: SessioninInfoPagination;
- sessioninInfos: SessioninInfo[];
+ pagination: UserSessionPagination;
+ userSessions: UserSession[];
}> {
- return this._sessioninInfoService.getSessioninInfos();
+ return this._userSessionService.getUserSessions();
}
}
diff --git a/src/app/modules/admin/report/sessionin-info/services/sessionin-info.service.ts b/src/app/modules/admin/report/user-session/services/user-session.service.ts
similarity index 51%
rename from src/app/modules/admin/report/sessionin-info/services/sessionin-info.service.ts
rename to src/app/modules/admin/report/user-session/services/user-session.service.ts
index 8f8d06b..ac5e489 100644
--- a/src/app/modules/admin/report/sessionin-info/services/sessionin-info.service.ts
+++ b/src/app/modules/admin/report/user-session/services/user-session.service.ts
@@ -12,21 +12,21 @@ import {
throwError,
} from 'rxjs';
-import { SessioninInfo } from '../models/sessionin-info';
-import { SessioninInfoPagination } from '../models/sessionin-info-pagination';
+import { UserSession } from '../models/user-session';
+import { UserSessionPagination } from '../models/user-session-pagination';
@Injectable({
providedIn: 'root',
})
-export class SessioninInfoService {
+export class UserSessionService {
// Private
- private __pagination = new BehaviorSubject<
- SessioninInfoPagination | undefined
- >(undefined);
- private __sessioninInfo = new BehaviorSubject(
+ private __pagination = new BehaviorSubject(
undefined
);
- private __sessioninInfos = new BehaviorSubject(
+ private __userSession = new BehaviorSubject(
+ undefined
+ );
+ private __userSessions = new BehaviorSubject(
undefined
);
@@ -42,22 +42,22 @@ export class SessioninInfoService {
/**
* Getter for pagination
*/
- get pagination$(): Observable {
+ get pagination$(): Observable {
return this.__pagination.asObservable();
}
/**
- * Getter for sessioninInfo
+ * Getter for userSession
*/
- get sessioninInfo$(): Observable {
- return this.__sessioninInfo.asObservable();
+ get userSession$(): Observable {
+ return this.__userSession.asObservable();
}
/**
- * Getter for sessioninInfos
+ * Getter for userSessions
*/
- get sessioninInfos$(): Observable {
- return this.__sessioninInfos.asObservable();
+ get userSessions$(): Observable {
+ return this.__userSessions.asObservable();
}
// -----------------------------------------------------------------------------------------------------
@@ -65,7 +65,7 @@ export class SessioninInfoService {
// -----------------------------------------------------------------------------------------------------
/**
- * Get SessioninInfos
+ * Get UserSessions
*
*
* @param page
@@ -74,21 +74,21 @@ export class SessioninInfoService {
* @param order
* @param search
*/
- getSessioninInfos(
+ getUserSessions(
page: number = 0,
size: number = 10,
sort: string = 'name',
order: 'asc' | 'desc' | '' = 'asc',
search: string = ''
): Observable<{
- pagination: SessioninInfoPagination;
- sessioninInfos: SessioninInfo[];
+ pagination: UserSessionPagination;
+ userSessions: UserSession[];
}> {
return this._httpClient
.get<{
- pagination: SessioninInfoPagination;
- sessioninInfos: SessioninInfo[];
- }>('api/apps/report/sessionin-info/sessionin-infos', {
+ pagination: UserSessionPagination;
+ userSessions: UserSession[];
+ }>('api/apps/report/user-session/user-sessions', {
params: {
page: '' + page,
size: '' + size,
@@ -100,7 +100,7 @@ export class SessioninInfoService {
.pipe(
tap((response) => {
this.__pagination.next(response.pagination);
- this.__sessioninInfos.next(response.sessioninInfos);
+ this.__userSessions.next(response.userSessions);
})
);
}
@@ -108,19 +108,19 @@ export class SessioninInfoService {
/**
* Get product by id
*/
- getSessioninInfoById(id: string | null): Observable {
- return this.__sessioninInfos.pipe(
+ getUserSessionById(id: string | null): Observable {
+ return this.__userSessions.pipe(
take(1),
- map((sessioninInfos) => {
+ map((userSessions) => {
// Find the product
- const sessioninInfo =
- sessioninInfos?.find((item) => item.id === id) || undefined;
+ const userSession =
+ userSessions?.find((item) => item.id === id) || undefined;
// Update the product
- this.__sessioninInfo.next(sessioninInfo);
+ this.__userSession.next(userSession);
// Return the product
- return sessioninInfo;
+ return userSession;
}),
switchMap((product) => {
if (!product) {
@@ -135,24 +135,21 @@ export class SessioninInfoService {
/**
* Create product
*/
- createSessioninInfo(): Observable {
- return this.sessioninInfos$.pipe(
+ createUserSession(): Observable {
+ return this.userSessions$.pipe(
take(1),
- switchMap((sessioninInfos) =>
+ switchMap((userSessions) =>
this._httpClient
- .post('api/apps/report/sessionin-info/product', {})
+ .post('api/apps/report/user-session/product', {})
.pipe(
- map((newSessioninInfo) => {
- // Update the sessioninInfos with the new product
- if (!!sessioninInfos) {
- this.__sessioninInfos.next([
- newSessioninInfo,
- ...sessioninInfos,
- ]);
+ map((newUserSession) => {
+ // Update the userSessions with the new product
+ if (!!userSessions) {
+ this.__userSessions.next([newUserSession, ...userSessions]);
}
// Return the new product
- return newSessioninInfo;
+ return newUserSession;
})
)
)
diff --git a/src/app/modules/admin/report/sessionin-info/sessionin-info.module.ts b/src/app/modules/admin/report/user-session/user-session.module.ts
similarity index 92%
rename from src/app/modules/admin/report/sessionin-info/sessionin-info.module.ts
rename to src/app/modules/admin/report/user-session/user-session.module.ts
index d6ce809..fc87323 100644
--- a/src/app/modules/admin/report/sessionin-info/sessionin-info.module.ts
+++ b/src/app/modules/admin/report/user-session/user-session.module.ts
@@ -24,14 +24,14 @@ import { SharedModule } from 'app/shared/shared.module';
import { COMPONENTS } from './components';
-import { sessioninInfoRoutes } from './sessionin-info.routing';
+import { userSessionRoutes } from './user-session.routing';
@NgModule({
declarations: [COMPONENTS],
imports: [
TranslocoModule,
SharedModule,
- RouterModule.forChild(sessioninInfoRoutes),
+ RouterModule.forChild(userSessionRoutes),
MatButtonModule,
MatFormFieldModule,
@@ -51,4 +51,4 @@ import { sessioninInfoRoutes } from './sessionin-info.routing';
MatMomentDateModule,
],
})
-export class SessioninInfoModule {}
+export class UserSessionModule {}
diff --git a/src/app/modules/admin/report/sessionin-info/sessionin-info.routing.ts b/src/app/modules/admin/report/user-session/user-session.routing.ts
similarity index 72%
rename from src/app/modules/admin/report/sessionin-info/sessionin-info.routing.ts
rename to src/app/modules/admin/report/user-session/user-session.routing.ts
index 555012e..1ae03e0 100644
--- a/src/app/modules/admin/report/sessionin-info/sessionin-info.routing.ts
+++ b/src/app/modules/admin/report/user-session/user-session.routing.ts
@@ -3,15 +3,15 @@ import { Route } from '@angular/router';
import { ListComponent } from './components/list.component';
import { ViewComponent } from '../../member/user/components/view.component';
-import { SessioninInfosResolver } from './resolvers/sessionin-info.resolver';
+import { UserSessionsResolver } from './resolvers/user-session.resolver';
import { UserResolver } from '../../member/user/resolvers/user.resolver';
-export const sessioninInfoRoutes: Route[] = [
+export const userSessionRoutes: Route[] = [
{
path: '',
component: ListComponent,
resolve: {
- sessioninInfos: SessioninInfosResolver,
+ userSessions: UserSessionsResolver,
},
},
{
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 6a972b7..c03db86 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -37,7 +37,7 @@
"Comp Log": "Comp Logs",
"Modification Log": "Member Modification Logs",
"Payment Log": "Manual Payment Logs",
- "Sessionin Info": "Sessionin Info",
+ "User Session": "User Session",
"Admin Session": "Admin Session",
"Sessionin Overlap": "Sessionin Overlap",
"Excel Log": "Excel Download Logs",
diff --git a/src/assets/i18n/ko.json b/src/assets/i18n/ko.json
index d378d95..34b079c 100644
--- a/src/assets/i18n/ko.json
+++ b/src/assets/i18n/ko.json
@@ -45,7 +45,7 @@
"Comp Log": "콤프사용 Logs",
"Modification Log": "회원수정 로그",
"Payment Log": "수동지급/회수 로그",
- "Sessionin Info": "로그인정보",
+ "User Session": "로그인정보",
"Sessionin Overlap": "중복로그인",
"Admin Session": "관리자 로그인정보",
"Excel Log": "엑셀다운 로그",