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

Improve impress templates #10463

Merged
merged 13 commits into from
Dec 5, 2024
Merged

Improve impress templates #10463

merged 13 commits into from
Dec 5, 2024

Conversation

Rash419
Copy link
Contributor

@Rash419 Rash419 commented Nov 11, 2024 •
edited
Loading

  • Resolves: #
  • Target version: master

Summary

TODO

@Rash419 Rash419 marked this pull request as draft November 11, 2024 15:03
@Rash419 Rash419 force-pushed the improve-impress-templates branch 2 times, most recently from 74f6d0a to 3343b39 Compare November 14, 2024 09:30
github-advanced-security[bot]
github-advanced-security bot found potential problems Nov 14, 2024
View reviewed changes
wsd/RemoteConfig.cpp Fixed Show fixed Hide fixed
wsd/RemoteConfig.cpp Fixed Show fixed Hide fixed
wsd/RemoteConfig.cpp Fixed Show fixed Hide fixed
wsd/RemoteConfig.cpp Fixed Show fixed Hide fixed
github-advanced-security[bot]
github-advanced-security bot found potential problems Nov 14, 2024
View reviewed changes
wsd/RemoteConfig.cpp Fixed Show fixed Hide fixed
@Rash419 Rash419 force-pushed the improve-impress-templates branch 3 times, most recently from 21de956 to bb3c770 Compare November 22, 2024 08:19
@Rash419 Rash419 marked this pull request as ready for review November 22, 2024 08:20
Rash419
Rash419 commented Nov 22, 2024
View reviewed changes
kit/Kit.cpp Outdated Show resolved Hide resolved
Rash419
Rash419 commented Nov 22, 2024
View reviewed changes
kit/Kit.cpp Outdated Show resolved Hide resolved
@Rash419 Rash419 force-pushed the improve-impress-templates branch 4 times, most recently from 1f15134 to 41af27a Compare November 26, 2024 06:06
@Rash419 Rash419 requested a review from caolanm November 26, 2024 06:06
@Rash419 Rash419 force-pushed the improve-impress-templates branch 6 times, most recently from 6ca24b2 to 7e08a70 Compare November 26, 2024 15:09
caolanm
caolanm reviewed Nov 26, 2024
View reviewed changes
kit/Kit.cpp Outdated Show resolved Hide resolved
caolanm
caolanm reviewed Nov 26, 2024
View reviewed changes
kit/Kit.cpp Outdated Show resolved Hide resolved
@Rash419 Rash419 requested a review from caolanm November 27, 2024 15:33
caolanm
caolanm reviewed Nov 27, 2024
View reviewed changes
kit/Kit.cpp Outdated Show resolved Hide resolved
@Rash419 Rash419 mentioned this pull request Nov 28, 2024
Merged
@Rash419 Rash419 force-pushed the improve-impress-templates branch from ae856a6 to f572ea5 Compare November 28, 2024 08:33
@Rash419 Rash419 mentioned this pull request Nov 28, 2024
Open
@Rash419
lokit: mount childroot/tmp/incoming/templates over instdir/share/comm…
c8e2384 
…on/template/presnt

- once we can download the templates from remote server it can be access
by lokit and gets added to MasterSlides impress

Signed-off-by: Rashesh <rashesh.padia@collabora.com>
Change-Id: I55cb4f340f66d353594331e25debd7124f25f042
@Rash419
wsd: added "RemoteAssetConfigPoll"
6478e37 
- this remote poll can download both fonts and tempalates. It also can
be extended to download more asset from remote server if needed in
future

Signed-off-by: Rashesh <rashesh.padia@collabora.com>
Change-Id: I4418319d0e1f9f3081b9dd1443719cab8ad6bbfc
@Rash419
remoteassetpoll: remove templates when json entries is removed
202e4a4 
Signed-off-by: Rashesh <rashesh.padia@collabora.com>
Change-Id: Idc82abd26f06549b6666bfeab1fb3967cec2d303
@Rash419
wsd: remoteconfig: support fontconfiguration using `RemoteAssetConf…
d463610 
…igPoll`

Signed-off-by: Rashesh <rashesh.padia@collabora.com>
Change-Id: I707486cb4f340058ba98e2cb574a81ec8317eabf
@Rash419
wsd: remoteconfig: use RemoteAssetConfigPoll for remote_font_config…
d813277 
… as well

- use `remote_asset_config.url` when both `remote_asset_config.url` and
`remote_font_config.url` is defined.

Signed-off-by: Rashesh <rashesh.padia@collabora.com>
Change-Id: I3b80fea6324b4e378c4edd0ee71fd2dc7764ea14
@Rash419
wsd: remove unused RemoteFontConfigPoll
9885bc0 
- it was replaced by `RemoteAssetConfigPoll`

