Skip to content

Commit 347aecb

Browse files
om-ukrom-ukr
committed
Use jira client token for media
1 parent 26dd0c0 commit 347aecb

File tree

9 files changed

+1260
-302
lines changed

9 files changed

+1260
-302
lines changed

‎package-lock.json‎

Lines changed: 1219 additions & 285 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1601,8 +1601,12 @@
16011601
"@atlaskit/editor-common": "^110.8.0",
16021602
"@atlaskit/editor-core": "^214.2.2",
16031603
"@atlaskit/editor-json-transformer": "^8.27.2",
1604+
"@atlaskit/editor-plugin-content-insertion": "^6.0.0",
1605+
"@atlaskit/editor-plugin-editor-disabled": "^6.1.0",
1606+
"@atlaskit/editor-plugin-grid": "^6.0.2",
16041607
"@atlaskit/editor-plugin-insert-block": "^7.0.1",
16051608
"@atlaskit/editor-plugin-list": "^8.0.0",
1609+
"@atlaskit/editor-plugin-media": "^8.1.2",
16061610
"@atlaskit/editor-plugin-mentions": "^8.0.0",
16071611
"@atlaskit/editor-plugin-text-color": "^6.0.1",
16081612
"@atlaskit/editor-plugin-toolbar-lists-indentation": "^7.0.1",

‎resources/html/reactView.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<meta
1313
http-equiv="Content-Security-Policy"
14-
content="default-src https://api.atlassian.com ; img-src data: {{cspSource}} http: https: blob:; object-src data:; script-src {{cspSource}};style-src {{cspSource}} 'unsafe-inline' blob: http: https: data:;"
14+
content="default-src https://api.atlassian.com https://api.media.atlassian.com; img-src data: {{cspSource}} http: https: blob:; object-src data:; script-src {{cspSource}};style-src {{cspSource}} 'unsafe-inline' blob: http: https: data:;"
1515
/>
1616
</head>
1717

‎src/atlclients/clientManager.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ export class ClientManager implements Disposable {
206206
if (site.isCloud && isBasicAuthInfo(await Container.credentialManager.getAuthInfo(site, false))) {
207207
await newClient.getCurrentUser();
208208
}
209-
209+
(newClient as any).apiVersion = '3';
210210
return newClient;
211211
}
212212

