@coorpacademy/app-review 0.1.8 → 0.1.9

package/es/actions/api/fetch-skills.d.ts

@@ -1,10 +1,13 @@
-import { Action } from 'redux';
-import { Skill } from '../../types/common';
+import type { ThunkAction } from 'redux-thunk';
+import { AnyAction } from 'redux';
+import type { StoreState } from '../../reducers';
+import { Options, Skill } from '../../types/common';
 export declare const SKILLS_FETCH_REQUEST: "@@skills/FETCH_REQUEST";
 export declare const SKILLS_FETCH_SUCCESS: "@@skills/FETCH_SUCCESS";
 export declare const SKILLS_FETCH_FAILURE: "@@skills/FETCH_FAILURE";
-export declare type ReceivedSkills = {
+export interface ReceivedSkills extends AnyAction {
     type: '@@skills/FETCH_SUCCESS';
     payload: Skill[];
-};
-export declare const fetchSkills: (token: string) => Action;
+}
+export declare type FetchSkillsAction = ThunkAction<Promise<void>, StoreState, Options, AnyAction>;
+export declare const fetchSkills: (token: string) => FetchSkillsAction;

package/es/actions/api/fetch-slide.d.ts

@@ -1,10 +1,13 @@
-import type { Action } from 'redux';
-import { SlideFromAPI } from '../../types/common';
+import type { AnyAction } from 'redux';
+import type { ThunkAction } from 'redux-thunk';
+import type { StoreState } from '../../reducers';
+import { Options, SlideFromAPI } from '../../types/common';
 export declare const SLIDE_FETCH_REQUEST: "@@slides/FETCH_REQUEST";
 export declare const SLIDE_FETCH_SUCCESS: "@@slides/FETCH_SUCCESS";
 export declare const SLIDE_FETCH_FAILURE: "@@slides/FETCH_FAILURE";
-export declare type ReceivedSlide = {
+export interface ReceivedSlide extends AnyAction {
     type: typeof SLIDE_FETCH_SUCCESS;
     payload: SlideFromAPI;
-};
-export declare const fetchSlide: (slideRef: string, token: string) => Action;
+}
+export declare type FetchSlideAction = ThunkAction<Promise<void>, StoreState, Options, AnyAction>;
+export declare const fetchSlide: (slideRef: string, token: string) => FetchSlideAction;

package/es/actions/api/post-progression.d.ts

@@ -1,10 +1,13 @@
-import type { Action } from 'redux';
-import { ProgressionFromAPI } from '../../types/common';
+import type { AnyAction } from 'redux';
+import type { ThunkAction } from 'redux-thunk';
+import { Options, ProgressionFromAPI } from '../../types/common';
+import type { StoreState } from '../../reducers';
 export declare const POST_PROGRESSION_REQUEST: "@@progression/POST_REQUEST";
 export declare const POST_PROGRESSION_SUCCESS: "@@progression/POST_SUCCESS";
 export declare const POST_PROGRESSION_FAILURE: "@@progression/POST_FAILURE";
-export declare type ReceiveProgression = {
+export interface ReceiveProgression extends AnyAction {
     type: typeof POST_PROGRESSION_SUCCESS;
     payload: ProgressionFromAPI;
-};
-export declare const postProgression: (skillRef: string, token: string) => Action;
+}
+export declare type PostProgressionAction = ThunkAction<Promise<ProgressionFromAPI>, StoreState, Options, AnyAction>;
+export declare const postProgression: (skillRef: string, token: string) => PostProgressionAction;

package/es/index.d.ts

@@ -4,7 +4,7 @@ declare const AppReview: ({ options }: {
 }) => JSX.Element | null;
 declare global {
     interface Window {
-        __REDUX_DEVTOOLS_EXTENSION__?: boolean;
+        __REDUX_DEVTOOLS_EXTENSION_COMPOSE__?: Function;
     }
 }
 export default AppReview;

package/es/index.js

@@ -13,7 +13,6 @@ import { updateStepItemsOnValidation, updateStepItemsOnNext } from './actions/ui
 import { fetchSkills } from './actions/api/fetch-skills';
 import { postProgression } from './actions/api/post-progression';
 import { VIEWS } from './common';
