Use FileCreatedFromTemplateEvent to inject the already existing empty templates #1377

juliushaertl · 2021-02-24T15:53:32Z

Use the FileCreatedFromTemplateEvent to properly handle creation from the new template handling in Nextcloud 22
- If a regular file (odt/docx) is used we just take the existing copy
- If a actual template file (ott/ots/otp/otg) is used, store the fileid and templateid in a table and use it as TemplateSource when opening the file through WOPI for the first time
  - The mapping is cleaned up after first use and regularly in a background job as it is not needed for any other scenarios than the first opening

Scenarios to test:

juliushaertl · 2021-10-15T10:35:27Z

/backport to stable4

juliushaertl · 2021-11-30T07:03:59Z

/backport to stable23

juliushaertl · 2022-01-13T16:29:18Z

lib/Backgroundjobs/Cleanup.php

+		// Expire template mappings for file creation
+		$query = $this->db->getQueryBuilder();
+		$query->delete('richdocuments_template')
+			->where($query->expr()->lte('timestamp', $query->createNamedParameter(time() - 60, IQueryBuilder::PARAM_INT)));


Lets maybe reconsider the cleanup here in case a file is for some reason not opened properly and then retried after 1 hour.

src/view/NewFileMenu.js

src/document.js

… template files for Collabora Signed-off-by: Julius Härtl <jus@bitgrid.net> Cleanup template loading Signed-off-by: Julius Härtl <jus@bitgrid.net> Fix template handling Signed-off-by: Julius Härtl <jus@bitgrid.net>

Signed-off-by: Julius Härtl <jus@bitgrid.net>

julien-nc

All good, tested all creation scenarios with/without using templates (except direct editing ones).
A few minor inline remarks.
Also, it could be useful to have a short high level dev doc, like a brief abstract description of what happens, who calls what, what comes from where for all the use cases as this app is rather complex but not so complicated in the end 😁.

lib/Controller/DocumentAPIController.php

lib/TemplateManager.php

julien-nc · 2022-01-14T10:50:04Z

lib/TemplateManager.php

@@ -393,7 +409,7 @@ public function getUserTemplateDir() {
 		}

 		// has the user manually set a directory as the default template dir ?
-		$templateDirPath = $this->config->getUserValue($this->userId, $this->appName, 'templateFolder', false);
+		$templateDirPath = $this->config->getUserValue($this->userId, Application::APPNAME, 'templateFolder', false);


Nitpicking and out of topic 😁 : Might be confusing to call this APPNAME instead of APPID or APP_ID. Don't you think?

Agreed, lets do that after the merge in a separate PR.

julien-nc · 2022-01-14T10:57:18Z

src/view/NewFileMenu.js