Signed-off-by: Rashesh <rashesh.padia@collabora.com>
Change-Id: I06490d037c9da3a90495d367c1c99a0a5aa8121c
@Rash419
wsd: fix: don't start remoteassetconfig_poll if configkey is empty
26b7530 
Signed-off-by: Rashesh <rashesh.padia@collabora.com>
Change-Id: I3db0479faf521d1d89f59b40b7c89ea1b2485cb8
@caolanm
Copy link
Contributor

caolanm commented Nov 28, 2024

Am I right that "cypress: attempt to fix "Delete Chart" test" is for an existing test failure that isn't a new problem in this pr? Maybe we should get that in a separate pr that we could merge first?

@Rash419
wsd: kit: make sure directory exist before mounting
a9dc7b9 
- it checks for "instdir/share/template/common/presnt" before mouting
the "tmp/incoming/templates" on it

Signed-off-by: Rashesh <rashesh.padia@collabora.com>
Change-Id: Ib12723b5e90e96e9f8b914e0d15a591fcf2b9af1
@Rash419
kit: no need to copy default share/template/common/presnt templates
4cf5af7 
- after core patch https://gerrit.libreoffice.org/c/core/+/177353 we
create a empty 'presnt' directory

Signed-off-by: Rashesh <rashesh.padia@collabora.com>
Change-Id: I06d265fc90fe2454433e460d312a00589c911a2c
@Rash419
kit: link or copy templates when mounting fails
6011531 
Signed-off-by: Rashesh <rashesh.padia@collabora.com>
Change-Id: Iddb644a4ba7321ab68d8df50ec314a315a7c73df
@Rash419
wsd: remote: adjust templates json object
2e79ac3 
- now to fetch presentation templates json should look like:
```
  "templates": {
    "presnt": [
      {
        "uri": "http://localhost:8080/static/impress-template/template1.otp",
        "stamp": "1"
      },
      {
        "uri": "http://localhost:8080/static/impress-template/template2.otp",
        "stamp": "2"
      },
      {
        "uri": "http://localhost:8080/static/impress-template/template3.otp",
        "stamp": "3"
      }
    ]
  },
```
- this will make it easier if we want to add different types of
  templates not just impress templates

Signed-off-by: Rashesh <rashesh.padia@collabora.com>
Change-Id: I55cf6e7a6c2cee2d8cbeef90d554e01b3fe18fc8
@Rash419
wsd: remoteassetpoll: rename jsonkey "presnt" to "presentation"
1492f92 
Signed-off-by: Rashesh <rashesh.padia@collabora.com>
Change-Id: I940ebf2d7f4cba09207834dc5de544867fa7916c
@Rash419 Rash419 force-pushed the improve-impress-templates branch from f572ea5 to b412d51 Compare December 2, 2024 11:28
@Rash419
Copy link
Contributor Author

Rash419 commented Dec 2, 2024 •
edited
Loading

Am I right that "cypress: attempt to fix "Delete Chart" test" is for an existing test failure that isn't a new problem in this pr? Maybe we should get that in a separate pr that we could merge first?

Removed the cypress commit. I think these test were failing due to linking issue because after fixing your core patch to create empty template folder the tests passed : )

@Rash419
wsd: remoteassetpoll: rename json property "stamp" to "version"
4d922bb 
- keep stamp parsing for backwardcompatibility with fontconfiguration

Signed-off-by: Rashesh <rashesh.padia@collabora.com>
Change-Id: I30b88cfdbca7140b1e0cf423afc94f054a059a63
@Rash419 Rash419 force-pushed the improve-impress-templates branch from b412d51 to 4d922bb Compare December 2, 2024 11:42
@Rash419 Rash419 requested a review from caolanm December 4, 2024 05:49
@Rash419 Rash419 enabled auto-merge (rebase) December 5, 2024 05:18
@Rash419
Copy link
Contributor Author

Rash419 commented Dec 5, 2024

@caolanm can you approve we are in red cycle now ?

caolanm
caolanm approved these changes Dec 5, 2024
View reviewed changes
Copy link
Contributor

@caolanm caolanm left a comment

Choose a reason for hiding this comment

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

looks good to me

@Rash419 Rash419 merged commit 1039f15 into CollaboraOnline:master Dec 5, 2024
13 checks passed
@Rash419 Rash419 deleted the improve-impress-templates branch December 5, 2024 14:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@caolanm caolanm caolanm approved these changes

Assignees
No one assigned
Labels
CODE "red"
Projects
Collabora Online
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Rash419 @caolanm