Solves issue #26749 - UPDATED #27155

noveens · 2017-02-14T20:54:16Z

Description

I replaced all instances of showTemporary with show which has a cross to remove notifications.

Related Issue

#26749

Motivation and Context

Brings a cross to remove pop-up notifications.

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

My code follows the code style of this project.
My change requires a change to the documentation.
I have updated the documentation accordingly.
I have read the CONTRIBUTING document.
I have added tests to cover my changes.
All new and existing tests passed.

mention-bot · 2017-02-14T20:54:17Z

@noveens, thanks for your PR! By analyzing the history of the files in this pull request, we identified @bartv2, @jmaciasportela, @PVince81 and @Xenopathic to be potential reviewers.

PVince81 · 2017-02-15T08:20:43Z

Now thinking of it, we probably don't need the timeout at all for error messages.

The timeout was there in the past because the user could not close error messages. But now with the button they can. And it's better that they stay until closed to make sure the user saw it.

Imagine you start uploading a huge file, go away. Then there is an error. If the error disappears after 7 seconds, you'll never know whether the upload succeeded or not.

So let's remove the timeout for all errors that are closeable.

Just make a single commit, no need to split into so many small commits, there is no benefit for splitting this way. Thanks.

noveens · 2017-02-15T11:42:37Z

@PVince81 ,
Sure I'll update the changes by tonight

noveens · 2017-02-15T23:38:25Z

@PVince81 ,
Updated, please recheck.

PVince81 · 2017-02-16T08:52:28Z

apps/files/js/file-upload.js

