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.

Sign up for GitHub

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

Jump to bottom

[FIX] Variable rendering problem on Import recent history page #15997

Merged
merged 8 commits into from
Apr 14, 2020
Merged

[FIX] Variable rendering problem on Import recent history page #15997

merged 8 commits into from
Apr 14, 2020

Conversation

ritwizsinha
Copy link
Contributor

Closes #15996

image
Here is the screenshot of the fixed variable rendering problem

@ritwizsinha
Copy link
Contributor Author

Please Review

@rodrigok
Copy link
Member

@ritwizsinha thanks for your contribution.

Can you move the translation method to the template so it will cover all the other importers as well?

Are you ok to do this change?

@ritwizsinha
Copy link
Contributor Author

ritwizsinha commented Dec 19, 2019 •
edited
Loading

@rodrigok sorry if I am misunderstanding but the instance.history.curValue that I have looped over already contains all the other importer translations so why do we need to move it to template? Of course I am ok to do the change

@rodrigok
Copy link
Member

Sorry. You are right, I was thinking on the other PR. The case here is that you remove the original value of the property type, if it’s necessary to be used elsewhere it will generate a problem, that’s why we usually translate things on the template or inside a helper that return the translation for that case.

@ritwizsinha
Copy link
Contributor Author

ritwizsinha commented Dec 19, 2019 •
edited
Loading

I realize my mistake , @rodrigok Thanks for the input I would change my pr accordingly to make changes in the template

@ritwizsinha
Copy link
Contributor Author

@rodrigok please review

1 similar comment
@ritwizsinha
Copy link
Contributor Author

@rodrigok please review

@ritwizsinha
Copy link
Contributor Author

Please review

@ritwizsinha
Copy link
Contributor Author

@gabriellsh I have made the changes please review

gabriellsh
gabriellsh requested changes Feb 3, 2020
View reviewed changes
Copy link
Member

@gabriellsh gabriellsh left a comment

Choose a reason for hiding this comment

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

As a thumb rule, avoid committing files that have no significant changes to them, there's no need for an additional blank line in any file 😁. I think this will wrap it up.

app/importer/client/admin/adminImportHistory.js Outdated Show resolved Hide resolved
gabriellsh
gabriellsh previously approved these changes Feb 5, 2020
View reviewed changes
@gabriellsh
Copy link
Member

@ritwizsinha Could you solve conflicts please?

@ritwizsinha
Copy link
Contributor Author

@gabriellsh the resolve conflicts button is not enabled for me, I can't change it.

@gabriellsh
Copy link
Member

Yes, you have to checkout to your branch and do it manually.

gabriellsh and others added 3 commits February 13, 2020 14:05
@gabriellsh
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into pr/1…
3045b4e 
…5997-ritwizsinha-15996

