@cuby-ui/core 0.0.419 → 0.0.420
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/widgets/user-action-context-menu/services/activity-base.service.mjs +4 -2
- package/esm2022/widgets/user-action-context-menu/services/activity.service.mjs +9 -3
- package/esm2022/widgets/user-action-context-menu/user-action-context.option.mjs +1 -1
- package/fesm2022/cuby-ui-core.mjs +10 -2
- package/fesm2022/cuby-ui-core.mjs.map +1 -1
- package/package.json +4 -4
- package/widgets/user-action-context-menu/services/activity-base.service.d.ts +5 -1
- package/widgets/user-action-context-menu/services/activity.service.d.ts +2 -2
- package/widgets/user-action-context-menu/user-action-context.option.d.ts +3 -0
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { inject, Injectable, signal } from '@angular/core';
|
|
1
|
+
import { computed, inject, Injectable, signal } from '@angular/core';
|
|
2
2
|
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
|
|
3
3
|
import { UserCompanyApiService } from '@cuby-ui/api';
|
|
4
4
|
import * as i0 from "@angular/core";
|
|
@@ -7,6 +7,8 @@ export class CuiActivityBaseService {
|
|
|
7
7
|
this.userCompanyApiService = inject(UserCompanyApiService);
|
|
8
8
|
this.companiesSignal = signal([]);
|
|
9
9
|
this.companies = this.companiesSignal.asReadonly();
|
|
10
|
+
this.currentActivity = computed(() => null);
|
|
11
|
+
this.currentCompany = computed(() => null);
|
|
10
12
|
}
|
|
11
13
|
initActivityData() {
|
|
12
14
|
this.userCompanyApiService
|
|
@@ -29,4 +31,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.14", ngImpo
|
|
|
29
31
|
providedIn: 'any'
|
|
30
32
|
}]
|
|
31
33
|
}] });
|
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWN0aXZpdHktYmFzZS5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvY29yZS93aWRnZXRzL3VzZXItYWN0aW9uLWNvbnRleHQtbWVudS9zZXJ2aWNlcy9hY3Rpdml0eS1iYXNlLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFVLE1BQU0sRUFBQyxNQUFNLGVBQWUsQ0FBQztBQUMzRSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUdoRSxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxjQUFjLENBQUM7O0FBT3JELE1BQU0sT0FBTyxzQkFBc0I7SUFIbkM7UUFJcUIsMEJBQXFCLEdBQUcsTUFBTSxDQUFDLHFCQUFxQixDQUFDLENBQUM7UUFFdEQsb0JBQWUsR0FBRyxNQUFNLENBQW1CLEVBQUUsQ0FBQyxDQUFDO1FBRWhELGNBQVMsR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBRTlDLG9CQUFlLEdBQUcsUUFBUSxDQUFnQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN0RSxtQkFBYyxHQUFHLFFBQVEsQ0FBd0IsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUE7S0FnQi9FO0lBZFUsZ0JBQWdCO1FBQ25CLElBQUksQ0FBQyxxQkFBcUI7YUFDckIsY0FBYyxFQUFFO2FBQ2hCLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxDQUFDO2FBQzFCLFNBQVMsQ0FBQyxDQUFDLFFBQVEsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztJQUNyRSxDQUFDO0lBRU0sc0JBQXNCLENBQUMsVUFBa0I7UUFDNUMsT0FBTyxLQUFLLENBQUM7SUFDakIsQ0FBQztJQUVNLHFCQUFxQixDQUFDLFNBQWlCO1FBQzFDLE9BQU8sS0FBSyxDQUFDO0lBQ2pCLENBQUM7K0dBdkJRLHNCQUFzQjttSEFBdEIsc0JBQXNCLGNBRm5CLEtBQUs7OzRGQUVSLHNCQUFzQjtrQkFIbEMsVUFBVTttQkFBQztvQkFDUixVQUFVLEVBQUUsS0FBSztpQkFDcEIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge2NvbXB1dGVkLCBpbmplY3QsIEluamVjdGFibGUsIFNpZ25hbCwgc2lnbmFsfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IHRha2VVbnRpbERlc3Ryb3llZCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUvcnhqcy1pbnRlcm9wJztcblxuaW1wb3J0IHR5cGUgeyBDdWlVc2VyQ29tcGFueSB9IGZyb20gJ0BjdWJ5LXVpL2FwaSc7XG5pbXBvcnQgeyBVc2VyQ29tcGFueUFwaVNlcnZpY2UgfSBmcm9tICdAY3VieS11aS9hcGknO1xuaW1wb3J0IHsgQ3VpQWN0aXZpdHlTZXJ2aWNlIH0gZnJvbSAnLi4vdXNlci1hY3Rpb24tY29udGV4dC5vcHRpb24nO1xuaW1wb3J0IHtDdWlVc2VyQ29tcGFueUFjdGl2aXR5fSBmcm9tIFwiQGN1YnktdWkvYXBpL3BsYXRmb3JtL21vZGVscy91c2VyLWNvbXBhbnktYXBpLm9wdGlvbnNcIjtcblxuQEluamVjdGFibGUoe1xuICAgIHByb3ZpZGVkSW46ICdhbnknXG59KVxuZXhwb3J0IGNsYXNzIEN1aUFjdGl2aXR5QmFzZVNlcnZpY2UgaW1wbGVtZW50cyBDdWlBY3Rpdml0eVNlcnZpY2Uge1xuICAgIHByaXZhdGUgcmVhZG9ubHkgdXNlckNvbXBhbnlBcGlTZXJ2aWNlID0gaW5qZWN0KFVzZXJDb21wYW55QXBpU2VydmljZSk7XG5cbiAgICBwcml2YXRlIHJlYWRvbmx5IGNvbXBhbmllc1NpZ25hbCA9IHNpZ25hbDxDdWlVc2VyQ29tcGFueVtdPihbXSk7XG5cbiAgICBwdWJsaWMgcmVhZG9ubHkgY29tcGFuaWVzID0gdGhpcy5jb21wYW5pZXNTaWduYWwuYXNSZWFkb25seSgpO1xuXG4gICAgcHVibGljIHJlYWRvbmx5IGN1cnJlbnRBY3Rpdml0eSA9IGNvbXB1dGVkPEN1aVVzZXJDb21wYW55QWN0aXZpdHkgfCBudWxsPigoKSA9PiBudWxsKTtcbiAgICBwdWJsaWMgcmVhZG9ubHkgY3VycmVudENvbXBhbnkgPSBjb21wdXRlZDxDdWlVc2VyQ29tcGFueSB8IG51bGw+KCgpID0+IG51bGwpXG5cbiAgICBwdWJsaWMgaW5pdEFjdGl2aXR5RGF0YSgpOiB2b2lkIHtcbiAgICAgICAgdGhpcy51c2VyQ29tcGFueUFwaVNlcnZpY2VcbiAgICAgICAgICAgIC5nZXRNeUNvbXBhbmllcygpXG4gICAgICAgICAgICAucGlwZSh0YWtlVW50aWxEZXN0cm95ZWQoKSlcbiAgICAgICAgICAgIC5zdWJzY3JpYmUoKHJlc3BvbnNlKSA9PiB0aGlzLmNvbXBhbmllc1NpZ25hbC5zZXQocmVzcG9uc2UpKTtcbiAgICB9XG5cbiAgICBwdWJsaWMgY2hlY2tJc0N1cnJlbnRBY3Rpdml0eShhY3Rpdml0eUlkOiBzdHJpbmcpOiBib29sZWFuIHtcbiAgICAgICAgcmV0dXJuIGZhbHNlO1xuICAgIH1cblxuICAgIHB1YmxpYyBjaGVja0lzQ3VycmVudENvbXBhbnkoY29tcGFueUlkOiBzdHJpbmcpOiBib29sZWFuIHtcbiAgICAgICAgcmV0dXJuIGZhbHNlO1xuICAgIH1cbn1cbiJdfQ==
|
|
@@ -7,8 +7,14 @@ export class CuiActivityImplService extends CuiActivityBaseService {
|
|
|
7
7
|
super(...arguments);
|
|
8
8
|
this.cuiAuthService = inject(CuiAuthService);
|
|
9
9
|
this.authData = this.cuiAuthService.getAccessTokenData();
|
|
10
|
-
this.currentActivity = computed(() =>
|
|
11
|
-
|
|
10
|
+
this.currentActivity = computed(() => {
|
|
11
|
+
const targetId = this.authData.employee_session?.activityId;
|
|
12
|
+
return this.currentCompany()?.contexts.find(activity => activity.activityId === targetId) ?? null;
|
|
13
|
+
});
|
|
14
|
+
this.currentCompany = computed(() => {
|
|
15
|
+
const targetId = this.authData.employee_session?.companyId;
|
|
16
|
+
return this.companies().find(company => company.id === targetId) ?? null;
|
|
17
|
+
});
|
|
12
18
|
this.isCheckActivity = false;
|
|
13
19
|
}
|
|
14
20
|
checkIsCurrentActivity(activityId) {
|
|
@@ -26,4 +32,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.14", ngImpo
|
|
|
26
32
|
providedIn: 'any'
|
|
27
33
|
}]
|
|
28
34
|
}] });
|
|
29
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWN0aXZpdHkuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2NvcmUvd2lkZ2V0cy91c2VyLWFjdGlvbi1jb250ZXh0LW1lbnUvc2VydmljZXMvYWN0aXZpdHkuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQVUsTUFBTSxlQUFlLENBQUM7QUFHckUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXBELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDOztBQUtqRSxNQUFNLE9BQU8sc0JBQXVCLFNBQVEsc0JBQXNCO0lBSGxFOztRQUlxQixtQkFBYyxHQUFHLE1BQU0sQ0FBQyxjQUFjLENBQUMsQ0FBQztRQUV4QyxhQUFRLEdBQUcsSUFBSSxDQUFDLGNBQWMsQ0FBQyxrQkFBa0IsRUFBMkIsQ0FBQztRQUVyRSxvQkFBZSxHQUFHLFFBQVEsQ0FBQyxHQUFHLEVBQUU7WUFDakQsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsRUFBRSxVQUFVLENBQUM7WUFFNUQsT0FBTyxJQUFJLENBQUMsY0FBYyxFQUFFLEVBQUUsUUFBUSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQyxVQUFVLEtBQUssUUFBUSxDQUFDLElBQUksSUFBSSxDQUFDO1FBQ3RHLENBQUMsQ0FDSixDQUFDO1FBRXVCLG1CQUFjLEdBQUcsUUFBUSxDQUFDLEdBQUcsRUFBRTtZQUNwRCxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLGdCQUFnQixFQUFFLFNBQVMsQ0FBQztZQUUzRCxPQUFPLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsRUFBRSxLQUFLLFFBQVEsQ0FBQyxJQUFJLElBQUksQ0FBQztRQUM3RSxDQUFDLENBQUMsQ0FBQztRQUVLLG9CQUFlLEdBQUcsS0FBSyxDQUFDO0tBU25DO0lBUG1CLHNCQUFzQixDQUFDLFVBQWtCO1FBQ3JELE9BQU8sQ0FBQyxJQUFJLENBQUMsZUFBZSxHQUFHLElBQUksQ0FBQyxlQUFlLEVBQUUsRUFBRSxVQUFVLEtBQUssVUFBVSxDQUFDLENBQUM7SUFDdEYsQ0FBQztJQUVlLHFCQUFxQixDQUFDLFNBQWlCO1FBQ25ELE9BQU8sSUFBSSxDQUFDLGNBQWMsRUFBRSxFQUFFLEVBQUUsS0FBSyxTQUFTLElBQUksQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDO0lBQzVFLENBQUM7K0dBMUJRLHNCQUFzQjttSEFBdEIsc0JBQXNCLGNBRm5CLEtBQUs7OzRGQUVSLHNCQUFzQjtrQkFIbEMsVUFBVTttQkFBQztvQkFDUixVQUFVLEVBQUUsS0FBSztpQkFDcEIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBjb21wdXRlZCwgaW5qZWN0LCBJbmplY3RhYmxlLCBzaWduYWwgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcblxuaW1wb3J0IHR5cGUgeyBDdWlBY3Rpdml0eVNlcnZpY2UgfSBmcm9tICcuLi91c2VyLWFjdGlvbi1jb250ZXh0Lm9wdGlvbic7XG5pbXBvcnQgeyBDdWlBdXRoU2VydmljZSB9IGZyb20gJy4uLy4uLy4uL3Byb3ZpZGVycyc7XG5pbXBvcnQgdHlwZSB7IEN1aUV4Y2hhbmdlVG9rZW5TZXNzaW9uIH0gZnJvbSAnLi4vLi4vLi4vc2VydmljZXMnO1xuaW1wb3J0IHsgQ3VpQWN0aXZpdHlCYXNlU2VydmljZSB9IGZyb20gJy4vYWN0aXZpdHktYmFzZS5zZXJ2aWNlJztcblxuQEluamVjdGFibGUoe1xuICAgIHByb3ZpZGVkSW46ICdhbnknXG59KVxuZXhwb3J0IGNsYXNzIEN1aUFjdGl2aXR5SW1wbFNlcnZpY2UgZXh0ZW5kcyBDdWlBY3Rpdml0eUJhc2VTZXJ2aWNlIGltcGxlbWVudHMgQ3VpQWN0aXZpdHlTZXJ2aWNlIHtcbiAgICBwcml2YXRlIHJlYWRvbmx5IGN1aUF1dGhTZXJ2aWNlID0gaW5qZWN0KEN1aUF1dGhTZXJ2aWNlKTtcblxuICAgIHByaXZhdGUgcmVhZG9ubHkgYXV0aERhdGEgPSB0aGlzLmN1aUF1dGhTZXJ2aWNlLmdldEFjY2Vzc1Rva2VuRGF0YTxDdWlFeGNoYW5nZVRva2VuU2Vzc2lvbj4oKTtcblxuICAgIHB1YmxpYyBvdmVycmlkZSByZWFkb25seSBjdXJyZW50QWN0aXZpdHkgPSBjb21wdXRlZCgoKSA9PiB7XG4gICAgICAgICAgICBjb25zdCB0YXJnZXRJZCA9IHRoaXMuYXV0aERhdGEuZW1wbG95ZWVfc2Vzc2lvbj8uYWN0aXZpdHlJZDtcblxuICAgICAgICAgICAgcmV0dXJuIHRoaXMuY3VycmVudENvbXBhbnkoKT8uY29udGV4dHMuZmluZChhY3Rpdml0eSA9PiBhY3Rpdml0eS5hY3Rpdml0eUlkID09PSB0YXJnZXRJZCkgPz8gbnVsbDtcbiAgICAgICAgfVxuICAgICk7XG5cbiAgICBwdWJsaWMgb3ZlcnJpZGUgcmVhZG9ubHkgY3VycmVudENvbXBhbnkgPSBjb21wdXRlZCgoKSA9PiB7XG4gICAgICAgIGNvbnN0IHRhcmdldElkID0gdGhpcy5hdXRoRGF0YS5lbXBsb3llZV9zZXNzaW9uPy5jb21wYW55SWQ7XG5cbiAgICAgICAgcmV0dXJuIHRoaXMuY29tcGFuaWVzKCkuZmluZChjb21wYW55ID0+IGNvbXBhbnkuaWQgPT09IHRhcmdldElkKSA/PyBudWxsO1xuICAgIH0pO1xuXG4gICAgcHJpdmF0ZSBpc0NoZWNrQWN0aXZpdHkgPSBmYWxzZTtcblxuICAgIHB1YmxpYyBvdmVycmlkZSBjaGVja0lzQ3VycmVudEFjdGl2aXR5KGFjdGl2aXR5SWQ6IHN0cmluZyk6IGJvb2xlYW4ge1xuICAgICAgICByZXR1cm4gKHRoaXMuaXNDaGVja0FjdGl2aXR5ID0gdGhpcy5jdXJyZW50QWN0aXZpdHkoKT8uYWN0aXZpdHlJZCA9PT0gYWN0aXZpdHlJZCk7XG4gICAgfVxuXG4gICAgcHVibGljIG92ZXJyaWRlIGNoZWNrSXNDdXJyZW50Q29tcGFueShjb21wYW55SWQ6IHN0cmluZyk6IGJvb2xlYW4ge1xuICAgICAgICByZXR1cm4gdGhpcy5jdXJyZW50Q29tcGFueSgpPy5pZCA9PT0gY29tcGFueUlkICYmICF0aGlzLmlzQ2hlY2tBY3Rpdml0eTtcbiAgICB9XG59XG4iXX0=
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { InjectionToken } from '@angular/core';
|
|
2
2
|
export const CUI_ACTIVITY_SERVICE_TOKEN = new InjectionToken('ACTIVITY_SERVICE_TOKEN');
|
|
3
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXNlci1hY3Rpb24tY29udGV4dC5vcHRpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9jb3JlL3dpZGdldHMvdXNlci1hY3Rpb24tY29udGV4dC1tZW51L3VzZXItYWN0aW9uLWNvbnRleHQub3B0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxjQUFjLEVBQVUsTUFBTSxlQUFlLENBQUM7QUFJdkQsTUFBTSxDQUFDLE1BQU0sMEJBQTBCLEdBQUcsSUFBSSxjQUFjLENBQXFCLHdCQUF3QixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3Rpb25Ub2tlbiwgU2lnbmFsIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBDdWlVc2VyQ29tcGFueSB9IGZyb20gJ0BjdWJ5LXVpL2FwaSc7XG5pbXBvcnQge0N1aVVzZXJDb21wYW55QWN0aXZpdHl9IGZyb20gXCJAY3VieS11aS9hcGkvcGxhdGZvcm0vbW9kZWxzL3VzZXItY29tcGFueS1hcGkub3B0aW9uc1wiO1xuXG5leHBvcnQgY29uc3QgQ1VJX0FDVElWSVRZX1NFUlZJQ0VfVE9LRU4gPSBuZXcgSW5qZWN0aW9uVG9rZW48Q3VpQWN0aXZpdHlTZXJ2aWNlPignQUNUSVZJVFlfU0VSVklDRV9UT0tFTicpO1xuXG5leHBvcnQgaW50ZXJmYWNlIEN1aUFjdGl2aXR5RGF0YSB7XG4gICAgcmVhZG9ubHkgY3VycmVudEFjdGl2aXR5OiBTaWduYWw8Q3VpVXNlckNvbXBhbnlBY3Rpdml0eSB8IG51bGw+XG4gICAgcmVhZG9ubHkgY3VycmVudENvbXBhbnk6IFNpZ25hbDxDdWlVc2VyQ29tcGFueSB8IG51bGw+O1xuICAgIHJlYWRvbmx5IGNvbXBhbmllczogU2lnbmFsPEN1aVVzZXJDb21wYW55W10+O1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIEN1aUFjdGl2aXR5U2VydmljZSBleHRlbmRzIEN1aUFjdGl2aXR5RGF0YSB7XG4gICAgaW5pdEFjdGl2aXR5RGF0YSgpOiB2b2lkO1xuICAgIGNoZWNrSXNDdXJyZW50QWN0aXZpdHkoYWN0aXZpdHlJZDogc3RyaW5nKTogYm9vbGVhbjtcbiAgICBjaGVja0lzQ3VycmVudENvbXBhbnkoY29tcGFueUlkOiBzdHJpbmcpOiBib29sZWFuO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIExpbmtDb25maWcge1xuICAgIHVzZXJMaW5rOiBzdHJpbmc7XG4gICAgYWRtaW5MaW5rOiBzdHJpbmc7XG59XG4iXX0=
|
|
@@ -10137,6 +10137,8 @@ class CuiActivityBaseService {
|
|
|
10137
10137
|
this.userCompanyApiService = inject(UserCompanyApiService);
|
|
10138
10138
|
this.companiesSignal = signal([]);
|
|
10139
10139
|
this.companies = this.companiesSignal.asReadonly();
|
|
10140
|
+
this.currentActivity = computed(() => null);
|
|
10141
|
+
this.currentCompany = computed(() => null);
|
|
10140
10142
|
}
|
|
10141
10143
|
initActivityData() {
|
|
10142
10144
|
this.userCompanyApiService
|
|
@@ -10165,8 +10167,14 @@ class CuiActivityImplService extends CuiActivityBaseService {
|
|
|
10165
10167
|
super(...arguments);
|
|
10166
10168
|
this.cuiAuthService = inject(CuiAuthService);
|
|
10167
10169
|
this.authData = this.cuiAuthService.getAccessTokenData();
|
|
10168
|
-
this.currentActivity = computed(() =>
|
|
10169
|
-
|
|
10170
|
+
this.currentActivity = computed(() => {
|
|
10171
|
+
const targetId = this.authData.employee_session?.activityId;
|
|
10172
|
+
return this.currentCompany()?.contexts.find(activity => activity.activityId === targetId) ?? null;
|
|
10173
|
+
});
|
|
10174
|
+
this.currentCompany = computed(() => {
|
|
10175
|
+
const targetId = this.authData.employee_session?.companyId;
|
|
10176
|
+
return this.companies().find(company => company.id === targetId) ?? null;
|
|
10177
|
+
});
|
|
10170
10178
|
this.isCheckActivity = false;
|
|
10171
10179
|
}
|
|
10172
10180
|
checkIsCurrentActivity(activityId) {
|