@@ -547,7 +547,7 @@ OC.Uploader.prototype = _.extend({
 	},

 	showUploadCancelMessage: _.debounce(function() {
-		OC.Notification.showTemporary(t('files', 'Upload cancelled.'), {timeout: 10});
+		OC.Notification.show('Upload cancelled.', {type: 'error'});


Please leave the timeout for this one. Cancelling an upload is a user action.
I tested this and it feels a bit annoying to have to not only cancel the upload but also close the error.

PVince81 · 2017-02-16T08:55:08Z

apps/files/js/filelist.js

-											'Could not rename "{fileName}", it does not exist any more',
-											{fileName: oldName}
-										)
+									OC.Notification.show('Could not rename "{fileName}", it does not exist any more', 


You missed/killed the translation function t() here and many other places.
Please recheck all locations.

PVince81 · 2017-02-16T08:55:58Z

apps/files/js/files.js

+						{
+							usedSpacePercent: usedSpacePercent,  
+							owner: ownerDisplayName, 
+							owner: ownerDisplayName, 


duplicate key ? also you removed the translation function

I couldn't find the meaning of t() function

Can you please tell me what it does.

I'll update the changes by tonight

t('Some message {placeholder}', {placeholder: 'some value to insert'}) => this will render the message "Some message some value to insert".
The "t" function will translate to another language if you switch to another language in the settings, try it.

It would be good if you could also test the changes you made or at least a few, this way you could see that something is wrong with the code.

@PVince81 ,
when i made these changes, always a " [ object object ] " message pops up
my guess would be that "showTemporary" did something with that array but "show" doesn't.

I have uploaded a screenshot of the same:

http://pasteboard.co/z2viGllSc.png

Have a closer look at the parenthesis. Now you mixed up the values in a different way.

The correct way is:

OC.Notifications.show( t( 'some message maybe with {placeholder}', {placeholder: 'value for placeholder'} ), { type: 'error' } );

(placeholder optional, only when applicable)

noveens · 2017-02-16T09:29:27Z

@PVince81 ,
Oh got it now, I found some weird dictionarys while randomly going through the code.

Now I know what it does.
Will include the translate capability.

Sure, will test the changes I made.

noveens · 2017-02-16T16:18:39Z

@bartv2, @jmaciasportela, @PVince81 and @Xenopathic ,

Please review the updates, I think bug's solved now.

PVince81 · 2017-02-17T09:46:38Z

apps/files/js/filelist.js

@@ -1569,7 +1569,7 @@
 				if (e instanceof DOMException) {
 					console.error(e);
 					this.changeDirectory('/');
-					OC.Notification.showTemporary(t('files', 'Invalid path'));
+					OC.Notification.show(t('files', 'Invalid path'), {meout: 7, type: 'error'});


oh sorry, my bad :p

noveens · 2017-02-17T12:18:35Z

@PVince81 ,

Changes pushed.

PVince81 · 2017-02-20T13:49:35Z

Now run make test-js and fix the test issues one by one.

In most cases you need to replace the stubbed call with show instead of showTemporary.
Let me know if you need guidance there.

noveens · 2017-02-20T14:05:49Z

@PVince81 ,
Thanks for the pointers :P
Updated the test-files now.

noveens · 2017-02-20T14:46:23Z

@PVince81 ,
Jenkins still seems to fail, I have no idea why.
Can you please look into it?

PVince81 · 2017-02-20T14:48:27Z

@noveens this time it's bad luck:

15:09:53 Fire up the mysql docker
15:09:53 docker: Error response from daemon: grpc: the connection is unavailable.

noveens · 2017-02-20T14:50:32Z

@PVince81 ,
anything else required for this issue?

PVince81 · 2017-02-20T14:57:27Z

apps/files/js/filelist.js

@@ -2650,7 +2656,7 @@
 		 */
 		_showPermissionDeniedNotification: function() {
 			var message = t('core', 'You don’t have permission to upload or create files here');
-			OC.Notification.showTemporary(message);
+			OC.Notification.show(t('files', message), {type: 'error'});


message is already translated, no need to retranslate it here

PVince81 · 2017-02-20T14:58:00Z

apps/files/js/file-upload.js

 						self.cancelUploads();
 					} else {
 						// HTTP connection problem or other error
-						OC.Notification.showTemporary(data.errorThrown, {timeout: 10});
+						OC.Notification.show(t('files', data.errorThrown), {type: 'error'});


don't translate data.errorThrown here

PVince81 · 2017-02-20T14:59:53Z

apps/updatenotification/js/notification.js

 		{
-			isHTML: true
+			isHTML: true,
+			type: 'error'


Not technically an error but more like an information message.

Adding the error type does make it display the cross though.

I guess we should let this be?

Yes, leave it like it was before for now

noveens · 2017-02-23T10:12:27Z

@PVince81 ,
Can this be merged, I think it's fine now.

PVince81 · 2017-02-23T10:13:11Z

Yes, Jenkins is green.

lock · 2019-08-03T21:02:35Z

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

noveens added 12 commits February 15, 2017 01:56

added quit option in commentstabview.js

457d7c2

added quit option in notif in app.js

3384fa7

added quit option in notif in file-upload.js

3717a3b

added quit option in notif in fileinfomodel.js

ab07192

added quit option in notif in filelist.js

6a89dd4

added quit option in notif in filelist.js

751546b

added quit option in notif in tagsplugin.js

e2b52a8

added quit option in notif in statusmanager.js

af49caa

added quit option in notif in external.js

097c389

added quit option in notif in versionstabview.js

1b55879

added quit option in notif in notification.js

2291937

changes according to the latest review.

39258f0

noveens changed the title ~~26749 final~~ Solves issue #26749 - UPDATED Feb 14, 2017

timeout removed since there is a button to close it

646cff8

PVince81 suggested changes Feb 16, 2017

View reviewed changes

translation capability added

dd96bab

PVince81 reviewed Feb 17, 2017

View reviewed changes

typo fixed

02ab2f6

test files updated

ab46686

PVince81 reviewed Feb 20, 2017

View reviewed changes

small errors fixed

aebc5e9

PVince81 merged commit 4632201 into owncloud:master Feb 23, 2017

MorrisJobke mentioned this pull request Mar 23, 2017

Change showTemporary notifications for closable ones nextcloud/server#4007

Merged

lock bot locked as resolved and limited conversation to collaborators Aug 3, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Solves issue #26749 - UPDATED #27155

Solves issue #26749 - UPDATED #27155

noveens commented Feb 14, 2017

mention-bot commented Feb 14, 2017

PVince81 commented Feb 15, 2017

noveens commented Feb 15, 2017

noveens commented Feb 15, 2017 •

edited

Loading

PVince81 Feb 16, 2017

PVince81 Feb 16, 2017

PVince81 Feb 16, 2017

noveens Feb 16, 2017

PVince81 Feb 16, 2017

noveens Feb 16, 2017 •

edited

Loading

noveens Feb 16, 2017

PVince81 Feb 16, 2017

noveens commented Feb 16, 2017 •

edited

Loading

noveens commented Feb 16, 2017

PVince81 Feb 17, 2017

noveens Feb 17, 2017

noveens commented Feb 17, 2017

PVince81 commented Feb 20, 2017

noveens commented Feb 20, 2017

noveens commented Feb 20, 2017

PVince81 commented Feb 20, 2017

noveens commented Feb 20, 2017

PVince81 Feb 20, 2017

PVince81 Feb 20, 2017

PVince81 Feb 20, 2017

noveens Feb 20, 2017

PVince81 Feb 20, 2017

noveens commented Feb 23, 2017 •

edited

Loading

PVince81 commented Feb 23, 2017

lock bot commented Aug 3, 2019

Solves issue #26749 - UPDATED #27155

Solves issue #26749 - UPDATED #27155

Conversation

noveens commented Feb 14, 2017

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

Checklist:

mention-bot commented Feb 14, 2017

PVince81 commented Feb 15, 2017

noveens commented Feb 15, 2017

noveens commented Feb 15, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

noveens Feb 16, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

noveens commented Feb 16, 2017 • edited Loading

noveens commented Feb 16, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

noveens commented Feb 17, 2017

PVince81 commented Feb 20, 2017

noveens commented Feb 20, 2017

noveens commented Feb 20, 2017

PVince81 commented Feb 20, 2017

noveens commented Feb 20, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

noveens commented Feb 23, 2017 • edited Loading

PVince81 commented Feb 23, 2017

lock bot commented Aug 3, 2019

noveens commented Feb 15, 2017 •

edited

Loading

noveens Feb 16, 2017 •

edited

Loading

noveens commented Feb 16, 2017 •

edited

Loading

noveens commented Feb 23, 2017 •

edited

Loading