Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 28 additions & 37 deletions webapp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"@babel/runtime": "7.28.6",
"@emotion/babel-preset-css-prop": "10.0.27",
"@emotion/core": "10.0.28",
"@mattermost/client": "10.9.0",
"@mattermost/types": "10.9.0",
"@mattermost/client": "11.4.0",
"@mattermost/types": "11.4.0",
"@testing-library/jest-dom": "6.4.0",
"@testing-library/react": "14.2.1",
"@testing-library/user-event": "14.5.2",
Expand Down Expand Up @@ -63,7 +63,7 @@
"dependencies": {
"core-js": "3.6.5",
"js-cookie": "2.2.1",
"mattermost-redux": "10.9.0",
"mattermost-redux": "11.4.0",
"react": "18.2.0",
"react-bootstrap": "0.33.1",
"react-dom": "18.2.0",
Expand Down
8 changes: 4 additions & 4 deletions webapp/src/hooks/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default class Hooks {
const user = getCurrentUser(state);

if (commandTrimmed && commandTrimmed === '/confluence subscribe') {
const {data: subscriptionAccessData, error} = await this.store.dispatch(getSubscriptionAccess());
const {data: subscriptionAccessData, error} = await getSubscriptionAccess()(this.store.dispatch);

if (error) {
this.store.dispatch(sendEphemeralPost(Constants.ERROR_EXECUTING_COMMAND, contextArgs.channel_id, user.id));
Expand All @@ -41,10 +41,10 @@ export default class Hooks {
return Promise.resolve({});
}

this.store.dispatch(openSubscriptionModal());
openSubscriptionModal()(this.store.dispatch);
return Promise.resolve({});
} else if (commandTrimmed && commandTrimmed.startsWith('/confluence edit')) {
const {data: subscriptionAccessData, error} = await this.store.dispatch(getSubscriptionAccess());
const {data: subscriptionAccessData, error} = await getSubscriptionAccess()(this.store.dispatch);

if (error) {
this.store.dispatch(sendEphemeralPost(Constants.ERROR_EXECUTING_COMMAND, contextArgs.channel_id, user.id));
Expand All @@ -62,7 +62,7 @@ export default class Hooks {
this.store.dispatch(sendEphemeralPost(Constants.SPECIFY_ALIAS, contextArgs.channel_id, user.id));
} else {
const alias = args.slice(2).join(' ');
this.store.dispatch(getChannelSubscription(contextArgs.channel_id, alias, user.id));
getChannelSubscription(contextArgs.channel_id, alias, user.id)(this.store.dispatch);
}
return Promise.resolve({});
}
Expand Down
Loading