diff --git a/app/package.json b/app/package.json index bbe843fd..1ece11ec 100644 --- a/app/package.json +++ b/app/package.json @@ -2,7 +2,7 @@ "name": "snowman-app", "author": "Snowman Team", "description": "Compare data matching algorithms with each other", - "version": "3.1.0", + "version": "3.2.1", "license": "MIT", "homepage": "./", "scripts": { diff --git a/app/src/apps/SnowmanApp/components/ActivityIndicator/ActivityIndicator.View.tsx b/app/src/apps/SnowmanApp/components/ActivityIndicator/ActivityIndicator.View.tsx index b59bfb77..fdc3db1a 100644 --- a/app/src/apps/SnowmanApp/components/ActivityIndicator/ActivityIndicator.View.tsx +++ b/app/src/apps/SnowmanApp/components/ActivityIndicator/ActivityIndicator.View.tsx @@ -1,15 +1,25 @@ -import { IonSpinner } from '@ionic/react'; +import { IonIcon, IonSpinner } from '@ionic/react'; import { ActivityIndicatorProps } from 'apps/SnowmanApp/components/ActivityIndicator/ActivityIndicatorProps'; import styles from 'apps/SnowmanApp/components/ActivityIndicator/ActivityIndicatorStyles.module.css'; +import { refreshOutline } from 'ionicons/icons'; import React from 'react'; const ActivityIndicatorView = ({ existsActiveRequest, + triggerRefresh, }: ActivityIndicatorProps): JSX.Element => ( <> {existsActiveRequest ? ( - ) : null} + ) : ( + + )} ); diff --git a/app/src/apps/SnowmanApp/components/ActivityIndicator/ActivityIndicator.tsx b/app/src/apps/SnowmanApp/components/ActivityIndicator/ActivityIndicator.tsx index 49ae68ff..16192b61 100644 --- a/app/src/apps/SnowmanApp/components/ActivityIndicator/ActivityIndicator.tsx +++ b/app/src/apps/SnowmanApp/components/ActivityIndicator/ActivityIndicator.tsx @@ -1,8 +1,13 @@ import ActivityIndicatorView from 'apps/SnowmanApp/components/ActivityIndicator/ActivityIndicator.View'; -import { ActivityIndicatorStateProps } from 'apps/SnowmanApp/components/ActivityIndicator/ActivityIndicatorProps'; +import { + ActivityIndicatorDispatchProps, + ActivityIndicatorStateProps, +} from 'apps/SnowmanApp/components/ActivityIndicator/ActivityIndicatorProps'; +import { refreshCentralResources } from 'apps/SnowmanApp/store/CentralResourcesActions'; import { SnowmanAppMagistrate } from 'apps/SnowmanApp/store/SnowmanAppStore'; import { SnowmanAppModel } from 'apps/SnowmanApp/types/SnowmanAppModel'; import { connect } from 'react-redux'; +import { SnowmanDispatch } from 'types/SnowmanDispatch'; import GenericStoreComponentFactory from 'utils/GenericStoreComponentFactory'; const mapStateToProps = ( @@ -11,9 +16,15 @@ const mapStateToProps = ( existsActiveRequest: state.ActionLogicStore.ongoingRequestsCount > 0, }); +const mapDispatchToProps = ( + dispatch: SnowmanDispatch +): ActivityIndicatorDispatchProps => ({ + triggerRefresh: () => dispatch(refreshCentralResources()), +}); + export const ActivityIndicator = GenericStoreComponentFactory( SnowmanAppMagistrate, - connect(mapStateToProps)(ActivityIndicatorView) + connect(mapStateToProps, mapDispatchToProps)(ActivityIndicatorView) ); export default ActivityIndicator; diff --git a/app/src/apps/SnowmanApp/components/ActivityIndicator/ActivityIndicatorProps.ts b/app/src/apps/SnowmanApp/components/ActivityIndicator/ActivityIndicatorProps.ts index e33ae228..966c91c6 100644 --- a/app/src/apps/SnowmanApp/components/ActivityIndicator/ActivityIndicatorProps.ts +++ b/app/src/apps/SnowmanApp/components/ActivityIndicator/ActivityIndicatorProps.ts @@ -2,4 +2,9 @@ export interface ActivityIndicatorStateProps { existsActiveRequest: boolean; } -export type ActivityIndicatorProps = ActivityIndicatorStateProps; +export interface ActivityIndicatorDispatchProps { + triggerRefresh: () => void; +} + +export type ActivityIndicatorProps = ActivityIndicatorStateProps & + ActivityIndicatorDispatchProps; diff --git a/app/src/apps/SnowmanApp/components/ActivityIndicator/ActivityIndicatorStyles.module.css b/app/src/apps/SnowmanApp/components/ActivityIndicator/ActivityIndicatorStyles.module.css index 6c82f0e0..a2239954 100644 --- a/app/src/apps/SnowmanApp/components/ActivityIndicator/ActivityIndicatorStyles.module.css +++ b/app/src/apps/SnowmanApp/components/ActivityIndicator/ActivityIndicatorStyles.module.css @@ -1,3 +1,8 @@ .spinnerWhite { color: #fff !important; } + +.buttonWhite { + color: #fff !important; + cursor: pointer; +} diff --git a/package.json b/package.json index 318cbc88..faa87d62 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "snowman", "author": "Snowman Team", "description": "Compare data matching algorithms with each other", - "version": "3.1.0", + "version": "3.2.1", "license": "MIT", "repository": "https://github.com/HPI-Information-Systems/snowman", "scripts": { diff --git a/wrapper/package.json b/wrapper/package.json index 5194f4c8..91dde86d 100644 --- a/wrapper/package.json +++ b/wrapper/package.json @@ -2,7 +2,7 @@ "name": "snowman-wrapper", "author": "Snowman Team", "description": "Compare data matching algorithms with each other", - "version": "3.1.0", + "version": "3.2.1", "license": "MIT", "main": "dist/main.js", "scripts": {