@magmamath/students-features 1.3.25-rc.5 → 1.3.25-rc.7
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/dist/commonjs/features/pmProgress/model/PmProgressModel.js +2 -18
- package/dist/commonjs/features/pmProgress/model/PmProgressModel.js.map +1 -1
- package/dist/commonjs/features/pmProgress/model/PmTreeModel.js.map +1 -1
- package/dist/module/features/pmProgress/model/PmProgressModel.js +3 -19
- package/dist/module/features/pmProgress/model/PmProgressModel.js.map +1 -1
- package/dist/module/features/pmProgress/model/PmTreeModel.js.map +1 -1
- package/dist/typescript/commonjs/features/pmProgress/model/PmProgressModel.d.ts +0 -1
- package/dist/typescript/commonjs/features/pmProgress/model/PmProgressModel.d.ts.map +1 -1
- package/dist/typescript/commonjs/features/pmProgress/model/PmTreeModel.d.ts +2 -2
- package/dist/typescript/commonjs/features/pmProgress/model/PmTreeModel.d.ts.map +1 -1
- package/dist/typescript/module/features/pmProgress/model/PmProgressModel.d.ts +0 -1
- package/dist/typescript/module/features/pmProgress/model/PmProgressModel.d.ts.map +1 -1
- package/dist/typescript/module/features/pmProgress/model/PmTreeModel.d.ts +2 -2
- package/dist/typescript/module/features/pmProgress/model/PmTreeModel.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/features/pmProgress/model/PmProgressModel.ts +4 -11
- package/src/features/pmProgress/model/PmTreeModel.ts +2 -1
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.PmProgressModel = void 0;
|
|
7
7
|
var _effector = require("effector");
|
|
8
8
|
var _effectorReact = require("effector-react");
|
|
9
|
+
var _not = require("patronum/not");
|
|
9
10
|
var _PmProgressApi = require("./PmProgressApi.js");
|
|
10
11
|
var _PmTreeModel = require("./PmTreeModel.js");
|
|
11
12
|
var _PmInsightsModel = require("./PmInsightsModel.js");
|
|
@@ -14,7 +15,6 @@ var _PmSolvingFlowModel = require("./PmSolvingFlowModel.js");
|
|
|
14
15
|
var _PmHighlightModel = require("./PmHighlightModel.js");
|
|
15
16
|
class PmProgressModel {
|
|
16
17
|
gate = (0, _effectorReact.createGate)();
|
|
17
|
-
refetchFx = (0, _effector.createEvent)();
|
|
18
18
|
constructor({
|
|
19
19
|
api
|
|
20
20
|
}) {
|
|
@@ -29,23 +29,7 @@ class PmProgressModel {
|
|
|
29
29
|
init() {
|
|
30
30
|
(0, _effector.sample)({
|
|
31
31
|
clock: this.gate.open,
|
|
32
|
-
|
|
33
|
-
});
|
|
34
|
-
(0, _effector.sample)({
|
|
35
|
-
clock: this.refetchFx,
|
|
36
|
-
source: {
|
|
37
|
-
isInitialized: this.tree.$isInitialized,
|
|
38
|
-
user: this.tree.$user
|
|
39
|
-
},
|
|
40
|
-
filter: ({
|
|
41
|
-
user,
|
|
42
|
-
isInitialized
|
|
43
|
-
}) => !!user && isInitialized,
|
|
44
|
-
fn: ({
|
|
45
|
-
user
|
|
46
|
-
}) => ({
|
|
47
|
-
user: user
|
|
48
|
-
}),
|
|
32
|
+
filter: (0, _not.not)(this.tree.initTreeFx.pending),
|
|
49
33
|
target: [this.tree.initTreeFx, this.api.getUserInsightsFx]
|
|
50
34
|
});
|
|
51
35
|
(0, _effector.sample)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_effector","require","_effectorReact","_PmProgressApi","_PmTreeModel","_PmInsightsModel","_PmRecommendationsModel","_PmSolvingFlowModel","_PmHighlightModel","PmProgressModel","gate","createGate","
|
|
1
|
+
{"version":3,"names":["_effector","require","_effectorReact","_not","_PmProgressApi","_PmTreeModel","_PmInsightsModel","_PmRecommendationsModel","_PmSolvingFlowModel","_PmHighlightModel","PmProgressModel","gate","createGate","constructor","api","PmProgressApi","highlight","PmHighlightModel","insights","PmInsightsModel","tree","PmTreeModel","recommendations","PmRecommendationsModel","solving","PmSolvingFlowModel","init","sample","clock","open","filter","not","initTreeFx","pending","target","getUserInsightsFx","done","fn","result","initRecommendationsFx","exports"],"sourceRoot":"../../../../../src","sources":["features/pmProgress/model/PmProgressModel.ts"],"mappings":";;;;;;AAAA,IAAAA,SAAA,GAAAC,OAAA;AACA,IAAAC,cAAA,GAAAD,OAAA;AACA,IAAAE,IAAA,GAAAF,OAAA;AAEA,IAAAG,cAAA,GAAAH,OAAA;AACA,IAAAI,YAAA,GAAAJ,OAAA;AACA,IAAAK,gBAAA,GAAAL,OAAA;AACA,IAAAM,uBAAA,GAAAN,OAAA;AACA,IAAAO,mBAAA,GAAAP,OAAA;AACA,IAAAQ,iBAAA,GAAAR,OAAA;AAMO,MAAMS,eAAe,CAAC;EACXC,IAAI,GAAG,IAAAC,yBAAU,EAAsB,CAAC;EASxDC,WAAWA,CAAC;IAAEC;EAA0B,CAAC,EAAE;IACzC,IAAI,CAACA,GAAG,GAAG,IAAIC,4BAAa,CAACD,GAAG,CAAC;IACjC,IAAI,CAACE,SAAS,GAAG,IAAIC,kCAAgB,CAAC,CAAC;IACvC,IAAI,CAACC,QAAQ,GAAG,IAAIC,gCAAe,CAAC,IAAI,CAACL,GAAG,CAAC;IAC7C,IAAI,CAACM,IAAI,GAAG,IAAIC,wBAAW,CAAC,IAAI,CAACP,GAAG,CAAC;IACrC,IAAI,CAACQ,eAAe,GAAG,IAAIC,8CAAsB,CAAC,IAAI,CAACT,GAAG,CAAC;IAC3D,IAAI,CAACU,OAAO,GAAG,IAAIC,sCAAkB,CAAC,IAAI,CAACL,IAAI,EAAE,IAAI,CAACE,eAAe,CAAC;IAEtE,IAAI,CAACI,IAAI,CAAC,CAAC;EACb;EAEQA,IAAIA,CAAA,EAAG;IACb,IAAAC,gBAAM,EAAC;MACLC,KAAK,EAAE,IAAI,CAACjB,IAAI,CAACkB,IAAI;MACrBC,MAAM,EAAE,IAAAC,QAAG,EAAC,IAAI,CAACX,IAAI,CAACY,UAAU,CAACC,OAAO,CAAC;MACzCC,MAAM,EAAE,CAAC,IAAI,CAACd,IAAI,CAACY,UAAU,EAAE,IAAI,CAAClB,GAAG,CAACqB,iBAAiB;IAC3D,CAAC,CAAC;IAEF,IAAAR,gBAAM,EAAC;MACLC,KAAK,EAAE,IAAI,CAACR,IAAI,CAACY,UAAU,CAACI,IAAI;MAChCC,EAAE,EAAEA,CAAC;QAAEC,MAAM,EAAE,CAAClB,IAAI;MAAE,CAAC,KAAKA,IAAI;MAChCc,MAAM,EAAE,IAAI,CAACZ,eAAe,CAACiB;IAC/B,CAAC,CAAC;EACJ;AACF;AAACC,OAAA,CAAA9B,eAAA,GAAAA,eAAA","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_effector","require","_effectorAction","_skillsUtils","_pmProgressHelpers","_TreeNormalizer","_session","_pmProgressConstants","_commonConstants","PmTreeModel","reset","createEvent","$tree","createStore","$stats","$user","setupInitialGrade","setGrade","$isInitialized","$grade","restore","$domains","$domainsInGrade","combine","domains","grade","$grades","$status","constructor","api","isWeb","persist","key","SessionStorageKeys","GRADE","store","DOMAINS","setupFailedAndLockedStatus","setupTreeInit","setupGradeInit","setupDomainsInTree","initTreeFx","createEffect","user","setting","practiceModeTreeId","Error","tree","stats","Promise","all","getTreeFx","getStatisticsFx","entityIds","_id","TreeNormalizer","normalize","getTreeContextFx","attach","source","mapParams","_","isTreeDataReady","effect","treeWithStats","enhanceProgressMatrixData","Object","values","treeMapping","entityId","name","fullName","sample","clock","fail","fn","PmProgressStatus","ERROR","target","filter","grades","length","every","g","isLocked","LOCKED","createAction","done","params","result","getTreeGrades","userLockedGrades","practiceModeLockedGrades","isPersistedGradeValid","includes","treeGrades","node","type","map","attributes","getInitialPmGrade","userGrade","lockedGrades","enrolledGrades","doneData","isTreeDataWithoutGradeReady","treeNodes","fromEntries","value","getDomainStructure","exports"],"sourceRoot":"../../../../../src","sources":["features/pmProgress/model/PmTreeModel.ts"],"mappings":";;;;;;AAAA,IAAAA,SAAA,GAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AAaA,IAAAE,YAAA,GAAAF,OAAA;AACA,IAAAG,kBAAA,GAAAH,OAAA;AAOA,IAAAI,eAAA,GAAAJ,OAAA;AACA,IAAAK,QAAA,GAAAL,OAAA;AACA,IAAAM,oBAAA,GAAAN,OAAA;AACA,IAAAO,gBAAA,GAAAP,OAAA;AAEO,MAAMQ,WAAW,CAAC;EACPC,KAAK,GAAG,IAAAC,qBAAW,EAAC,CAAC;EAEpBC,KAAK,GAAG,IAAAC,qBAAW,EAA6B,IAAI,CAAC,CAACH,KAAK,CAAC,IAAI,CAACA,KAAK,CAAC;EACvEI,MAAM,GAAG,IAAAD,qBAAW,EAAuB,IAAI,CAAC,CAACH,KAAK,CAAC,IAAI,CAACA,KAAK,CAAC;
|
|
1
|
+
{"version":3,"names":["_effector","require","_effectorAction","_skillsUtils","_pmProgressHelpers","_TreeNormalizer","_session","_pmProgressConstants","_commonConstants","PmTreeModel","reset","createEvent","$tree","createStore","$stats","$user","setupInitialGrade","setGrade","$isInitialized","$grade","restore","$domains","$domainsInGrade","combine","domains","grade","$grades","$status","constructor","api","isWeb","persist","key","SessionStorageKeys","GRADE","store","DOMAINS","setupFailedAndLockedStatus","setupTreeInit","setupGradeInit","setupDomainsInTree","initTreeFx","createEffect","user","setting","practiceModeTreeId","Error","tree","stats","Promise","all","getTreeFx","getStatisticsFx","entityIds","_id","TreeNormalizer","normalize","getTreeContextFx","attach","source","mapParams","_","isTreeDataReady","effect","treeWithStats","enhanceProgressMatrixData","Object","values","treeMapping","entityId","name","fullName","sample","clock","fail","fn","PmProgressStatus","ERROR","target","filter","grades","length","every","g","isLocked","LOCKED","createAction","done","params","result","getTreeGrades","userLockedGrades","practiceModeLockedGrades","isPersistedGradeValid","includes","treeGrades","node","type","map","attributes","getInitialPmGrade","userGrade","lockedGrades","enrolledGrades","doneData","isTreeDataWithoutGradeReady","treeNodes","fromEntries","value","getDomainStructure","exports"],"sourceRoot":"../../../../../src","sources":["features/pmProgress/model/PmTreeModel.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import {
|
|
3
|
+
import { sample } from 'effector';
|
|
4
4
|
import { createGate } from 'effector-react';
|
|
5
|
+
import { not } from 'patronum/not';
|
|
5
6
|
import { PmProgressApi } from "./PmProgressApi.js";
|
|
6
7
|
import { PmTreeModel } from "./PmTreeModel.js";
|
|
7
8
|
import { PmInsightsModel } from "./PmInsightsModel.js";
|
|
@@ -10,7 +11,6 @@ import { PmSolvingFlowModel } from "./PmSolvingFlowModel.js";
|
|
|
10
11
|
import { PmHighlightModel } from "./PmHighlightModel.js";
|
|
11
12
|
export class PmProgressModel {
|
|
12
13
|
gate = createGate();
|
|
13
|
-
refetchFx = createEvent();
|
|
14
14
|
constructor({
|
|
15
15
|
api
|
|
16
16
|
}) {
|
|
@@ -25,23 +25,7 @@ export class PmProgressModel {
|
|
|
25
25
|
init() {
|
|
26
26
|
sample({
|
|
27
27
|
clock: this.gate.open,
|
|
28
|
-
|
|
29
|
-
});
|
|
30
|
-
sample({
|
|
31
|
-
clock: this.refetchFx,
|
|
32
|
-
source: {
|
|
33
|
-
isInitialized: this.tree.$isInitialized,
|
|
34
|
-
user: this.tree.$user
|
|
35
|
-
},
|
|
36
|
-
filter: ({
|
|
37
|
-
user,
|
|
38
|
-
isInitialized
|
|
39
|
-
}) => !!user && isInitialized,
|
|
40
|
-
fn: ({
|
|
41
|
-
user
|
|
42
|
-
}) => ({
|
|
43
|
-
user: user
|
|
44
|
-
}),
|
|
28
|
+
filter: not(this.tree.initTreeFx.pending),
|
|
45
29
|
target: [this.tree.initTreeFx, this.api.getUserInsightsFx]
|
|
46
30
|
});
|
|
47
31
|
sample({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["
|
|
1
|
+
{"version":3,"names":["sample","createGate","not","PmProgressApi","PmTreeModel","PmInsightsModel","PmRecommendationsModel","PmSolvingFlowModel","PmHighlightModel","PmProgressModel","gate","constructor","api","highlight","insights","tree","recommendations","solving","init","clock","open","filter","initTreeFx","pending","target","getUserInsightsFx","done","fn","result","initRecommendationsFx"],"sourceRoot":"../../../../../src","sources":["features/pmProgress/model/PmProgressModel.ts"],"mappings":";;AAAA,SAASA,MAAM,QAAQ,UAAU;AACjC,SAASC,UAAU,QAAQ,gBAAgB;AAC3C,SAASC,GAAG,QAAQ,cAAc;AAElC,SAASC,aAAa,QAAiC,oBAAiB;AACxE,SAASC,WAAW,QAAQ,kBAAe;AAC3C,SAASC,eAAe,QAAQ,sBAAmB;AACnD,SAASC,sBAAsB,QAAQ,6BAA0B;AACjE,SAASC,kBAAkB,QAAQ,yBAAsB;AACzD,SAASC,gBAAgB,QAAQ,uBAAoB;AAMrD,OAAO,MAAMC,eAAe,CAAC;EACXC,IAAI,GAAGT,UAAU,CAAsB,CAAC;EASxDU,WAAWA,CAAC;IAAEC;EAA0B,CAAC,EAAE;IACzC,IAAI,CAACA,GAAG,GAAG,IAAIT,aAAa,CAACS,GAAG,CAAC;IACjC,IAAI,CAACC,SAAS,GAAG,IAAIL,gBAAgB,CAAC,CAAC;IACvC,IAAI,CAACM,QAAQ,GAAG,IAAIT,eAAe,CAAC,IAAI,CAACO,GAAG,CAAC;IAC7C,IAAI,CAACG,IAAI,GAAG,IAAIX,WAAW,CAAC,IAAI,CAACQ,GAAG,CAAC;IACrC,IAAI,CAACI,eAAe,GAAG,IAAIV,sBAAsB,CAAC,IAAI,CAACM,GAAG,CAAC;IAC3D,IAAI,CAACK,OAAO,GAAG,IAAIV,kBAAkB,CAAC,IAAI,CAACQ,IAAI,EAAE,IAAI,CAACC,eAAe,CAAC;IAEtE,IAAI,CAACE,IAAI,CAAC,CAAC;EACb;EAEQA,IAAIA,CAAA,EAAG;IACblB,MAAM,CAAC;MACLmB,KAAK,EAAE,IAAI,CAACT,IAAI,CAACU,IAAI;MACrBC,MAAM,EAAEnB,GAAG,CAAC,IAAI,CAACa,IAAI,CAACO,UAAU,CAACC,OAAO,CAAC;MACzCC,MAAM,EAAE,CAAC,IAAI,CAACT,IAAI,CAACO,UAAU,EAAE,IAAI,CAACV,GAAG,CAACa,iBAAiB;IAC3D,CAAC,CAAC;IAEFzB,MAAM,CAAC;MACLmB,KAAK,EAAE,IAAI,CAACJ,IAAI,CAACO,UAAU,CAACI,IAAI;MAChCC,EAAE,EAAEA,CAAC;QAAEC,MAAM,EAAE,CAACb,IAAI;MAAE,CAAC,KAAKA,IAAI;MAChCS,MAAM,EAAE,IAAI,CAACR,eAAe,CAACa;IAC/B,CAAC,CAAC;EACJ;AACF","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["attach","combine","createEffect","createEvent","createStore","restore","sample","createAction","enhanceProgressMatrixData","getDomainStructure","getInitialPmGrade","getTreeGrades","isTreeDataReady","isTreeDataWithoutGradeReady","TreeNormalizer","persist","PmProgressStatus","SessionStorageKeys","isWeb","PmTreeModel","reset","$tree","$stats","$user","setupInitialGrade","setGrade","$isInitialized","$grade","$domains","$domainsInGrade","domains","grade","$grades","$status","constructor","api","key","GRADE","store","DOMAINS","setupFailedAndLockedStatus","setupTreeInit","setupGradeInit","setupDomainsInTree","initTreeFx","user","setting","practiceModeTreeId","Error","tree","stats","Promise","all","getTreeFx","getStatisticsFx","entityIds","_id","normalize","getTreeContextFx","source","mapParams","_","effect","treeWithStats","Object","values","treeMapping","entityId","name","fullName","clock","fail","fn","ERROR","target","filter","grades","length","every","g","isLocked","LOCKED","done","params","result","userLockedGrades","practiceModeLockedGrades","isPersistedGradeValid","includes","treeGrades","node","type","map","attributes","userGrade","lockedGrades","enrolledGrades","doneData","treeNodes","fromEntries","value"],"sourceRoot":"../../../../../src","sources":["features/pmProgress/model/PmTreeModel.ts"],"mappings":";;AAAA,SAASA,MAAM,EAAEC,OAAO,EAAEC,YAAY,EAAEC,WAAW,EAAEC,WAAW,EAAEC,OAAO,EAAEC,MAAM,QAAQ,UAAU;AACnG,SAASC,YAAY,QAAQ,iBAAiB;AAa9C,SAASC,yBAAyB,QAAQ,0BAA0B;AACpE,SACEC,kBAAkB,EAClBC,iBAAiB,EACjBC,aAAa,EACbC,eAAe,EACfC,2BAA2B,QACtB,iCAA8B;AACrC,SAASC,cAAc,QAAQ,6BAA0B;AACzD,SAASC,OAAO,QAAQ,0BAA0B;AAClD,SAASC,gBAAgB,EAAEC,kBAAkB,QAAQ,mCAAgC;AACrF,SAASC,KAAK,QAAQ,qCAAkC;AAExD,OAAO,MAAMC,WAAW,CAAC;EACPC,KAAK,GAAGjB,WAAW,CAAC,CAAC;EAEpBkB,KAAK,GAAGjB,WAAW,CAA6B,IAAI,CAAC,CAACgB,KAAK,CAAC,IAAI,CAACA,KAAK,CAAC;EACvEE,MAAM,GAAGlB,WAAW,CAAuB,IAAI,CAAC,CAACgB,KAAK,CAAC,IAAI,CAACA,KAAK,CAAC;
|
|
1
|
+
{"version":3,"names":["attach","combine","createEffect","createEvent","createStore","restore","sample","createAction","enhanceProgressMatrixData","getDomainStructure","getInitialPmGrade","getTreeGrades","isTreeDataReady","isTreeDataWithoutGradeReady","TreeNormalizer","persist","PmProgressStatus","SessionStorageKeys","isWeb","PmTreeModel","reset","$tree","$stats","$user","setupInitialGrade","setGrade","$isInitialized","$grade","$domains","$domainsInGrade","domains","grade","$grades","$status","constructor","api","key","GRADE","store","DOMAINS","setupFailedAndLockedStatus","setupTreeInit","setupGradeInit","setupDomainsInTree","initTreeFx","user","setting","practiceModeTreeId","Error","tree","stats","Promise","all","getTreeFx","getStatisticsFx","entityIds","_id","normalize","getTreeContextFx","source","mapParams","_","effect","treeWithStats","Object","values","treeMapping","entityId","name","fullName","clock","fail","fn","ERROR","target","filter","grades","length","every","g","isLocked","LOCKED","done","params","result","userLockedGrades","practiceModeLockedGrades","isPersistedGradeValid","includes","treeGrades","node","type","map","attributes","userGrade","lockedGrades","enrolledGrades","doneData","treeNodes","fromEntries","value"],"sourceRoot":"../../../../../src","sources":["features/pmProgress/model/PmTreeModel.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -10,7 +10,6 @@ type PmProgressModelProps = {
|
|
|
10
10
|
};
|
|
11
11
|
export declare class PmProgressModel {
|
|
12
12
|
readonly gate: import("effector-react").Gate<PmProgressGateProps>;
|
|
13
|
-
readonly refetchFx: import("effector").EventCallable<void>;
|
|
14
13
|
readonly api: PmProgressApi;
|
|
15
14
|
readonly tree: PmTreeModel;
|
|
16
15
|
readonly highlight: PmHighlightModel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PmProgressModel.d.ts","sourceRoot":"","sources":["../../../../../../src/features/pmProgress/model/PmProgressModel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"PmProgressModel.d.ts","sourceRoot":"","sources":["../../../../../../src/features/pmProgress/model/PmProgressModel.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,EAAE,aAAa,EAAE,KAAK,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAErD,KAAK,oBAAoB,GAAG;IAC1B,GAAG,EAAE,kBAAkB,CAAA;CACxB,CAAA;AAED,qBAAa,eAAe;IAC1B,SAAgB,IAAI,qDAAoC;IAExD,SAAgB,GAAG,EAAE,aAAa,CAAA;IAClC,SAAgB,IAAI,EAAE,WAAW,CAAA;IACjC,SAAgB,SAAS,EAAE,gBAAgB,CAAA;IAC3C,SAAgB,QAAQ,EAAE,eAAe,CAAA;IACzC,SAAgB,eAAe,EAAE,sBAAsB,CAAA;IACvD,SAAgB,OAAO,EAAE,kBAAkB,CAAA;gBAE/B,EAAE,GAAG,EAAE,EAAE,oBAAoB;IAWzC,OAAO,CAAC,IAAI;CAab"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Domain, Grade, PmProgressGateProps, StatsResponse, TreeContext, TreeMappingResponse
|
|
1
|
+
import { Domain, Grade, PmProgressGateProps, StatsResponse, TreeContext, TreeMappingResponse } from '../shared/pmProgress.types';
|
|
2
2
|
import { PmProgressApi } from './PmProgressApi';
|
|
3
3
|
import { PmProgressStatus } from '../shared/pmProgress.constants';
|
|
4
4
|
export declare class PmTreeModel {
|
|
@@ -6,7 +6,7 @@ export declare class PmTreeModel {
|
|
|
6
6
|
readonly reset: import("effector").EventCallable<void>;
|
|
7
7
|
private readonly $tree;
|
|
8
8
|
private readonly $stats;
|
|
9
|
-
readonly $user
|
|
9
|
+
private readonly $user;
|
|
10
10
|
private readonly setupInitialGrade;
|
|
11
11
|
readonly setGrade: import("effector").EventCallable<number | null>;
|
|
12
12
|
readonly $isInitialized: import("effector").StoreWritable<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PmTreeModel.d.ts","sourceRoot":"","sources":["../../../../../../src/features/pmProgress/model/PmTreeModel.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,MAAM,EACN,KAAK,EACL,mBAAmB,EAEnB,aAAa,EAEb,WAAW,EACX,mBAAmB,
|
|
1
|
+
{"version":3,"file":"PmTreeModel.d.ts","sourceRoot":"","sources":["../../../../../../src/features/pmProgress/model/PmTreeModel.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,MAAM,EACN,KAAK,EACL,mBAAmB,EAEnB,aAAa,EAEb,WAAW,EACX,mBAAmB,EAEpB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAW/C,OAAO,EAAE,gBAAgB,EAAsB,MAAM,gCAAgC,CAAA;AAGrF,qBAAa,WAAW;IAmBV,OAAO,CAAC,QAAQ,CAAC,GAAG;IAlBhC,SAAgB,KAAK,yCAAgB;IAErC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAkE;IACxF,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4D;IACnF,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAmD;IAEzE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAwC;IAC1E,SAAgB,QAAQ,kDAA+B;IAEvD,SAAgB,cAAc,4CAAuC;IACrE,SAAgB,MAAM,kDAAiD;IACvE,SAAgB,QAAQ,6DAA8D;IACtF,SAAgB,eAAe,qCAE9B;IACD,SAAgB,OAAO,4CAA6C;IACpE,SAAgB,OAAO,4DAA+D;gBAEzD,GAAG,EAAE,aAAa;IAY/C,SAAgB,UAAU,uGAWxB;IAEF,SAAgB,gBAAgB,sDAwB9B;IAEF,OAAO,CAAC,0BAA0B;IAelC,OAAO,CAAC,aAAa;IAqBrB,OAAO,CAAC,cAAc;IAyBtB,OAAO,CAAC,kBAAkB;CAwB3B"}
|
|
@@ -10,7 +10,6 @@ type PmProgressModelProps = {
|
|
|
10
10
|
};
|
|
11
11
|
export declare class PmProgressModel {
|
|
12
12
|
readonly gate: import("effector-react").Gate<PmProgressGateProps>;
|
|
13
|
-
readonly refetchFx: import("effector").EventCallable<void>;
|
|
14
13
|
readonly api: PmProgressApi;
|
|
15
14
|
readonly tree: PmTreeModel;
|
|
16
15
|
readonly highlight: PmHighlightModel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PmProgressModel.d.ts","sourceRoot":"","sources":["../../../../../../src/features/pmProgress/model/PmProgressModel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"PmProgressModel.d.ts","sourceRoot":"","sources":["../../../../../../src/features/pmProgress/model/PmProgressModel.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,EAAE,aAAa,EAAE,KAAK,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAErD,KAAK,oBAAoB,GAAG;IAC1B,GAAG,EAAE,kBAAkB,CAAA;CACxB,CAAA;AAED,qBAAa,eAAe;IAC1B,SAAgB,IAAI,qDAAoC;IAExD,SAAgB,GAAG,EAAE,aAAa,CAAA;IAClC,SAAgB,IAAI,EAAE,WAAW,CAAA;IACjC,SAAgB,SAAS,EAAE,gBAAgB,CAAA;IAC3C,SAAgB,QAAQ,EAAE,eAAe,CAAA;IACzC,SAAgB,eAAe,EAAE,sBAAsB,CAAA;IACvD,SAAgB,OAAO,EAAE,kBAAkB,CAAA;gBAE/B,EAAE,GAAG,EAAE,EAAE,oBAAoB;IAWzC,OAAO,CAAC,IAAI;CAab"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Domain, Grade, PmProgressGateProps, StatsResponse, TreeContext, TreeMappingResponse
|
|
1
|
+
import { Domain, Grade, PmProgressGateProps, StatsResponse, TreeContext, TreeMappingResponse } from '../shared/pmProgress.types';
|
|
2
2
|
import { PmProgressApi } from './PmProgressApi';
|
|
3
3
|
import { PmProgressStatus } from '../shared/pmProgress.constants';
|
|
4
4
|
export declare class PmTreeModel {
|
|
@@ -6,7 +6,7 @@ export declare class PmTreeModel {
|
|
|
6
6
|
readonly reset: import("effector").EventCallable<void>;
|
|
7
7
|
private readonly $tree;
|
|
8
8
|
private readonly $stats;
|
|
9
|
-
readonly $user
|
|
9
|
+
private readonly $user;
|
|
10
10
|
private readonly setupInitialGrade;
|
|
11
11
|
readonly setGrade: import("effector").EventCallable<number | null>;
|
|
12
12
|
readonly $isInitialized: import("effector").StoreWritable<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PmTreeModel.d.ts","sourceRoot":"","sources":["../../../../../../src/features/pmProgress/model/PmTreeModel.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,MAAM,EACN,KAAK,EACL,mBAAmB,EAEnB,aAAa,EAEb,WAAW,EACX,mBAAmB,
|
|
1
|
+
{"version":3,"file":"PmTreeModel.d.ts","sourceRoot":"","sources":["../../../../../../src/features/pmProgress/model/PmTreeModel.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,MAAM,EACN,KAAK,EACL,mBAAmB,EAEnB,aAAa,EAEb,WAAW,EACX,mBAAmB,EAEpB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAW/C,OAAO,EAAE,gBAAgB,EAAsB,MAAM,gCAAgC,CAAA;AAGrF,qBAAa,WAAW;IAmBV,OAAO,CAAC,QAAQ,CAAC,GAAG;IAlBhC,SAAgB,KAAK,yCAAgB;IAErC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAkE;IACxF,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4D;IACnF,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAmD;IAEzE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAwC;IAC1E,SAAgB,QAAQ,kDAA+B;IAEvD,SAAgB,cAAc,4CAAuC;IACrE,SAAgB,MAAM,kDAAiD;IACvE,SAAgB,QAAQ,6DAA8D;IACtF,SAAgB,eAAe,qCAE9B;IACD,SAAgB,OAAO,4CAA6C;IACpE,SAAgB,OAAO,4DAA+D;gBAEzD,GAAG,EAAE,aAAa;IAY/C,SAAgB,UAAU,uGAWxB;IAEF,SAAgB,gBAAgB,sDAwB9B;IAEF,OAAO,CAAC,0BAA0B;IAelC,OAAO,CAAC,aAAa;IAqBrB,OAAO,CAAC,cAAc;IAyBtB,OAAO,CAAC,kBAAkB;CAwB3B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { sample } from 'effector'
|
|
2
2
|
import { createGate } from 'effector-react'
|
|
3
|
-
import {
|
|
3
|
+
import { not } from 'patronum/not'
|
|
4
|
+
import { PmProgressGateProps } from '../shared/pmProgress.types'
|
|
4
5
|
import { PmProgressApi, type PmProgressApiProps } from './PmProgressApi'
|
|
5
6
|
import { PmTreeModel } from './PmTreeModel'
|
|
6
7
|
import { PmInsightsModel } from './PmInsightsModel'
|
|
@@ -14,7 +15,6 @@ type PmProgressModelProps = {
|
|
|
14
15
|
|
|
15
16
|
export class PmProgressModel {
|
|
16
17
|
public readonly gate = createGate<PmProgressGateProps>()
|
|
17
|
-
public readonly refetchFx = createEvent()
|
|
18
18
|
|
|
19
19
|
public readonly api: PmProgressApi
|
|
20
20
|
public readonly tree: PmTreeModel
|
|
@@ -37,14 +37,7 @@ export class PmProgressModel {
|
|
|
37
37
|
private init() {
|
|
38
38
|
sample({
|
|
39
39
|
clock: this.gate.open,
|
|
40
|
-
|
|
41
|
-
})
|
|
42
|
-
|
|
43
|
-
sample({
|
|
44
|
-
clock: this.refetchFx,
|
|
45
|
-
source: { isInitialized: this.tree.$isInitialized, user: this.tree.$user },
|
|
46
|
-
filter: ({ user, isInitialized }) => !!user && isInitialized,
|
|
47
|
-
fn: ({ user }) => ({ user: user as User }),
|
|
40
|
+
filter: not(this.tree.initTreeFx.pending),
|
|
48
41
|
target: [this.tree.initTreeFx, this.api.getUserInsightsFx],
|
|
49
42
|
})
|
|
50
43
|
|
|
@@ -30,7 +30,7 @@ export class PmTreeModel {
|
|
|
30
30
|
|
|
31
31
|
private readonly $tree = createStore<TreeMappingResponse | null>(null).reset(this.reset)
|
|
32
32
|
private readonly $stats = createStore<StatsResponse | null>(null).reset(this.reset)
|
|
33
|
-
|
|
33
|
+
private readonly $user = createStore<User | null>(null).reset(this.reset)
|
|
34
34
|
|
|
35
35
|
private readonly setupInitialGrade = createEvent<SetupInitialGradeProps>()
|
|
36
36
|
public readonly setGrade = createEvent<number | null>()
|
|
@@ -65,6 +65,7 @@ export class PmTreeModel {
|
|
|
65
65
|
this.api.getTreeFx(user.setting.practiceModeTreeId),
|
|
66
66
|
this.api.getStatisticsFx({ entityIds: [user._id] }),
|
|
67
67
|
])
|
|
68
|
+
|
|
68
69
|
return [TreeNormalizer.normalize(tree), stats] as const
|
|
69
70
|
})
|
|
70
71
|
|