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

expose collaboration product config #799

Merged
merged 3 commits into from
Nov 8, 2024

Conversation

wkloucek
Copy link
Contributor

@wkloucek wkloucek commented Nov 7, 2024

Description

expose the collabration product config to allow usage of templates when using a non default office name

Related Issue

Motivation and Context

How Has This Been Tested?

  • using the ocis-office deployment example with following patch:
diff --git a/charts/ocis/Chart.yaml b/charts/ocis/Chart.yaml
index c3006a02..d90e08bf 100644
--- a/charts/ocis/Chart.yaml
+++ b/charts/ocis/Chart.yaml
@@ -11,7 +11,7 @@ maintainers:
 type: application
 version: 0.7.0
 # renovate: datasource=docker depName=owncloud/ocis-rolling
-appVersion: 6.6.1
+appVersion: 7.0.0-rc.1
 kubeVersion: "" # please see https://doc.owncloud.com/ocis/next/deployment/container/orchestration/orchestration.html#get-the-chart for compatible Kubernetes versions
 sources:
   - https://github.com/owncloud/ocis-charts

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)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation generated (make docs) and committed
  • Documentation ticket raised:
  • Documentation PR created:

@wkloucek
Copy link
Contributor Author

wkloucek commented Nov 7, 2024

@micbar @jvillafanez I still struggle to get the template handling working...

If I use the product type as app name, I got the target_ext info in https://ocis.kube.owncloud.test/app/list

But If product type != app name, I don't have the target_ext info in https://ocis.kube.owncloud.test/app/list

The final collaboration env settings look correct to me, though:

...
      COLLABORATION_APP_NAME:                     DemoCollabora
      COLLABORATION_APP_PRODUCT:                  Collabora
...

and

...
      COLLABORATION_APP_NAME:                     DemoOnlyOffice
      COLLABORATION_APP_PRODUCT:                  OnlyOffice
...

@wkloucek
Copy link
Contributor Author

wkloucek commented Nov 7, 2024

The image I'm using (see PR description) is using owncloud/ocis@093e6f0

@micbar
Copy link
Contributor

micbar commented Nov 7, 2024

You found a bug 🐛

@micbar
Copy link
Contributor

micbar commented Nov 7, 2024

Fix in cs3org/reva#4918

@wkloucek
Copy link
Contributor Author

wkloucek commented Nov 8, 2024

Fix in cs3org/reva#4918

Seems to work now, but the UX is still kind of weird:

image

@wkloucek
Copy link
Contributor Author

wkloucek commented Nov 8, 2024

Seems to work now, but the UX is still kind of weird:

Reported in owncloud/web#11873

@wkloucek wkloucek marked this pull request as ready for review November 8, 2024 08:15
Copy link
Contributor

@case0sh case0sh 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

@wkloucek wkloucek merged commit b4dd2c6 into owncloud:main Nov 8, 2024
1 check passed
@wkloucek wkloucek deleted the collaboration-product-config branch November 8, 2024 12:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

expose config option for COLLABORATION_APP_PRODUCT
3 participants