* 'develop' of github.com:RocketChat/Rocket.Chat: (181 commits)
  Update Livechat widget dependency version to 1.3.1. (RocketChat#16580)
  Update Apps-Engine version (RocketChat#16584)
  [FIX] Error when successfully joining room by invite link (RocketChat#16571)
  Add breaking notice regarding TLS (RocketChat#16575)
  [FIX] Invite links proxy URLs not working when using CDN (RocketChat#16581)
  Regression: Modal onSubmit (RocketChat#16556)
  Regression: UIkit input states (RocketChat#16552)
  [FIX] Do not stop on DM imports if one of users was not found (RocketChat#16547)
  [FIX] Introduce AppLivechatBridge.isOnlineAsync method (RocketChat#16467)
  Regression: UIKit missing select states: error/disabled (RocketChat#16540)
  [BREAK] Change apps/icon endpoint to return app's icon and use it to show on Ui Kit modal (RocketChat#16522)
  Regression: update package-lock (RocketChat#16528)
  Regression: Update Uikit (RocketChat#16515)
  Regression: UIKit - Send container info on block actions triggered on a message (RocketChat#16514)
  Use base64 for import files upload to prevent file corruption (RocketChat#16516)
  Regression: Ui Kit messaging issues RocketChat#16513
  Regression: Send app info along with interaction payload to the UI (RocketChat#16511)
  Fix: License missing from manual register handler (RocketChat#16505)
  Exclude federated and app users from active user count (RocketChat#16489)
  Remove users.info being called without need (RocketChat#16504)
  ...
@gabriellsh
Fixed
b92ed5d
@ritwizsinha
Merge branch 'develop' into 15996
eece80c 
Fixed merge conflicts
@gabriellsh
Merge branch '15996' of github.com:ritwizsinha/Rocket.Chat into pr/15…
48707a6 
…997-ritwizsinha-15996

* '15996' of github.com:ritwizsinha/Rocket.Chat:
gabriellsh
gabriellsh approved these changes Feb 13, 2020
View reviewed changes
Copy link
Member

@gabriellsh gabriellsh left a comment

Choose a reason for hiding this comment

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

You forgot to edit the new file.

@ritwizsinha
Copy link
Contributor Author

I am not able to find that file as adminImportHistory.html was deleted.

@gabriellsh
Copy link
Member

I just pushed the changes :) You can check it im modified files now.

@ritwizsinha
Copy link
Contributor Author

ritwizsinha commented Feb 13, 2020 •
edited
Loading

Ok so the changes are done !

@CLAassistant
Copy link

CLA assistant check
All committers have signed the CLA.

@ggazzo ggazzo merged commit 4e055c4 into RocketChat:develop Apr 14, 2020
gabriellsh added a commit that referenced this pull request Apr 14, 2020
@gabriellsh
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into adm/…
ad7b0a5 
…users_and_rooms

* 'develop' of github.com:RocketChat/Rocket.Chat:
  [FIX] Omnichannel SMS / WhatsApp integration errors due to missing location data (#17288)
  [FIX] User search on directory not working correctly (#17299)
  [FIX] Can not save Unread Tray Icon Alert user preference (#16288) (#16313)
  [FIX] Variable rendering problem on Import recent history page (#15997)
  [FIX] Admin panel custom sounds, multiple sound playback fix and added single play/pause button (#16215)
  [FIX] Discussions created from inside DMs were not working (#17282)
  [FIX] translation for nl (#16742)
  [FIX] No maxlength defined for custom user status (#16534)
  [FIX] Directory users email sort button (#16606)
  [FIX] In Create a New Channel, input should be focused on channel name instead of invite users (#16405)
  [FIX] Email not verified message (#16236)
  [FIX] Directory default tab (#17283)
  Update ru.i18n.json (#16869)
  [FIX] Avatar on sidebar when showing real names (#17286)
  Update Apps-Engine to stable version (#17287)
  [NEW][ENTERPRISE] Auto close abandoned Omnichannel rooms (#17055)
  Static props for Administration route components (#17285)
  [NEW] Default favorite channels (#16025)
  Apply $and helper to message template (#17280)
gabriellsh added a commit that referenced this pull request Apr 15, 2020
@gabriellsh
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into adm/…
8739a89 
…mailer

* 'develop' of github.com:RocketChat/Rocket.Chat: (93 commits)
  [FIX] Red color error outline is not removed after password update (#16536)
  [FIX] Change wording to start DM from info panel (#8799)
  New hooks for RouterContext (#17305)
  [FIX] SAML assertion signature enforcement (#17278)
  [FIX] LDAP users lose session on refresh (#17302)
  [NEW] Add MMS support to Voxtelesys (#17217)
  [FIX] Popover component doesn't have scroll (#17198)
  [FIX] Omnichannel SMS / WhatsApp integration errors due to missing location data (#17288)
  [FIX] User search on directory not working correctly (#17299)
  [FIX] Can not save Unread Tray Icon Alert user preference (#16288) (#16313)
  [FIX] Variable rendering problem on Import recent history page (#15997)
  [FIX] Admin panel custom sounds, multiple sound playback fix and added single play/pause button (#16215)
  [FIX] Discussions created from inside DMs were not working (#17282)
  [FIX] translation for nl (#16742)
  [FIX] No maxlength defined for custom user status (#16534)
  [FIX] Directory users email sort button (#16606)
  [FIX] In Create a New Channel, input should be focused on channel name instead of invite users (#16405)
  [FIX] Email not verified message (#16236)
  [FIX] Directory default tab (#17283)
  Update ru.i18n.json (#16869)
  ...
ggazzo added a commit that referenced this pull request Apr 15, 2020
@ggazzo
Merge branch 'adm/mailer' of github.com:RocketChat/Rocket.Chat into a…
8ba9fb0 
…dm/mailer

* 'adm/mailer' of github.com:RocketChat/Rocket.Chat: (79 commits)
  removed unecessary prop
  Fixed sendMail function
  Removed Log, Success message
  Permissions
  added route component
  [FIX] "Invalid Invite" message when registration is disabled (#17226)
  Added route, error handling.
  [FIX] Red color error outline is not removed after password update (#16536)
  [FIX] Change wording to start DM from info panel (#8799)
  New hooks for RouterContext (#17305)
  [FIX] SAML assertion signature enforcement (#17278)
  [FIX] LDAP users lose session on refresh (#17302)
  [NEW] Add MMS support to Voxtelesys (#17217)
  [FIX] Popover component doesn't have scroll (#17198)
  [FIX] Omnichannel SMS / WhatsApp integration errors due to missing location data (#17288)
  [FIX] User search on directory not working correctly (#17299)
  [FIX] Can not save Unread Tray Icon Alert user preference (#16288) (#16313)
  [FIX] Variable rendering problem on Import recent history page (#15997)
  [FIX] Admin panel custom sounds, multiple sound playback fix and added single play/pause button (#16215)
  [FIX] Discussions created from inside DMs were not working (#17282)
  ...
dudizilla added a commit that referenced this pull request Apr 21, 2020
@dudizilla
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i…
960d7dd 
…nto view-logs

* 'develop' of https://github.com/RocketChat/Rocket.Chat: (31 commits)
  Fixed componentes width (#17322)
  [IMPROVE] Administration -> Mailer Rewrite to React. (#17191)
  Regression: Storybook  added flowrouter group mock (#17321)
  [NEW] Feature/custom oauth mail field and interpolation for mapped fields (#15690)
  [FIX] "Invalid Invite" message when registration is disabled (#17226)
  [FIX] Red color error outline is not removed after password update (#16536)
  [FIX] Change wording to start DM from info panel (#8799)
  New hooks for RouterContext (#17305)
  [FIX] SAML assertion signature enforcement (#17278)
  [FIX] LDAP users lose session on refresh (#17302)
  [NEW] Add MMS support to Voxtelesys (#17217)
  [FIX] Popover component doesn't have scroll (#17198)
  [FIX] Omnichannel SMS / WhatsApp integration errors due to missing location data (#17288)
  [FIX] User search on directory not working correctly (#17299)
  [FIX] Can not save Unread Tray Icon Alert user preference (#16288) (#16313)
  [FIX] Variable rendering problem on Import recent history page (#15997)
  [FIX] Admin panel custom sounds, multiple sound playback fix and added single play/pause button (#16215)
  [FIX] Discussions created from inside DMs were not working (#17282)
  [FIX] translation for nl (#16742)
  [FIX] No maxlength defined for custom user status (#16534)
  ...
@sampaiodiego sampaiodiego mentioned this pull request Apr 27, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gabriellsh gabriellsh gabriellsh approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Incorrect rendering of variable in the ui
5 participants
@ritwizsinha @rodrigok @gabriellsh @CLAassistant @ggazzo