‎src/webviews/components/issue/Worklogs.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type ItemData = { worklog: Worklog; onEdit?: (worklog: Worklog) => void; onDelet
1616
const Created = (data: ItemData) => (
1717
<p style={{ display: 'inline' }}>{`${formatDistanceToNow(parseISO(data.worklog.created))} ago`}</p>
1818
);
19-
const Comment = (data: ItemData) => <p style={{ display: 'inline' }}>{data.worklog.comment}</p>;
19+
const Comment = (data: ItemData) => <p style={{ display: 'inline' }}>{`${data.worklog.comment}`}</p>;
2020
const TimeSpent = (data: ItemData) => <p style={{ display: 'inline' }}>{data.worklog.timeSpent}</p>;
2121
const Author = (data: ItemData) => {
2222
const avatar =

‎src/webviews/components/issue/common/AtlaskitEditor/AtlaskitEditor.tsx‎

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ import './AtlaskitEditor.css';
33
import { ComposableEditor, EditorNextProps } from '@atlaskit/editor-core/composable-editor';
44
import { createDefaultPreset } from '@atlaskit/editor-core/preset-default';
55
import { usePreset } from '@atlaskit/editor-core/use-preset';
6+
import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
7+
import { gridPlugin } from '@atlaskit/editor-plugin-grid';
68
import { insertBlockPlugin } from '@atlaskit/editor-plugin-insert-block';
79
import { listPlugin } from '@atlaskit/editor-plugin-list';
10+
import { mediaPlugin } from '@atlaskit/editor-plugin-media';
811
import { mentionsPlugin } from '@atlaskit/editor-plugin-mentions';
912
import { textColorPlugin } from '@atlaskit/editor-plugin-text-color';
1013
import { toolbarListsIndentationPlugin } from '@atlaskit/editor-plugin-toolbar-lists-indentation';
@@ -62,6 +65,24 @@ const AtlaskitEditor: React.FC<AtlaskitEditorProps> = (props: AtlaskitEditorProp
6265
{ toolbarShowPlusInsertOnly: true, appearance: appearance, allowExpand: true },
6366
])
6467
.add(mentionsPlugin)
68+
.add(contentInsertionPlugin)
69+
.add(gridPlugin)
70+
.add([
71+
mediaPlugin,
72+
{
73+
provider: Promise.resolve({
74+
viewMediaClientConfig: {
75+
authProvider: () =>
76+
Promise.resolve({
77+
token: '',
78+
clientId: '',
79+
baseUrl: 'https://api.media.atlassian.com',
80+
}),
81+
},
82+
}),
83+
allowMediaSingle: true,
84+
},
85+
])
6586
);
6687
}, []);
6788
// Helper function to get current document content
@@ -79,13 +100,13 @@ const AtlaskitEditor: React.FC<AtlaskitEditorProps> = (props: AtlaskitEditorProp
79100
return;
80101
}
81102
// document is in wiki markup format because of transformer passed below
82-
resolve(document);
83-
},
84-
{
85-
transformer: editorApi.core.actions.createTransformer(
86-
(scheme) => new WikiMarkupTransformer(scheme),
87-
),
103+
resolve(JSON.stringify(document));
88104
},
105+
// {
106+
// transformer: editorApi.core.actions.createTransformer(
107+
// (scheme) => new WikiMarkupTransformer(scheme),
108+
// ),
109+
// },
89110
);
90111
});
91112
} catch (error) {
@@ -169,10 +190,10 @@ const AtlaskitEditor: React.FC<AtlaskitEditorProps> = (props: AtlaskitEditorProp
169190
assistiveLabel="Rich text editor for comments"
170191
preset={preset}
171192
defaultValue={defaultValue}
172-
contentTransformerProvider={(schema) => {
173-
// here we transforms ADF <-> wiki markup
174-
return new WikiMarkupTransformer(schema);
175-
}}
193+
// contentTransformerProvider={(schema) => {
194+
// // here we transforms ADF <-> wiki markup
195+
// return new WikiMarkupTransformer(schema);
196+
// }}
176197
mentionProvider={mentionProvider}
177198
/>
178199
{(onSave || onCancel) && (

‎src/webviews/components/issue/view-issue-screen/mainpanel/IssueCommentComponent.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { formatDistanceToNow, parseISO } from 'date-fns';
1212
import React from 'react';
1313
import { DetailedSiteInfo } from 'src/atlclients/authInfo';
1414

15-
import { AdfAwareContent } from '../../../AdfAwareContent';
1615
import { RenderedContent } from '../../../RenderedContent';
1716
import { AtlascodeMentionProvider } from '../../common/AtlaskitEditor/AtlascodeMentionsProvider';
1817
import AtlaskitEditor from '../../common/AtlaskitEditor/AtlaskitEditor';
@@ -183,7 +182,7 @@ const CommentComponent: React.FC<{
183182
/>
184183
)
185184
) : isAtlaskitEditorEnabled ? (
186-
<AdfAwareContent content={comment.body} mentionProvider={mentionProvider} />
185+
<RenderedContent html={bodyText} fetchImage={fetchImage} />
187186
) : (
188187
<RenderedContent html={bodyText} fetchImage={fetchImage} />
189188
)}

‎src/webviews/components/issue/view-issue-screen/mainpanel/IssueMainPanel.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { FieldUI, FieldUIs, FieldValues, IssueLinkTypeSelectOption } from '@atla
66
import React from 'react';
77
import { DetailedSiteInfo } from 'src/atlclients/authInfo';
88

9-
import { AdfAwareContent } from '../../../AdfAwareContent';
109
import { RenderedContent } from '../../../RenderedContent';
1110
import { AttachmentList } from '../../AttachmentList';
1211
import { AttachmentsModal } from '../../AttachmentsModal';
@@ -279,7 +278,7 @@ const IssueMainPanel: React.FC<Props> = ({
279278
className="ac-inline-input-view-p"
280279
>
281280
{isAtlaskitEditorEnabled ? (
282-
<AdfAwareContent content={descriptionText} mentionProvider={mentionProvider} />
281+
<RenderedContent html={renderedDescription} fetchImage={fetchImage} />
283282
) : renderedDescription ? (
284283
<RenderedContent html={renderedDescription} fetchImage={fetchImage} />
285284
) : (

‎webpack.react.dev.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ module.exports = {
113113
}),
114114
new webpack.ProvidePlugin({
115115
process: 'process/browser',
116+
Buffer: ['buffer', 'Buffer'],
116117
}),
117118
],
118119
module: {

0 commit comments

Comments
 (0)