diff --git a/.eslintrc b/.eslintrc index 3350a286..d5a0146c 100644 --- a/.eslintrc +++ b/.eslintrc @@ -9,7 +9,8 @@ }, "ignorePatterns": [ "**/node_modules/**", - "**/dist/**" + "**/dist/**", + "**/static/**" ], "plugins": ["promise", "node"], "rules": { diff --git a/.vscode/launch.json b/.vscode/launch.json index 23cc07b0..7c1fa999 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -7,7 +7,7 @@ { "type": "node", "request": "launch", - "name": "Launch", + "name": "Launch Program", "skipFiles": [ "/**" ], diff --git a/package-lock.json b/package-lock.json index 747477d0..ace4b37e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cht-user-management", - "version": "1.0.14", + "version": "1.0.15", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cht-user-management", - "version": "1.0.14", + "version": "1.0.15", "license": "ISC", "dependencies": { "@fastify/autoload": "^5.8.0", diff --git a/package.json b/package.json index 8089d5ce..703b7eb5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cht-user-management", - "version": "1.0.14", + "version": "1.0.15", "main": "dist/index.js", "dependencies": { "@fastify/autoload": "^5.8.0", diff --git a/src/lib/retry-logic.ts b/src/lib/retry-logic.ts index 17849357..8c116884 100644 --- a/src/lib/retry-logic.ts +++ b/src/lib/retry-logic.ts @@ -41,7 +41,7 @@ export async function createUserWithRetries(userPayload: UserPayload, chtApi: Ch try { await chtApi.createUser(userPayload); return userPayload; - } catch (err: any) { + } catch (err: any) { if (axiosRetryConfig.retryCondition(err)) { continue; } diff --git a/src/public/app/fragment_home.html b/src/public/app/fragment_home.html index 85cae48b..4af292f8 100644 --- a/src/public/app/fragment_home.html +++ b/src/public/app/fragment_home.html @@ -1,8 +1,13 @@
-
-
- {% include "place/list.html" %} -
+
+ {% include "place/directive.html" %} + {% include "place/list.html" %}
\ No newline at end of file diff --git a/src/public/app/nav.html b/src/public/app/nav.html index b66acffc..533ef2d8 100644 --- a/src/public/app/nav.html +++ b/src/public/app/nav.html @@ -66,18 +66,12 @@
cloud - Connected to {{ session.authInfo.friendly}} as {{ session.username }} + Connected to {{ session.authInfo.friendly }} as {{ session.username }}
- - group_add Upload - - - - save_as Save Credentials - - + {% include "components/button_upload.html" className="navbar-item" %} + {% include "components/button_save_credentials.html" className="navbar-item" %} logout Logout diff --git a/src/public/components/button_save_credentials.html b/src/public/components/button_save_credentials.html new file mode 100644 index 00000000..f1445a22 --- /dev/null +++ b/src/public/components/button_save_credentials.html @@ -0,0 +1,3 @@ + + save_as Save Credentials + \ No newline at end of file diff --git a/src/public/components/button_upload.html b/src/public/components/button_upload.html new file mode 100644 index 00000000..5d5f7459 --- /dev/null +++ b/src/public/components/button_upload.html @@ -0,0 +1,3 @@ + + group_add Upload + \ No newline at end of file diff --git a/src/public/components/search_input.html b/src/public/components/search_input.html index 839edbb7..2ac5a7e7 100644 --- a/src/public/components/search_input.html +++ b/src/public/components/search_input.html @@ -17,7 +17,6 @@ hx-target="#search_results_{{ property_name }}" hx-swap="innerHTML" {% if include.required %} required {% endif %} {% if include.data[property_name] %}value="{{ include.data[property_name] }}" {% endif %} - {% if oob %} hx-swap-oob="true" {%endif%} hx-encoding="application/x-www-form-urlencoded" />
diff --git a/src/public/place/directive.html b/src/public/place/directive.html new file mode 100644 index 00000000..87f3c9c3 --- /dev/null +++ b/src/public/place/directive.html @@ -0,0 +1,31 @@ +
+
+
+
+ {% if progress.inProgressCount > 0 %} + {% include "place/directive_3_in_progress.html" %} + {% elsif progress.stagedCount > 0 %} + {% include "place/directive_2_prompt_upload.html" %} + {% elsif progress.successCount > 0 %} + {% include "place/directive_4_prompt_save.html" %} + {% else %} + {% include "place/directive_1_get_started.html" %} + {% endif %} +
+
+
+ +
+
+
+

Summary

+
    +
  • {{ progress.stagedCount }} staged
    • +
  • {{ progress.validationErrorCount }} validation errors
    • +
  • {{ progress.completeCount }} uploaded
    • +
  • {{ progress.failureCount }} failures
    • +
+
+
+ +
diff --git a/src/public/place/directive_1_get_started.html b/src/public/place/directive_1_get_started.html new file mode 100644 index 00000000..a926790a --- /dev/null +++ b/src/public/place/directive_1_get_started.html @@ -0,0 +1,22 @@ +

+ Getting Started... +

+

+ To get started, add some users which you want to create on the {{ session.authInfo.friendly }} instance. +

+ +{% for contactType in contactTypes %} +
+
+ + add Add {{contactType.friendly}} + +
+ Create New + Replace Existing + Upload from CSV + Move +
+
+
+{% endfor %} \ No newline at end of file diff --git a/src/public/place/directive_2_prompt_upload.html b/src/public/place/directive_2_prompt_upload.html new file mode 100644 index 00000000..da1efc62 --- /dev/null +++ b/src/public/place/directive_2_prompt_upload.html @@ -0,0 +1,15 @@ +

+ Upload When Ready +

+

+ You now have some staged users below which are ready for upload. + When everything looks right, upload them to {{ session.authInfo.friendly }}. +

+ +
+
+ + group_add Upload + +
+
diff --git a/src/public/place/directive_3_in_progress.html b/src/public/place/directive_3_in_progress.html new file mode 100644 index 00000000..6e9b3723 --- /dev/null +++ b/src/public/place/directive_3_in_progress.html @@ -0,0 +1,5 @@ +

+ Upload In Progress... +

+ +{{ progress.percent }} \ No newline at end of file diff --git a/src/public/place/directive_4_prompt_save.html b/src/public/place/directive_4_prompt_save.html new file mode 100644 index 00000000..94c921a1 --- /dev/null +++ b/src/public/place/directive_4_prompt_save.html @@ -0,0 +1,13 @@ +

+ Download Resulting User Credentials +

+ +

+ Usernames and passwords are now available for download. Click the button below to download the credentials as a file. +

+ +
+
+ {% include "components/button_save_credentials.html" %} +
+
diff --git a/src/public/place/list.html b/src/public/place/list.html index a8694946..07ee2289 100644 --- a/src/public/place/list.html +++ b/src/public/place/list.html @@ -1,121 +1,107 @@ -{% for contactType in contactTypes %} -
-

{{contactType.friendly}}

- {% if contactType.places.length > 0 %} - - - - {% for hierarchy in contactType.hierarchy %} - - {% endfor %} - {% for property in contactType.place_properties %} - - {% endfor %} - {% for contact_property in contactType.contact_properties %} - - {% endfor %} - - - - - - {% for place in contactType.places %} - - {% for hierarchy in contactType.hierarchy %} - {% capture propertyName %}hierarchy_{{ hierarchy.property_name }}{% endcapture %} - {% - include "components/list_cell.html" - propertyName=propertyName - property=hierarchy - values=place.hierarchyProperties - linkTo=place.resolvedHierarchy[hierarchy.level] - %} - {% endfor %} +
+ {% for contactType in contactTypes %} +
+ {% if contactType.places.length > 0 %} +

{{contactType.friendly}}

+
{{ hierarchy.friendly_name }}{{property.friendly_name}}{{contact_property.friendly_name}}
+ + + {% for hierarchy in contactType.hierarchy %} + + {% endfor %} + {% for property in contactType.place_properties %} + + {% endfor %} + {% for contact_property in contactType.contact_properties %} + + {% endfor %} + + + + + + {% for place in contactType.places %} + + {% for hierarchy in contactType.hierarchy %} + {% capture propertyName %}hierarchy_{{ hierarchy.property_name }}{% endcapture %} + {% + include "components/list_cell.html" + propertyName=propertyName + property=hierarchy + values=place.hierarchyProperties + linkTo=place.resolvedHierarchy[hierarchy.level] + %} + {% endfor %} - {% for property in contactType.place_properties %} - {% capture propertyName %}place_{{ property.property_name }}{% endcapture %} + {% for property in contactType.place_properties %} + {% capture propertyName %}place_{{ property.property_name }}{% endcapture %} - {% - include "components/list_cell.html" - propertyName=propertyName - property=property - values=place.properties - %} - {% endfor %} - - {% for contact_property in contactType.contact_properties %} - {% capture propertyName %}contact_{{ contact_property.property_name }}{% endcapture %} - {% - include "components/list_cell.html" - propertyName=propertyName - property=contact_property - values=place.contact.properties - %} - {% endfor %} - - + {% + include "components/list_cell.html" + propertyName=propertyName + property=property + values=place.properties + %} + {% endfor %} - + + - - {% endfor%} - -
{{ hierarchy.friendly_name }}{{property.friendly_name}}{{contact_property.friendly_name}}
- {% capture tag_text %}{% if place.validationErrors == empty %}{{ place.state }}{% else %}INVALID{% endif %}{% endcapture %} - {% capture tag_class %} - {% if place.state == 'failure' or place.validationErrors != empty %}is-danger{% endif %} - {% if place.uploadError %}has-tooltip-arrow has-tooltipl-multiline{% endif %} - {% endcapture %} - - {{ tag_text }} - - - {% if place.creationDetails.password %} - {% capture explanation %}Username: {{ place.creationDetails.username }} -Password: {{ place.creationDetails.password }}{% endcapture %} + {% for contact_property in contactType.contact_properties %} + {% capture propertyName %}contact_{{ contact_property.property_name }}{% endcapture %} + {% + include "components/list_cell.html" + propertyName=propertyName + property=contact_property + values=place.contact.properties + %} + {% endfor %} + + + {% capture tag_text %}{% if place.validationErrors == empty %}{{ place.state }}{% else %}INVALID{% endif %}{% endcapture %} + {% capture tag_class %} + {% if place.state == 'failure' or place.validationErrors != empty %}is-danger{% endif %} + {% if place.uploadError %}has-tooltip-arrow has-tooltipl-multiline{% endif %} + {% endcapture %} - key + {{ tag_text }} - {% else %} - - edit - - - refresh - - {% if place.validationErrors == empty %} - - upload + + {% if place.creationDetails.password %} + {% capture explanation %}Username: {{ place.creationDetails.username }} + Password: {{ place.creationDetails.password }}{% endcapture %} + + key + + {% else %} + + edit + + refresh + + {% if place.validationErrors == empty %} + + upload + + {%endif%} {%endif%} - {%endif%} - - delete -
- {% endif %} -
-
- - add Add {{contactType.friendly}} - -
- Create New - Replace Existing - Upload from CSV - Move -
-
-
-
-{% endfor %} \ No newline at end of file + delete + + + {% endfor%} + + + {% endif %} + {% endfor %} +
\ No newline at end of file diff --git a/src/public/place/list_event.html b/src/public/place/list_event.html new file mode 100644 index 00000000..fab2ab40 --- /dev/null +++ b/src/public/place/list_event.html @@ -0,0 +1,2 @@ +{% include "place/directive.html" %} +{% include "place/list.html" %} \ No newline at end of file diff --git a/src/routes/add-place.ts b/src/routes/add-place.ts index 35e5e634..912f72e2 100644 --- a/src/routes/add-place.ts +++ b/src/routes/add-place.ts @@ -122,7 +122,7 @@ export default async function addPlace(fastify: FastifyInstance) { await RemotePlaceResolver.resolveOne(place, sessionCache, chtApi, { fuzz: true }); place.validate(); - fastify.uploadManager.refresh(req.sessionCache); + fastify.uploadManager.triggerRefresh(place.id); }); fastify.post('/place/upload/:id', async (req) => { @@ -135,14 +135,13 @@ export default async function addPlace(fastify: FastifyInstance) { const chtApi = new ChtApi(req.chtSession); const uploadManager: UploadManager = fastify.uploadManager; - await uploadManager.doUpload([place], chtApi); - fastify.uploadManager.refresh(req.sessionCache); + uploadManager.doUpload([place], chtApi); }); fastify.post('/place/remove/:id', async (req) => { const { id } = req.params as any; const sessionCache: SessionCache = req.sessionCache; sessionCache.removePlace(id); - fastify.uploadManager.refresh(req.sessionCache); + fastify.uploadManager.triggerRefresh(id); }); } diff --git a/src/routes/app.ts b/src/routes/app.ts index 8b15409a..d4d722cd 100644 --- a/src/routes/app.ts +++ b/src/routes/app.ts @@ -1,11 +1,12 @@ import { FastifyInstance } from 'fastify'; + +import { ChtApi } from '../lib/cht-api'; import { Config } from '../config'; +import ProgressModel from '../services/progress-model'; +import RemotePlaceCache from '../lib/remote-place-cache'; +import RemotePlaceResolver from '../lib/remote-place-resolver'; import SessionCache from '../services/session-cache'; import { UploadManager } from '../services/upload-manager'; -import { PlaceUploadState } from '../services/place'; -import { ChtApi } from '../lib/cht-api'; -import RemotePlaceResolver from '../lib/remote-place-resolver'; -import RemotePlaceCache from '../lib/remote-place-cache'; export default async function sessionCache(fastify: FastifyInstance) { fastify.get('/', async (req, resp) => { @@ -18,8 +19,6 @@ export default async function sessionCache(fastify: FastifyInstance) { const contactType = Config.getContactType(placeTypeName); const sessionCache: SessionCache = req.sessionCache; - const failed = sessionCache.getPlaces({ state: PlaceUploadState.FAILURE }); - const scheduledJobs = sessionCache.getPlaces({ state: PlaceUploadState.SCHEDULED }); const placeData = contactTypes.map((item) => { return { ...item, @@ -30,15 +29,12 @@ export default async function sessionCache(fastify: FastifyInstance) { const tmplData = { view: 'list', + session: req.chtSession, logo: Config.getLogoBase64(), + op, contactType, contactTypes: placeData, - sessionState: sessionCache.state, - hasFailedJobs: failed.length > 0, - failedJobCount: failed.length, - scheduledJobCount: scheduledJobs.length, - session: req.chtSession, - op, + progress: new ProgressModel(sessionCache), }; return resp.view('src/public/app/view.html', tmplData); @@ -47,7 +43,7 @@ export default async function sessionCache(fastify: FastifyInstance) { fastify.post('/app/remove-all', async (req) => { const sessionCache: SessionCache = req.sessionCache; sessionCache.removeAll(); - fastify.uploadManager.refresh(req.sessionCache); + fastify.uploadManager.triggerRefresh(undefined); }); fastify.post('/app/refresh-all', async (req) => { @@ -60,7 +56,7 @@ export default async function sessionCache(fastify: FastifyInstance) { await RemotePlaceResolver.resolve(places, sessionCache, chtApi, { fuzz: true }); places.forEach(p => p.validate()); - fastify.uploadManager.refresh(req.sessionCache); + fastify.uploadManager.triggerRefresh(undefined); }); // initiates place creation via the job manager @@ -68,9 +64,7 @@ export default async function sessionCache(fastify: FastifyInstance) { const uploadManager: UploadManager = fastify.uploadManager; const sessionCache: SessionCache = req.sessionCache; - uploadManager.eventedSessionStateChange(sessionCache, 'in_progress'); const chtApi = new ChtApi(req.chtSession); uploadManager.doUpload(sessionCache.getPlaces(), chtApi); - uploadManager.eventedSessionStateChange(sessionCache, 'done'); }); } diff --git a/src/routes/events.ts b/src/routes/events.ts index 1d8215be..482c0131 100644 --- a/src/routes/events.ts +++ b/src/routes/events.ts @@ -1,23 +1,23 @@ import { FastifyInstance } from 'fastify'; import { Config } from '../config'; -import { PlaceUploadState } from '../services/place'; -import SessionCache, { SessionCacheUploadState } from '../services/session-cache'; +import SessionCache from '../services/session-cache'; +import ProgressModel from '../services/progress-model'; export default async function events(fastify: FastifyInstance) { - fastify.get('/events/places_list', async (req, resp) => { + fastify.get('/events/places/all', async (req, resp) => { const sessionCache: SessionCache = req.sessionCache; const contactTypes = Config.contactTypes(); - const placeData = contactTypes.map((item) => { - return { - ...item, - places: sessionCache.getPlaces({ type: item.name }), - hierarchy: Config.getHierarchyWithReplacement(item, 'desc'), - }; - }); - return resp.view('src/public/place/list.html', { + const placeData = contactTypes.map(item => ({ + ...item, + places: sessionCache.getPlaces({ type: item.name }), + hierarchy: Config.getHierarchyWithReplacement(item, 'desc'), + })); + + return resp.view('src/public/place/list_event.html', { contactTypes: placeData, session: req.chtSession, + progress: new ProgressModel(sessionCache), }); }); @@ -25,19 +25,17 @@ export default async function events(fastify: FastifyInstance) { const { uploadManager } = fastify; resp.hijack(); - const placesChangeListener = (arg: PlaceUploadState) => { - resp.sse({ event: 'places_state_change', data: arg }); - }; - uploadManager.on('places_state_change', placesChangeListener); - - const sessionStateListener = (arg: SessionCacheUploadState) => { - resp.sse({ event: 'session_state_change', data: arg }); + const placesChangeListener = (arg: string = '*') => { + console.log('place_state_change', arguments); + resp.sse({ event: 'place_state_change', data: arg }); }; - uploadManager.on('session_state_change', sessionStateListener); + + uploadManager.on('refresh_table', placesChangeListener); + uploadManager.on('refresh_table_row', placesChangeListener); req.socket.on('close', () => { - uploadManager.removeListener('places_state_change', placesChangeListener); - uploadManager.removeListener('session_state_change', sessionStateListener); + uploadManager.removeListener('refresh_table', placesChangeListener); + uploadManager.removeListener('refresh_table_row', placesChangeListener); }); }); } diff --git a/src/services/place.ts b/src/services/place.ts index a67208a3..d7ae2a08 100644 --- a/src/services/place.ts +++ b/src/services/place.ts @@ -20,9 +20,9 @@ export type UserCreationDetails = { export enum PlaceUploadState { SUCCESS = 'success', FAILURE = 'failure', - PENDING = 'pending', + STAGED = 'staged', SCHEDULED = 'scheduled', - IN_PROGESS = 'in_progress', + IN_PROGRESS = 'in_progress', } const PLACE_PREFIX = 'place_'; @@ -57,7 +57,7 @@ export default class Place { this.contact = new Contact(type); this.properties = {}; this.hierarchyProperties = {}; - this.state = PlaceUploadState.PENDING; + this.state = PlaceUploadState.STAGED; this.resolvedHierarchy = []; } @@ -220,6 +220,10 @@ export default class Place { return username; } + public get hasValidationErrors() : boolean { + return Object.keys(this.validationErrors as any).length > 0; + } + public get isDependant() : boolean { return !!this.resolvedHierarchy.find(hierarchy => hierarchy?.type === 'local'); } diff --git a/src/services/progress-model.ts b/src/services/progress-model.ts new file mode 100644 index 00000000..25974aa6 --- /dev/null +++ b/src/services/progress-model.ts @@ -0,0 +1,28 @@ +import { PlaceUploadState } from './place'; +import SessionCache from './session-cache'; + +export default class ProgressModel { + public completeCount: number; + public stagedCount: number; + public percent: string; + public successCount: number; + public failureCount: number; + public inProgressCount: number; + public validationErrorCount: number; + public totalCount: number; + + constructor(sessionCache: SessionCache) { + this.successCount = sessionCache.getPlaces({ state: PlaceUploadState.SUCCESS }).length; + this.failureCount = sessionCache.getPlaces({ state: PlaceUploadState.FAILURE }).length; + this.validationErrorCount = sessionCache.getPlaces().filter(r => r.hasValidationErrors).length; + + const inProgressStates = [PlaceUploadState.IN_PROGRESS, PlaceUploadState.SCHEDULED]; + this.inProgressCount = sessionCache.getPlaces().filter(r => inProgressStates.includes(r.state)).length; + this.totalCount = sessionCache.getPlaces().length; + + this.completeCount = this.successCount + this.failureCount; + this.stagedCount = this.totalCount - this.validationErrorCount - this.completeCount; + const percentage = this.stagedCount > 0 ? this.completeCount / this.totalCount : 0; + this.percent = Math.round(percentage * 100.0) + '%'; + } +} diff --git a/src/services/session-cache.ts b/src/services/session-cache.ts index 12a59cf2..b64b5bcc 100644 --- a/src/services/session-cache.ts +++ b/src/services/session-cache.ts @@ -1,12 +1,10 @@ import Place, { PlaceUploadState } from './place'; import { ChtSession } from '../lib/cht-api'; -export type SessionCacheUploadState = 'in_progress' | 'done' | 'pending'; +export type SessionCacheUploadState = 'in_progress' | 'done' | 'staged'; export default class SessionCache { private static caches: Map = new Map(); - - public state: SessionCacheUploadState = 'pending'; private places: { [key: string]: Place } = {}; private constructor() {} diff --git a/src/services/upload-manager.ts b/src/services/upload-manager.ts index 2d108039..dc0a0958 100644 --- a/src/services/upload-manager.ts +++ b/src/services/upload-manager.ts @@ -5,12 +5,11 @@ import { ChtApi, PlacePayload } from '../lib/cht-api'; import { Config } from '../config'; import Place, { PlaceUploadState } from './place'; import RemotePlaceCache from '../lib/remote-place-cache'; -import SessionCache, { SessionCacheUploadState } from './session-cache'; import { UploadNewPlace } from './upload.new'; import { UploadReplacementPlace } from './upload.replacement'; import { UserPayload } from './user-payload'; -const UPLOAD_BATCH_SIZE = 10; +const UPLOAD_BATCH_SIZE = 1; export interface Uploader { handleContact (payload: PlacePayload): Promise; @@ -20,7 +19,7 @@ export interface Uploader { export class UploadManager extends EventEmitter { doUpload = async (places: Place[], chtApi: ChtApi) => { - const placesNeedingUpload = places.filter(p => !p.isCreated && Object.keys(p.validationErrors as any).length === 0); + const placesNeedingUpload = places.filter(p => !p.isCreated && !p.hasValidationErrors); this.eventedPlaceStateChange(placesNeedingUpload, PlaceUploadState.SCHEDULED); const independants = placesNeedingUpload.filter(p => !p.isDependant); @@ -38,7 +37,7 @@ export class UploadManager extends EventEmitter { } private async uploadSinglePlace(place: Place, chtApi: ChtApi) { - this.eventedPlaceStateChange(place, PlaceUploadState.IN_PROGESS); + this.eventedPlaceStateChange(place, PlaceUploadState.IN_PROGRESS); try { const uploader: Uploader = place.hierarchyProperties.replacement ? new UploadReplacementPlace(chtApi) : new UploadNewPlace(chtApi); @@ -82,23 +81,27 @@ export class UploadManager extends EventEmitter { } } - public refresh(sessionCache: SessionCache) { - this.emit('session_state_change', sessionCache.state); - this.emit('places_state_change', PlaceUploadState.PENDING); - } - - public eventedSessionStateChange(sessionCache: SessionCache, state: SessionCacheUploadState) { - sessionCache.state = state; - this.emit('session_state_change', state); + public triggerRefresh(place_id: string | undefined) { + if (place_id) { + this.emit('refresh_table_row', place_id); + } else { + this.emit('refresh_table'); + } } private eventedPlaceStateChange = (subject: Place | Place[], state: PlaceUploadState) => { - if (Array.isArray(subject)) { - subject.forEach(place => place.state = state); - } else { - subject.state = state; + if (!Array.isArray(subject)) { + subject = [subject]; + } + + if (subject.length > 1) { + this.triggerRefresh(undefined); + return; } - this.emit('places_state_change', state); + subject.forEach(place => { + place.state = state; + this.triggerRefresh(place.id); + }); }; } diff --git a/test/services/progress-model.spec.ts b/test/services/progress-model.spec.ts new file mode 100644 index 00000000..db2f6479 --- /dev/null +++ b/test/services/progress-model.spec.ts @@ -0,0 +1,47 @@ +import { expect } from 'chai'; + +import { PlaceUploadState } from '../../src/services/place'; +import ProgressModel from '../../src/services/progress-model'; +import SessionCache from '../../src/services/session-cache'; + +describe('services/progress-model.ts', () => { + it('one place with each state', () => { + const sessionCache = new SessionCache(); + sessionCache.savePlaces( + { id: 'fail', state: PlaceUploadState.FAILURE }, + { id: 'in-progress', state: PlaceUploadState.IN_PROGRESS }, + { id: 'staged', state: PlaceUploadState.STAGED }, + { id: 'scheduled', state: PlaceUploadState.SCHEDULED }, + { id: 'success', state: PlaceUploadState.SUCCESS }, + { id: 'validation-error', state: PlaceUploadState.STAGED, hasValidationErrors: true }, + ); + + const progressModel = new ProgressModel(sessionCache); + expect(progressModel).to.deep.eq({ + failureCount: 1, + successCount: 1, + validationErrorCount: 1, + completeCount: 2, + inProgressCount: 2, + stagedCount: 3, + totalCount: 6, + percent: '33%', + }); + }); + + it('empty session', () => { + const sessionCache = new SessionCache(); + const progressModel = new ProgressModel(sessionCache); + expect(progressModel).to.deep.eq({ + failureCount: 0, + successCount: 0, + validationErrorCount: 0, + completeCount: 0, + inProgressCount: 0, + stagedCount: 0, + totalCount: 0, + percent: '0%', + }); + }); +}); +