@@ -80,17 +83,21 @@ const NewFileMenu = {
 		OCA.Files.Files.isFileNameValid(filename)
 		filename = FileList.getUniqueName(filename)

-		$.post(


Note to self, TODO: get rid of JQuery in this file.

Added to #541

Signed-off-by: Julius Härtl <jus@bitgrid.net>

juliushaertl · 2022-01-14T12:30:33Z

Also, it could be useful to have a short high level dev doc, like a brief abstract description of what happens, who calls what, what comes from where for all the use cases as this app is rather complex but not so complicated in the end grin.

Yes, fully agree on that. Maybe also some quick diagram drawings might help to explain that a bit better. Something for a documentation ticket then I'd say.

julien-nc

🚀

juliushaertl · 2022-01-14T15:04:14Z

/backport to stable23

backportbot-nextcloud · 2022-01-14T15:04:18Z

The backport to stable4 failed. Please do this backport manually.

juliushaertl · 2022-02-14T10:25:45Z

Backporting (at least partially) to stable4 might be needed but could be tricky (ref #2008)

juliushaertl added enhancement New feature or request 2. developing Work in progress labels Mar 4, 2021

juliushaertl force-pushed the bugfix/noid/use-proper-emptytemplate branch from 260a04c to 4a10f4b Compare October 15, 2021 10:31

backportbot-nextcloud bot added the backport-request label Oct 15, 2021

juliushaertl added this to the 6.0.0 milestone Nov 11, 2021

juliushaertl force-pushed the bugfix/noid/use-proper-emptytemplate branch from 4a10f4b to 4dc9d04 Compare December 20, 2021 22:14

juliushaertl added bug Something isn't working high and removed enhancement New feature or request labels Dec 21, 2021

juliushaertl mentioned this pull request Dec 22, 2021

Implement direct editing API #721

Open

juliushaertl force-pushed the bugfix/noid/use-proper-emptytemplate branch from 2744c1b to 84b6a96 Compare December 27, 2021 15:23

juliushaertl requested review from julien-nc, luka-nextcloud and azul December 29, 2021 13:02

juliushaertl added 3. to review Ready to be reviewed and removed 2. developing Work in progress labels Dec 29, 2021

juliushaertl commented Jan 13, 2022

View reviewed changes

src/view/NewFileMenu.js Outdated Show resolved Hide resolved

juliushaertl commented Jan 13, 2022

View reviewed changes

src/document.js Outdated Show resolved Hide resolved

juliushaertl added 5 commits January 14, 2022 08:55

Remove unneeded debug output

b3857a4

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Update psalm checks

b21704e

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Add composer platform config

013663a

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Fix public link file creation

b15c6be

Signed-off-by: Julius Härtl <jus@bitgrid.net>

juliushaertl force-pushed the bugfix/noid/use-proper-emptytemplate branch from 368f4f6 to b15c6be Compare January 14, 2022 07:57

julien-nc requested changes Jan 14, 2022

View reviewed changes

Add controller description and fix typings

5a95699

Signed-off-by: Julius Härtl <jus@bitgrid.net>

juliushaertl requested a review from julien-nc January 14, 2022 12:29

julien-nc approved these changes Jan 14, 2022

View reviewed changes

juliushaertl merged commit 42cfd25 into master Jan 14, 2022

juliushaertl deleted the bugfix/noid/use-proper-emptytemplate branch January 14, 2022 15:04

backportbot-nextcloud bot mentioned this pull request Jan 14, 2022

[stable23] Use FileCreatedFromTemplateEvent to inject the already existing empty templates #1982

Merged

This comment has been minimized.

Sign in to view

backportbot-nextcloud bot removed the backport-request label Jan 14, 2022

juliushaertl mentioned this pull request Feb 14, 2022

presentation template looks like word document #2008

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use FileCreatedFromTemplateEvent to inject the already existing empty templates #1377

Use FileCreatedFromTemplateEvent to inject the already existing empty templates #1377

juliushaertl commented Feb 24, 2021 •

edited

juliushaertl commented Oct 15, 2021

juliushaertl commented Nov 30, 2021

juliushaertl Jan 13, 2022

julien-nc left a comment

julien-nc Jan 14, 2022

juliushaertl Jan 14, 2022

julien-nc Jan 14, 2022

julien-nc Jan 14, 2022

juliushaertl Jan 14, 2022

juliushaertl commented Jan 14, 2022

julien-nc left a comment

juliushaertl commented Jan 14, 2022

backportbot-nextcloud bot commented Jan 14, 2022

This comment has been minimized.

juliushaertl commented Feb 14, 2022

Use FileCreatedFromTemplateEvent to inject the already existing empty templates #1377

Use FileCreatedFromTemplateEvent to inject the already existing empty templates #1377

Conversation

juliushaertl commented Feb 24, 2021 • edited

juliushaertl commented Oct 15, 2021

juliushaertl commented Nov 30, 2021

juliushaertl Jan 13, 2022

Choose a reason for hiding this comment

julien-nc left a comment

Choose a reason for hiding this comment

julien-nc Jan 14, 2022

Choose a reason for hiding this comment

juliushaertl Jan 14, 2022

Choose a reason for hiding this comment

julien-nc Jan 14, 2022

Choose a reason for hiding this comment

julien-nc Jan 14, 2022

Choose a reason for hiding this comment

juliushaertl Jan 14, 2022

Choose a reason for hiding this comment

juliushaertl commented Jan 14, 2022

julien-nc left a comment

Choose a reason for hiding this comment

juliushaertl commented Jan 14, 2022

backportbot-nextcloud bot commented Jan 14, 2022

This comment has been minimized.

juliushaertl commented Feb 14, 2022

juliushaertl commented Feb 24, 2021 •

edited