Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add MCS #132

Merged
merged 26 commits into from
Aug 29, 2022
Merged

Add MCS #132

merged 26 commits into from
Aug 29, 2022

Conversation

weeman1337
Copy link
Contributor

@weeman1337 weeman1337 commented Aug 17, 2022


This change is marked as an internal change (Task), so will not be included in the changelog.

@weeman1337 weeman1337 marked this pull request as ready for review August 17, 2022 14:11
Copy link
Contributor

@jdauphant jdauphant left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Solution to not having to copy manually the original files :

  • Find a way to reference original files from the react sdk
  • Create symlinks to original files
  • Having a pre-compile script that auto-copy the original files before compilation

And if can't : we can add a CI check that Original is always the same.

@jdauphant
Copy link
Contributor

Solution to not having to copy manually the original files :

  • Find a way to reference original files from the react sdk
  • Create symlinks to original files
  • Having a pre-compile script that auto-copy the original files before compilation

And if can't : we can add a CI check that Original is always the same.

Another solution have been suggested by the beta.gouv.fr communauty : https://github.com/ds300/patch-package

Copy link
Contributor

@estellecomment estellecomment left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When there is infected content, we should help the user understand what they can or can't do. They might get scared that the content will infect their machine for example. I think we need a bit more help text. For example in a dialog that opens when you try to download, and also when you hover on the red bug icon.
Has this feature been user-tested ?
All that can be done in a separate PR though, it's an enhancement, this version does the job.

import MFileBody from "./OriginalFileBody";

/**
* Original MImageBody from react-sdk.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you specify the version of react-sdk, for tracking purposes ?
Currently tchap-web-v4 uses react-sdk 3.46.0, which has a slightly different version of this file.

Copy link
Contributor Author

@weeman1337 weeman1337 Aug 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@estellecomment can you check whether 1042876 works for you?

This is a quite creative solution based on your comments about using customisations.json to point to node_modules and Juliens hint to patch-package.

package.json Outdated Show resolved Hide resolved
@weeman1337 weeman1337 changed the title Add MCS UI Add MCS Aug 25, 2022
@weeman1337 weeman1337 changed the base branch from weeman1337/mcs-api to develop_tchap August 25, 2022 12:11
@weeman1337 weeman1337 mentioned this pull request Aug 25, 2022
Copy link
Contributor

@estellecomment estellecomment left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AND THIS IS DONNNNNNNE
Congrats everyone, I would like to thank my parents without whom I would not have made it so far

(two small comments)

package.json Outdated Show resolved Hide resolved
*/

.mx_BlockedIcon {
background-color: #f07a12;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be nice to reuse colors, like --var(warning) or something.
Not a blocker, if it's not a 5 minute task then let's file an issue instead

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Totally agree. Unfortunately, when not using a custom theme we don't have this variables. This is a > 5 minutes task.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WIth Angelo, we want to use a different way to custom the theme : #130
It could be add to the issue when it will be priorized.

@jdauphant
Copy link
Contributor

Are we good to merge this PR ?

@estellecomment
Copy link
Contributor

Yes, good for me, @weeman1337 are you still working on some things ?

@estellecomment estellecomment merged commit 827e1f6 into develop_tchap Aug 29, 2022
@odelcroi odelcroi deleted the weeman1337/mcs-ui branch March 31, 2023 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants