Skip to content

Commit e2b8dee

Browse files
authored
chore: update mattermost redux package (#12010)
1 parent 5977926 commit e2b8dee

File tree

9 files changed

+193
-1200
lines changed

9 files changed

+193
-1200
lines changed

packages/mattermost-plugin/Atmosphere.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import type {GlobalState} from '@mattermost/types/store'
12
import type {AnyAction, Store} from '@reduxjs/toolkit'
23
import {Client4} from 'mattermost-redux/client'
3-
import type {GlobalState} from 'mattermost-redux/types/store'
44
import type {Variables} from 'react-relay'
55
import {
66
Environment,

packages/mattermost-plugin/components/CreateTaskModal/CreateTaskModal.tsx

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import graphql from 'babel-plugin-relay/macro'
22
import {Client4} from 'mattermost-redux/client'
3-
import type {Post} from 'mattermost-redux/types/posts'
43
import type {
54
CreateTaskModalMutation,
65
TaskStatusEnum
@@ -148,15 +147,10 @@ const CreateTaskModal = () => {
148147
]
149148
}
150149

151-
Client4.doFetch(`${Client4.getPostsRoute()}/ephemeral`, {
152-
method: 'post',
153-
body: JSON.stringify({
154-
user_id: mmUser.id,
155-
post: {
156-
channel_id: channel.id,
157-
props
158-
}
159-
} as Partial<Post>)
150+
Client4.createPostEphemeral(mmUser.id, {
151+
channel_id: channel.id,
152+
message: '',
153+
props
160154
})
161155
}
162156

packages/mattermost-plugin/components/PushReflection/PushReflectionModal.tsx

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1+
import type {GlobalState} from '@mattermost/types/store'
12
import {generateJSON, mergeAttributes} from '@tiptap/core'
23
import BaseLink from '@tiptap/extension-link'
34
import StarterKit from '@tiptap/starter-kit'
45
import graphql from 'babel-plugin-relay/macro'
56
import {Client4} from 'mattermost-redux/client'
67
import {getPost} from 'mattermost-redux/selectors/entities/posts'
7-
import type {Post} from 'mattermost-redux/types/posts'
8-
import type {GlobalState} from 'mattermost-redux/types/store'
98
import type {PushReflectionModalMutation} from 'parabol-client/__generated__/PushReflectionModalMutation.graphql'
109
import type {PushReflectionModalQuery} from 'parabol-client/__generated__/PushReflectionModalQuery.graphql'
1110
import {PALETTE} from 'parabol-client/styles/paletteV3'
@@ -229,25 +228,12 @@ const PushReflectionModal = () => {
229228
]
230229
}
231230

232-
Client4.doFetch(`${Client4.getPostsRoute()}/ephemeral`, {
233-
method: 'post',
234-
body: JSON.stringify({
235-
user_id: mmUser.id,
236-
post: {
237-
channel_id: post.channel_id,
238-
root_id: post.root_id || post.id,
239-
props
240-
}
241-
} as Partial<Post>)
242-
})
243-
/*
244-
TODO update to this call once https://github.com/mattermost/mattermost/pull/30117 was released
245231
Client4.createPostEphemeral(mmUser.id, {
246232
channel_id: post.channel_id,
247233
root_id: post.root_id || post.id,
234+
message: '',
248235
props
249236
})
250-
*/
251237

252238
handleClose()
253239
}

packages/mattermost-plugin/hooks/useInviteToMeeting.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import type {Post} from '@mattermost/types/posts'
12
import graphql from 'babel-plugin-relay/macro'
23
import {Client4} from 'mattermost-redux/client'
3-
import type {Post} from 'mattermost-redux/types/posts'
44
import type {
55
MeetingTypeEnum,
66
useInviteToMeeting_meeting$key

packages/mattermost-plugin/hooks/useInviteToTeam.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import type {Post} from '@mattermost/types/posts'
12
import graphql from 'babel-plugin-relay/macro'
23
import {Client4} from 'mattermost-redux/client'
3-
import type {Post} from 'mattermost-redux/types/posts'
44
import type {useInviteToTeam_team$key} from 'parabol-client/__generated__/useInviteToTeam_team.graphql'
55
import {PALETTE} from 'parabol-client/styles/paletteV3'
66
import {useCallback} from 'react'

packages/mattermost-plugin/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import type {GlobalState} from '@mattermost/types/store'
12
import * as Tooltip from '@radix-ui/react-tooltip'
23
import type {AnyAction, Store} from '@reduxjs/toolkit'
34
import {generateHTML, generateJSON} from '@tiptap/core'
4-
import type {GlobalState} from 'mattermost-redux/types/store'
55
import {TipTapProvider} from '../client/components/TipTapProvider'
66
import {serverTipTapExtensions} from '../client/shared/tiptap/serverTipTapExtensions'
77
import {createEnvironment} from './Atmosphere'

packages/mattermost-plugin/package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
"url": "https://github.com/ParabolInc/parabol/issues"
2121
},
2222
"devDependencies": {
23-
"@mattermost/types": "6.7.0-0",
23+
"@mattermost/types": "^10.10.0",
2424
"@tailwindcss/postcss": "^4.0.3",
2525
"@types/node": "^16.11.62",
26-
"@types/react": "16.9.11",
27-
"@types/react-bootstrap": "0.32.37",
26+
"@types/react": "^16.9.11",
27+
"@types/react-bootstrap": "^0.32.37",
2828
"@types/styled-components": "^5.1.34",
2929
"openapi-fetch": "^0.10.0",
3030
"tailwindcss": "^4.0.3"
@@ -34,15 +34,16 @@
3434
"@mui/material": "^6.3.1",
3535
"@radix-ui/react-popover": "^1.1.2",
3636
"@radix-ui/react-tooltip": "^1.1.3",
37-
"@reduxjs/toolkit": "1.9.7",
38-
"mattermost-redux": "5.33.1",
37+
"@reduxjs/toolkit": "^2.9.0",
38+
"mattermost-redux": "^10.10.0",
3939
"parabol-client": "workspace:*",
4040
"react": "^17.0.2",
4141
"react-dom": "^17.0.2",
4242
"react-is": "^17.0.2",
4343
"react-redux": "^9.2.0",
44-
"react-select": "5.8.2",
45-
"styled-components": "5.3.6"
44+
"react-select": "^5.8.2",
45+
"redux": "^5.0.1",
46+
"styled-components": "^5.3.6"
4647
},
4748
"overrides": {
4849
"@mui/base": {

packages/mattermost-plugin/selectors.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1+
import type {GlobalState} from '@mattermost/types/store'
12
import {getConfig} from 'mattermost-redux/selectors/entities/general'
23
import {getCurrentTeam} from 'mattermost-redux/selectors/entities/teams'
34

4-
import type {GlobalState} from 'mattermost-redux/types/store'
5-
65
import manifest from './manifest'
76

87
import type {PluginState} from './reducers'

0 commit comments

Comments
 (0)