@one-paragon/angular-utilities 2.4.3 → 2.4.5-beta.1

package/fesm2022/one-paragon-angular-utilities.mjs

@@ -522,9 +522,7 @@ function getDestroyRef(obsOrSubOrInjector, actionOrInjector, injector) {
 class RequestStateStore {
     constructor(req, options, project) {
         this._state = signal({ requestParams: null, response: notStarted });
-        this.setState = (state) => this._state.set(state);
         this.state = this._state.asReadonly();
-        this.state$ = toObservable(this.state);
         this.injector = inject(Injector);
         this.destroy$ = new Subject();
         this.flatteningStrategy = () => {
@@ -537,7 +535,7 @@ class RequestStateStore {
         };
         this.createRequestPipeline = () => {
             const origin$ = new Subject();
-            const sub = origin$.pipe(this.flatteningStrategy(), tap(state => this.setState(state)), pipe(takeUntil(this.destroy$))).subscribe();
+            const sub = origin$.pipe(this.flatteningStrategy(), tap(state => this._state.set(state)), pipe(takeUntil(this.destroy$))).subscribe();
             return (params) => {
                 origin$.next(params);
                 return sub;
@@ -554,24 +552,16 @@ class RequestStateStore {
             return this.requestPipeLine(value);
         };
         this.$selectRequestState = computed(() => this.state().response);
-        this.selectRequestState$ = this.state$.pipe(map(s => s.response));
-        /**
-         * @deprecated use selectRequestState$ instead
-         */
-        this.selectHttpState$ = this.selectRequestState$;
         this.$selectStatus = computed(() => this.$selectRequestState()?.status);
-        this.selectStatus$ = this.selectRequestState$.pipe(map(s => s.status));
         this.$isSuccess = computed(() => isSuccessState(this.$selectRequestState()));
         this.$isError = computed(() => isErrorState(this.$selectRequestState()));
         this.$isInProgress = computed(() => this.$selectStatus() === RequestStatus.inProgress);
         this.$isNotStarted = computed(() => this.$selectStatus() === RequestStatus.notStarted);
-        this.selectError$ = this.selectRequestState$.pipe(filter(isErrorState), map(state => state.error));
         this.$selectError = computed(() => {
             const state = this.$selectRequestState();
             if (isErrorState(state))
                 return state.error;
         });
-        this.selectResponse$ = this.selectRequestState$.pipe(filter(isSuccessState), map(state => state.body));
         this.$selectResponse = computed(() => {
             const state = this.$selectRequestState();
             if (isSuccessState(state)) {
@@ -579,7 +569,6 @@ class RequestStateStore {
             }
             return undefined;
         });
-        this.selectSuccessOrError$ = this.state$.pipe(map(r => r.response), filter(isSuccessOrErrorState), map(() => undefined));
         this.errorHandled = false;
         this.#onDefaultErrorHandling = (e) => {
             if (this.defaultErrorHandling)
@@ -631,6 +620,16 @@ class RequestStateStore {
             }, { injector: this.injector });
             return this;
         };
+        this.state$ = toObservable(this.state);
+        this.selectRequestState$ = this.state$.pipe(map(s => s.response));
+        this.selectResponse$ = this.selectRequestState$.pipe(filter(isSuccessState), map(state => state.body));
+        this.selectSuccessOrError$ = this.state$.pipe(map(r => r.response), filter(isSuccessOrErrorState), map(() => undefined));
+        /**
+         * @deprecated use selectRequestState$ instead
+         */
+        this.selectHttpState$ = this.selectRequestState$;
+        this.selectStatus$ = this.selectRequestState$.pipe(map(s => s.status));
+        this.selectError$ = this.selectRequestState$.pipe(filter(isErrorState), map(state => state.error));
         this.assertInjectionContext();
         this.injector.get(DestroyRef).onDestroy(() => this.destroy$.next());
         this.project = project;
@@ -642,9 +641,9 @@ class RequestStateStore {
             this._useDefaultErrorHandler = config.useDefaultErrorHandler;
             this.defaultSuccessHandling = config.defaultSuccessHandling;
             if (this._useDefaultErrorHandler) {
-                this.subscriber(this.selectError$, e => {
+                this.effectOnState('error', e => {
                     if (!this.errorHandled) {
-                        this.#onDefaultErrorHandling(e);
+                        this.#onDefaultErrorHandling(e.error);
                     }
                 });
             }
@@ -659,7 +658,7 @@ class RequestStateStore {
     }
     onError(cb) {
         this.errorHandled = true;
-        this.subscriber(this.selectError$, cb);
+        this.effectOnState('error', cb);
         return this;
     }
     #onDefaultErrorHandling;
@@ -667,42 +666,55 @@ class RequestStateStore {
      * if no handler was provided will call `console.error`
      */
     useDefaultErrorHandler() {
-        this.subscriber(this.selectError$, this.#onDefaultErrorHandling);
+        this.effectOnState('error', this.#onDefaultErrorHandling);
         return this;
     }
     /**
      * if no handler was provided will call `console.log` with 'Success'
      */
     useDefaultSuccessHandler() {
-        this.subscriber(this.selectResponse$, this.defaultSuccessHandling || (() => console.log('Success')));
+        this.effectOnState('success', this.defaultSuccessHandling || (() => console.log('Success')));
         return this;
     }
     onSuccess(cb) {
-        this.subscriber(this.selectResponse$, cb);
+        this.effectOnState('success', cb);
         return this;
     }
     onSuccessOrError(cb) {
-        this.subscriber(this.selectSuccessOrError$, cb);
+        this.effectOnState('both', cb);
         return this;
     }
     onSuccessWithRequest(func) {
-        this.subscriber(this.state$, ({ requestParams, response }) => {
-            if (isSuccessState(response))
-                func({ requestParams, body: response.body });
-        });
+        this.effectOnState('success', (body, requestParams) => func({ requestParams, body }));
         return this;
     }
     onErrorWithRequest(func) {
         this.errorHandled = true;
-        this.subscriber(this.state$, ({ requestParams, response }) => {
-            if (isErrorState(response))
-                func({ requestParams, error: response.error });
-        });
+        this.effectOnState('error', (error, requestParams) => func({ requestParams, error }));
         return this;
     }
     createRequest(...params) {
         return this.req(...params).pipe(map(re => createSuccess((this.project ? this.project(re) : re))), mapError(createFailure), startWith(inProgress), map(state => ({ requestParams: params, response: state })), defaultShareReplay());
     }
+    effectOnState(onState, func) {
+        effect(() => {
+            const { requestParams, response } = this.state();
+            switch (onState) {
+                case 'error':
+                    if (isErrorState(response))
+                        untracked(() => func(response.error, requestParams));
+                    break;
+                case 'success':
+                    if (isSuccessState(response))
+                        untracked(() => func(response.body, requestParams));
+                    break;
+                case 'both':
+                    if (isSuccessOrErrorState(response))
+                        untracked(() => func());
+                    break;
+            }
+        }, { injector: this.injector });
+    }
     assertInjectionContext() {
         try {
             assertInInjectionContext(RequestStateStore);
@@ -4409,7 +4421,11 @@ function updateGroupByState(groupedData, { data, groups, expanded, sorts }, firs
     if (firstRun
         || dataUpdated(data, groups, expanded, sorts)
         || groupsUpdated(groups, expanded, sorts)) {
-        groupedData = groups.value.length ? getGroupedData(data.value, groups.value, metaData) : data.value;
+        const combinedGroupsAndSorts = groups.value.map(g => {
+            const sortForGroup = sorts.value.find(s => s.key === g.key);
+            return { ...g, sort: sortForGroup?.sort || '' };
+        });
+        groupedData = groups.value.length ? getGroupedData(data.value, combinedGroupsAndSorts, metaData) : data.value;
     }
     else {
         let curr = [...sorts.value];