-// -----------------------------------------------------------------------------
 const mapDispatchToProps = {
     navigateTo,
     navigateBack,
@@ -26,7 +25,6 @@ const mapDispatchToProps = {
     updateFinishedSlides
 };
 const getCurrentViewName = (storeState) => storeState.ui.navigation[storeState.ui.navigation.length - 1];
-// -----------------------------------------------------------------------------
 const mapStateToSkillsProps = (state) => {
     if (!state.data.skills) {
         return null;
@@ -52,7 +50,6 @@ const mapStateToSkillsProps = (state) => {
         }))
     };
 };
-// -----------------------------------------------------------------------------
 const mapStateToSlidesProps = (state) => {
     if (!state.data.slides) {
         return null;
@@ -80,7 +77,6 @@ const mapStateToSlidesProps = (state) => {
         progression: state.data.progression
     };
 };
-// -----------------------------------------------------------------------------
 const mapStateToProps = (state) => {
     return {
         viewName: getCurrentViewName(state),
@@ -88,9 +84,7 @@ const mapStateToProps = (state) => {
         skills: mapStateToSkillsProps(state)
     };
 };
-// Props = StaticProps && Dispatchers
 const App = connect(mapStateToProps, mapDispatchToProps)(AppReviewTemplate);
-// -----------------------------------------------------------------------------
 const AppReview = ({ options }) => {
     const [store, setStore] = useState(null);
     useEffect(() => {
@@ -116,6 +110,8 @@ const AppReview = ({ options }) => {
         if (store === null)
             return;
         const { skillRef, token } = options;
+        // ThunkAction is not assignable to parameter of type 'AnyAction'
+        // ts problem describre here = https://github.com/reduxjs/redux-thunk/issues/333
         skillRef
             ? store.dispatch(postProgression(skillRef, token))
             : store.dispatch(fetchSkills(token));
@@ -127,5 +123,4 @@ const AppReview = ({ options }) => {
         React.createElement(TemplateContext, { values: values },
             React.createElement(App, null))));
 };
-// -----------------------------------------------------------------------------
 export default AppReview;

package/lib/actions/api/fetch-skills.d.ts

@@ -1,10 +1,13 @@
-import { Action } from 'redux';
-import { Skill } from '../../types/common';
+import type { ThunkAction } from 'redux-thunk';
+import { AnyAction } from 'redux';
+import type { StoreState } from '../../reducers';
+import { Options, Skill } from '../../types/common';
 export declare const SKILLS_FETCH_REQUEST: "@@skills/FETCH_REQUEST";
 export declare const SKILLS_FETCH_SUCCESS: "@@skills/FETCH_SUCCESS";
 export declare const SKILLS_FETCH_FAILURE: "@@skills/FETCH_FAILURE";
-export declare type ReceivedSkills = {
+export interface ReceivedSkills extends AnyAction {
     type: '@@skills/FETCH_SUCCESS';
     payload: Skill[];
-};
-export declare const fetchSkills: (token: string) => Action;
+}
+export declare type FetchSkillsAction = ThunkAction<Promise<void>, StoreState, Options, AnyAction>;
+export declare const fetchSkills: (token: string) => FetchSkillsAction;

package/lib/actions/api/fetch-slide.d.ts

@@ -1,10 +1,13 @@
-import type { Action } from 'redux';
-import { SlideFromAPI } from '../../types/common';
+import type { AnyAction } from 'redux';
+import type { ThunkAction } from 'redux-thunk';
+import type { StoreState } from '../../reducers';
+import { Options, SlideFromAPI } from '../../types/common';
 export declare const SLIDE_FETCH_REQUEST: "@@slides/FETCH_REQUEST";
 export declare const SLIDE_FETCH_SUCCESS: "@@slides/FETCH_SUCCESS";
 export declare const SLIDE_FETCH_FAILURE: "@@slides/FETCH_FAILURE";
-export declare type ReceivedSlide = {
+export interface ReceivedSlide extends AnyAction {
     type: typeof SLIDE_FETCH_SUCCESS;
     payload: SlideFromAPI;
-};
-export declare const fetchSlide: (slideRef: string, token: string) => Action;
+}
+export declare type FetchSlideAction = ThunkAction<Promise<void>, StoreState, Options, AnyAction>;
+export declare const fetchSlide: (slideRef: string, token: string) => FetchSlideAction;

package/lib/actions/api/post-progression.d.ts

@@ -1,10 +1,13 @@
-import type { Action } from 'redux';
-import { ProgressionFromAPI } from '../../types/common';
+import type { AnyAction } from 'redux';
+import type { ThunkAction } from 'redux-thunk';
+import { Options, ProgressionFromAPI } from '../../types/common';
+import type { StoreState } from '../../reducers';
 export declare const POST_PROGRESSION_REQUEST: "@@progression/POST_REQUEST";
 export declare const POST_PROGRESSION_SUCCESS: "@@progression/POST_SUCCESS";
 export declare const POST_PROGRESSION_FAILURE: "@@progression/POST_FAILURE";
-export declare type ReceiveProgression = {
+export interface ReceiveProgression extends AnyAction {
     type: typeof POST_PROGRESSION_SUCCESS;
     payload: ProgressionFromAPI;
-};
-export declare const postProgression: (skillRef: string, token: string) => Action;
+}
+export declare type PostProgressionAction = ThunkAction<Promise<ProgressionFromAPI>, StoreState, Options, AnyAction>;
+export declare const postProgression: (skillRef: string, token: string) => PostProgressionAction;

package/lib/index.d.ts

@@ -4,7 +4,7 @@ declare const AppReview: ({ options }: {
 }) => JSX.Element | null;
 declare global {
     interface Window {
-        __REDUX_DEVTOOLS_EXTENSION__?: boolean;
+        __REDUX_DEVTOOLS_EXTENSION_COMPOSE__?: Function;
     }
 }
 export default AppReview;

package/lib/index.js

@@ -13,7 +13,6 @@ import { updateStepItemsOnValidation, updateStepItemsOnNext } from './actions/ui
 import { fetchSkills } from './actions/api/fetch-skills';
 import { postProgression } from './actions/api/post-progression';
 import { VIEWS } from './common';
-// -----------------------------------------------------------------------------
 var mapDispatchToProps = {
     navigateTo: navigateTo,
     navigateBack: navigateBack,
@@ -28,7 +27,6 @@ var mapDispatchToProps = {
 var getCurrentViewName = function (storeState) {
     return storeState.ui.navigation[storeState.ui.navigation.length - 1];
 };
-// -----------------------------------------------------------------------------
 var mapStateToSkillsProps = function (state) {
     if (!state.data.skills) {
         return null;
@@ -54,7 +52,6 @@ var mapStateToSkillsProps = function (state) {
         }); })
     };
 };
-// -----------------------------------------------------------------------------
 var mapStateToSlidesProps = function (state) {
     if (!state.data.slides) {
         return null;
@@ -82,7 +79,6 @@ var mapStateToSlidesProps = function (state) {
         progression: state.data.progression
     };
 };
-// -----------------------------------------------------------------------------
 var mapStateToProps = function (state) {
     return {
         viewName: getCurrentViewName(state),
@@ -90,9 +86,7 @@ var mapStateToProps = function (state) {
         skills: mapStateToSkillsProps(state)
     };
 };
-// Props = StaticProps && Dispatchers
 var App = connect(mapStateToProps, mapDispatchToProps)(AppReviewTemplate);
-// -----------------------------------------------------------------------------
 var AppReview = function (_a) {
     var options = _a.options;
     var _b = useState(null), store = _b[0], setStore = _b[1];
@@ -119,6 +113,8 @@ var AppReview = function (_a) {
         if (store === null)
             return;
         var skillRef = options.skillRef, token = options.token;
+        // ThunkAction is not assignable to parameter of type 'AnyAction'
+        // ts problem describre here = https://github.com/reduxjs/redux-thunk/issues/333
         skillRef
             ? store.dispatch(postProgression(skillRef, token))
             : store.dispatch(fetchSkills(token));
@@ -130,5 +126,4 @@ var AppReview = function (_a) {
         React.createElement(TemplateContext, { values: values },
             React.createElement(App, null))));
 };
-// -----------------------------------------------------------------------------
 export default AppReview;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coorpacademy/app-review",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "",
   "engines": {
     "node": ">=16.15.0"
@@ -40,7 +40,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@coorpacademy/components": "10.22.2",
+    "@coorpacademy/components": "10.22.3",
     "@coorpacademy/redux-task": "^1.1.5",
     "cross-fetch": "^3.1.5",
     "jwt-decode": "^3.1.2",
@@ -76,6 +76,5 @@
     "react-dom": "^17.0.2",
     "ts-node": "^10.8.1",
     "typescript": "^4.7.4"
-  },
-  "gitHead": "b07a280786c4e83e3632779731e62a547d8ba26c"
+  }
 }

package/src/actions/api/fetch-skills.ts

@@ -1,5 +1,6 @@
 import buildTask from '@coorpacademy/redux-task';
-import {Action, Dispatch} from 'redux';
+import type {ThunkAction, ThunkDispatch} from 'redux-thunk';
+import {AnyAction} from 'redux';
 import type {StoreState} from '../../reducers';
 import {Options, Skill} from '../../types/common';
 
@@ -7,12 +8,15 @@ export const SKILLS_FETCH_REQUEST = '@@skills/FETCH_REQUEST' as const;
 export const SKILLS_FETCH_SUCCESS = '@@skills/FETCH_SUCCESS' as const;
 export const SKILLS_FETCH_FAILURE = '@@skills/FETCH_FAILURE' as const;
 
-export type ReceivedSkills = {
+export interface ReceivedSkills extends AnyAction {
   type: '@@skills/FETCH_SUCCESS';
   payload: Skill[];
-};
+}
 
-export const fetchSkills = (token: string): Action =>
+export type FetchSkillsAction = ThunkAction<Promise<void>, StoreState, Options, AnyAction>;
+type Dispatch = ThunkDispatch<StoreState, Options, AnyAction>;
+
+export const fetchSkills = (token: string): FetchSkillsAction =>
   buildTask({
     types: [SKILLS_FETCH_REQUEST, SKILLS_FETCH_SUCCESS, SKILLS_FETCH_FAILURE],
     task: (dispatch: Dispatch, getState: () => StoreState, {services}: Options) =>

package/src/actions/api/fetch-slide.ts

@@ -1,4 +1,5 @@
-import type {Action, Dispatch} from 'redux';
+import type {AnyAction} from 'redux';
+import type {ThunkAction, ThunkDispatch} from 'redux-thunk';
 import buildTask from '@coorpacademy/redux-task';
 import type {StoreState} from '../../reducers';
 import {Options, SlideFromAPI} from '../../types/common';
@@ -7,12 +8,15 @@ export const SLIDE_FETCH_REQUEST = '@@slides/FETCH_REQUEST' as const;
 export const SLIDE_FETCH_SUCCESS = '@@slides/FETCH_SUCCESS' as const;
 export const SLIDE_FETCH_FAILURE = '@@slides/FETCH_FAILURE' as const;
 
-export type ReceivedSlide = {
+export interface ReceivedSlide extends AnyAction {
   type: typeof SLIDE_FETCH_SUCCESS;
   payload: SlideFromAPI;
-};
+}
 
-export const fetchSlide = (slideRef: string, token: string): Action =>
+export type FetchSlideAction = ThunkAction<Promise<void>, StoreState, Options, AnyAction>;
+type Dispatch = ThunkDispatch<StoreState, Options, AnyAction>;
+
+export const fetchSlide = (slideRef: string, token: string): FetchSlideAction =>
   buildTask({
     types: [SLIDE_FETCH_REQUEST, SLIDE_FETCH_SUCCESS, SLIDE_FETCH_FAILURE],
     task: (dispatch: Dispatch, getState: () => StoreState, {services}: Options) =>

package/src/actions/api/post-progression.ts

@@ -1,4 +1,5 @@
-import type {Action, Dispatch} from 'redux';
+import type {AnyAction} from 'redux';
+import type {ThunkAction, ThunkDispatch} from 'redux-thunk';
 import buildTask from '@coorpacademy/redux-task';
 import {Options, ProgressionFromAPI} from '../../types/common';
 import type {StoreState} from '../../reducers';
@@ -8,12 +9,21 @@ export const POST_PROGRESSION_REQUEST = '@@progression/POST_REQUEST' as const;
 export const POST_PROGRESSION_SUCCESS = '@@progression/POST_SUCCESS' as const;
 export const POST_PROGRESSION_FAILURE = '@@progression/POST_FAILURE' as const;
 
-export type ReceiveProgression = {
+export interface ReceiveProgression extends AnyAction {
   type: typeof POST_PROGRESSION_SUCCESS;
   payload: ProgressionFromAPI;
-};
+}
 
-export const postProgression = (skillRef: string, token: string): Action =>
+export type PostProgressionAction = ThunkAction<
+  Promise<ProgressionFromAPI>,
+  StoreState,
+  Options,
+  AnyAction
+>;
+
+type Dispatch = ThunkDispatch<StoreState, Options, AnyAction>;
+
+export const postProgression = (skillRef: string, token: string): PostProgressionAction =>
   buildTask({
     types: [POST_PROGRESSION_REQUEST, POST_PROGRESSION_SUCCESS, POST_PROGRESSION_FAILURE],
     task: (dispatch: Dispatch, getState: () => StoreState, {services}: Options) => {

package/src/index.tsx

@@ -1,4 +1,5 @@
 import React, {useEffect, useState} from 'react';
+import type {} from 'redux-thunk/extend-redux'; // https://github.com/reduxjs/redux-thunk/issues/333
 import {AnyAction, Store} from 'redux';
 import {connect, Provider} from 'react-redux';
 import AppReviewTemplate from '@coorpacademy/components/es/template/app-review';
@@ -23,16 +24,12 @@ import {fetchSkills} from './actions/api/fetch-skills';
 import {postProgression} from './actions/api/post-progression';
 import {VIEWS} from './common';
 
-// -----------------------------------------------------------------------------
-
 type StaticProps = {
   viewName: 'skills' | 'onboarding' | 'slides';
   slides: SlidesViewStaticProps | null;
   skills: SkillsProps | null;
 };
 
-// -----------------------------------------------------------------------------
-
 const mapDispatchToProps: Dispatchers = {
   navigateTo,
   navigateBack,
@@ -48,8 +45,6 @@ const mapDispatchToProps: Dispatchers = {
 const getCurrentViewName = (storeState: StoreState): ViewPath =>
   storeState.ui.navigation[storeState.ui.navigation.length - 1];
 
-// -----------------------------------------------------------------------------
-
 const mapStateToSkillsProps = (state: StoreState): SkillsProps | null => {
   if (!state.data.skills) {
     return null;
@@ -77,8 +72,6 @@ const mapStateToSkillsProps = (state: StoreState): SkillsProps | null => {
   };
 };
 
-// -----------------------------------------------------------------------------
-
 const mapStateToSlidesProps = (state: StoreState): SlidesViewStaticProps | null => {
   if (!state.data.slides) {
     return null;
@@ -108,8 +101,6 @@ const mapStateToSlidesProps = (state: StoreState): SlidesViewStaticProps | null
   };
 };
 
-// -----------------------------------------------------------------------------
-
 const mapStateToProps = (state: StoreState): StaticProps => {
   return {
     viewName: getCurrentViewName(state),
@@ -118,12 +109,8 @@ const mapStateToProps = (state: StoreState): StaticProps => {
   };
 };
 
-// Props = StaticProps && Dispatchers
-
 const App = connect(mapStateToProps, mapDispatchToProps)(AppReviewTemplate);
 
-// -----------------------------------------------------------------------------
-
 const AppReview = ({options}: {options: AppOptions}): JSX.Element | null => {
   const [store, setStore] = useState<Store<StoreState, AnyAction> | null>(null);
 
@@ -153,6 +140,8 @@ const AppReview = ({options}: {options: AppOptions}): JSX.Element | null => {
     if (store === null) return;
 
     const {skillRef, token} = options;
+    // ThunkAction is not assignable to parameter of type 'AnyAction'
+    // ts problem describre here = https://github.com/reduxjs/redux-thunk/issues/333
     skillRef
       ? store.dispatch(postProgression(skillRef, token))
       : store.dispatch(fetchSkills(token));
@@ -171,15 +160,11 @@ const AppReview = ({options}: {options: AppOptions}): JSX.Element | null => {
   );
 };
 
-// -----------------------------------------------------------------------------
-
 declare global {
   // eslint-disable-next-line no-shadow
   interface Window {
-    __REDUX_DEVTOOLS_EXTENSION__?: boolean;
+    __REDUX_DEVTOOLS_EXTENSION_COMPOSE__?: Function;
   }
 }
 
-// -----------------------------------------------------------------------------
-
 export default AppReview;

package/src/types/globals.d.ts

@@ -3,8 +3,3 @@ declare module 'browser-env';
 declare module '@coorpacademy/components/es/template/app-review';
 declare module '@coorpacademy/components/es/template/app-review/template-context';
 declare module '@coorpacademy/redux-task';
-
-// eslint-disable-next-line no-shadow
-declare interface Window {
-  __REDUX_DEVTOOLS_EXTENSION_COMPOSE__?: Function;
-}