myrtex-mf-competition 1.0.94-beta.2 → 1.0.96

package/fesm2015/myrtex-mf-competition.mjs

@@ -7,7 +7,7 @@ import { createEffect, ofType, EffectsModule } from '@ngrx/effects';
 import * as i2 from '@ngrx/store';
 import { createAction, props, createFeatureSelector, createSelector, select, createReducer, on, StoreModule } from '@ngrx/store';
 import * as i3 from 'myrtex-mf-ui-composite';
-import { selectCompetitionIdAndVersionId, EndpointBaseService, UnSubscriber, CompetitionStatusEnum, CancelCompetitionTypeEnum, CompetitionVersionStatusEnum, CompetitionVersionStatusEnumLabel, CompetitionStatusEnumLabel, CompetitionModeEnum, selectCompetitionLabel, selectCompetitionConfig, selectUserInfo, CompetitionVersionStatusGrouppingLabel, DialogColor, DialogType, MessageSeverity, CompetitionTypeEnum, selectCompetitionId, selectVersionId, Utilities, TenantSettingsModule, MyrtexUiComponentsModule, MyrtexMfUiCompositeModule } from 'myrtex-mf-ui-composite';
+import { selectCompetitionIdAndVersionId, EndpointBaseService, UnSubscriber, CompetitionStatusEnum, CancelCompetitionTypeEnum, CompetitionVersionStatusEnum, CompetitionVersionStatusEnumLabel, CompetitionStatusEnumLabel, CompetitionModeEnum, selectCompetitionLabel, selectCompetitionConfig, CompetitionVersionStatusGrouppingLabel, DialogColor, DialogType, MessageSeverity, CompetitionTypeEnum, selectCompetitionId, selectVersionId, Utilities, TenantSettingsModule, MyrtexUiComponentsModule, MyrtexMfUiCompositeModule } from 'myrtex-mf-ui-composite';
 import * as i1$1 from 'myrtex-mf-signer';
 import { MyrtexSignerModule } from 'myrtex-mf-signer';
 import * as i1 from '@angular/common/http';
@@ -20,7 +20,7 @@ import * as i7 from 'myrtex-mf-ui';
 import { DropdownModule, CdkTooltipModule } from 'myrtex-mf-ui';
 import * as i9 from '@angular/forms';
 import { FormsModule } from '@angular/forms';
-import { EMPTY } from 'rxjs';
+import { Subject, EMPTY } from 'rxjs';
 import { withLatestFrom, switchMap, map, catchError, tap } from 'rxjs/operators';
 
 var ECompetitionHeaderActions;
@@ -91,7 +91,9 @@ const CAN_CREATE_COMPETITION_VERSION = 'can-create-competition-version';
 const CAN_AGREEMENT_COMPETITION = 'can-agreement-competition';
 const CAN_PUBLIC_COMPETITION = 'can-public-competition';
 const CAN_CANCEL_COMPETITION = 'can-cancel-competition';
-const CAN_COMPLETE_COMPETITION = 'can-complete-competition';
+const CAN_COMPLETE_COMPETITION = 'can-complete-competition';
+const CAN_VIEW_COMPETITION_SETTINGS_ANY_STATUS = 'can-view-competition-settings-any-status';
+const CAN_VIEW_COMPETITION_SETTINGS_PUBLIC_STATUS = 'can-view-competition-settings-public-status';
 
 class SettingsService extends EndpointBaseService {
     constructor(http, injector) {
@@ -287,6 +289,16 @@ class LibCompetitionHeaderComponent extends UnSubscriber {
         this.appendSubscription(this.store.pipe(select(selectCompetitionStatus)).subscribe(result => {
             if (result) {
                 this.competition = result;
+                this._accessService.checkPermission(this.getAccessControl(CAN_AGREEMENT_COMPETITION))
+                    .subscribe(result => this._canAgreementVersionAccess = true); // TODO true => result
+                this._accessService.checkPermission(this.getAccessControl(CAN_CREATE_COMPETITION_VERSION))
+                    .subscribe(result => this._canCreateVersionAccess = true); // TODO true => result
+                this._accessService.checkPermission(this.getAccessControl(CAN_PUBLIC_COMPETITION))
+                    .subscribe(result => this._canPublicVersionAccess = true); // TODO true => result
+                this._accessService.checkPermission(this.getAccessControl(CAN_COMPLETE_COMPETITION))
+                    .subscribe(result => this._canCompleteEntityAccess = true); // TODO true => result
+                this._accessService.checkPermission(this.getAccessControl(CAN_CANCEL_COMPETITION))
+                    .subscribe(result => this._canCancelEntityAccess = true); // TODO true => result
             }
         }));
         this.appendSubscription(this.store.pipe(select(selectCompetitionType)).subscribe(result => {
@@ -330,20 +342,6 @@ class LibCompetitionHeaderComponent extends UnSubscriber {
                 }, 10000);
             }
         }));
-        this.appendSubscription(this.store.pipe(select(selectUserInfo)).subscribe(result => {
-            if (result) {
-                this._accessService.checkPermission(this.getAccessControl(CAN_AGREEMENT_COMPETITION))
-                    .subscribe(result => this._canAgreementVersionAccess = true);
-                this._accessService.checkPermission(this.getAccessControl(CAN_CREATE_COMPETITION_VERSION))
-                    .subscribe(result => this._canCreateVersionAccess = true);
-                this._accessService.checkPermission(this.getAccessControl(CAN_PUBLIC_COMPETITION))
-                    .subscribe(result => this._canPublicVersionAccess = true);
-                this._accessService.checkPermission(this.getAccessControl(CAN_COMPLETE_COMPETITION))
-                    .subscribe(result => this._canCompleteEntityAccess = true);
-                this._accessService.checkPermission(this.getAccessControl(CAN_CANCEL_COMPETITION))
-                    .subscribe(result => this._canCancelEntityAccess = true);
-            }
-        }));
         this.settingsService.getSelelectionEditEbLinks().subscribe(res => {
             this._ebLinksModel = res;
         });
@@ -400,12 +398,13 @@ class LibCompetitionHeaderComponent extends UnSubscriber {
             const selectedItem = this.selected;
             if (this.validateVersionAction) {
                 this.validateVersionAction(selectedItem.id, () => {
+                    var _a, _b;
                     this.signService.sign({
                         title: 'Направление документа на согласование',
                         okLabel: 'Отправить',
                         cancelLabel: 'Отменить',
-                        pdfUrl: `/m-data/minfin/pdf-competition/${selectedItem.id}`,
-                        xmlUrl: `/m-data/minfin/xml-competition/${selectedItem.id}`,
+                        pdfUrl: `/m-data/minfin/pdf-competition/${(_a = this.competition) === null || _a === void 0 ? void 0 : _a.id}?versionId=${selectedItem.id}`,
+                        xmlUrl: `/m-data/minfin/xml-competition/${(_b = this.competition) === null || _b === void 0 ? void 0 : _b.id}?versionId=${selectedItem.id}`,
                         provider: 'empty'
                     }, () => {
                         this.alertService.showMessage('', 'Ожидайте. Выполняется отправка на согласование.', MessageSeverity.wait);
@@ -606,14 +605,21 @@ function competitionHeaderReducer(state, action) {
 }
 
 class CompetitionHeaderService extends EndpointBaseService {
-    constructor(http, injector) {
+    constructor(http, injector, _accessService) {
         super(http, injector);
+        this._accessService = _accessService;
         this.url = '/application' + this.restPath + '/competition';
     }
     getHeader(competitionId, versionId) {
-        return !versionId
-            ? this.http.get(`${this.url}/${competitionId}/header`)
-            : this.http.get(`${this.url}/${competitionId}/header`, { params: new HttpParams().set('versionId', versionId) });
+        const subject = new Subject();
+        this._accessService.checkPermission(this.getAccessControl(CAN_VIEW_COMPETITION_SETTINGS_ANY_STATUS, (competitionId !== null && competitionId !== void 0 ? competitionId : '')))
+            .subscribe(anyVersionAccess => {
+            const statusSuffix = anyVersionAccess ? '' : '/public';
+            const params = this.getHttpVersionParam(versionId !== null && versionId !== void 0 ? versionId : '', anyVersionAccess);
+            this.http.get(`${this.url}/${competitionId}/header${statusSuffix}`, { params })
+                .subscribe(header => subject.next(header));
+        });
+        return subject.asObservable();
     }
     createVersion(competitionId) {
         return this.http.post(`${this.url}/${competitionId}/version`, {});
@@ -636,12 +642,22 @@ class CompetitionHeaderService extends EndpointBaseService {
     cancel(competitionId) {
         return this.http.post(`${this.url}/${competitionId}/cancel`, {});
     }
+    getAccessControl(permission, entityId) {
+        return {
+            permission,
+            objectType: COMPETITION_ENTITY_NAME,
+            objectId: entityId
+        };
+    }
+    getHttpVersionParam(versionId, anyVersionAccess) {
+        return anyVersionAccess && !!versionId ? new HttpParams().set('versionId', versionId) : undefined;
+    }
 }
-CompetitionHeaderService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: CompetitionHeaderService, deps: [{ token: i1.HttpClient }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable });
+CompetitionHeaderService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: CompetitionHeaderService, deps: [{ token: i1.HttpClient }, { token: i0.Injector }, { token: i5.AccessService }], target: i0.ɵɵFactoryTarget.Injectable });
 CompetitionHeaderService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: CompetitionHeaderService });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: CompetitionHeaderService, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: i0.Injector }]; } });
+        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: i0.Injector }, { type: i5.AccessService }]; } });
 
 class CompetitionHeaderEffects {
     constructor(competitionHeaderService, actions$, store, alertService) {