Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

[#66997] fixed sharepoint storage creation

Eric Schubert5f63d96da54b
diff --git a/frontend/src/stimulus/controllers/dynamic/storages/automatically-managed-project-folders-form.controller.ts b/frontend/src/stimulus/controllers/dynamic/storages/automatically-managed-project-folders-form.controller.ts
index 36d3f1dbcdb..6ab846f75c8 100644
--- a/frontend/src/stimulus/controllers/dynamic/storages/automatically-managed-project-folders-form.controller.ts
+++ b/frontend/src/stimulus/controllers/dynamic/storages/automatically-managed-project-folders-form.controller.ts
@@ -33,7 +33,6 @@ import { Controller } from '@hotwired/stimulus';
export default class AutomaticallyManagedProjectFoldersFormController extends Controller {
static targets = [
'applicationPasswordInput',
- 'oneDriveInformationText',
'submitButton',
];
@@ -46,17 +45,13 @@ export default class AutomaticallyManagedProjectFoldersFormController extends Co
declare readonly applicationPasswordInputTarget:HTMLElement;
declare readonly hasApplicationPasswordInputTarget:boolean;
- declare readonly oneDriveInformationTextTarget:HTMLElement;
- declare readonly hasOneDriveInformationTextTarget:boolean;
declare readonly submitButtonTarget:HTMLElement;
- declare providerTypeValue:string;
declare isAutomaticallyManagedValue:boolean;
declare doneCompleteLabelValue:string;
declare doneCompleteWithoutLabelValue:string;
connect():void {
- // On first load if isAutomaticallyManaged is true, show the applicationPasswordInput
this.toggleApplicationPasswordDisplay(this.isAutomaticallyManagedValue);
}
@@ -65,35 +60,16 @@ export default class AutomaticallyManagedProjectFoldersFormController extends Co
}
toggleApplicationPasswordDisplay(automaticManagementEnabled:boolean):void {
- switch (this.providerTypeValue) {
- case 'Storages::NextcloudStorage':
- if (!this.hasApplicationPasswordInputTarget) {
- return;
- }
-
- if (automaticManagementEnabled) {
- this.applicationPasswordInputTarget.classList.remove('d-none');
- this.submitButtonTarget.textContent = this.doneCompleteLabelValue;
- } else {
- this.applicationPasswordInputTarget.classList.add('d-none');
- this.submitButtonTarget.textContent = this.doneCompleteWithoutLabelValue;
- }
-
- break;
- case 'Storages::OneDriveStorage':
- if (!this.hasOneDriveInformationTextTarget) {
- return;
- }
-
- if (automaticManagementEnabled) {
- this.oneDriveInformationTextTarget.classList.remove('d-none');
- } else {
- this.oneDriveInformationTextTarget.classList.add('d-none');
- }
+ if (!this.hasApplicationPasswordInputTarget) {
+ return;
+ }
- break;
- default:
- throw new Error('unknown storage provider type');
+ if (automaticManagementEnabled) {
+ this.applicationPasswordInputTarget.classList.remove('d-none');
+ this.submitButtonTarget.textContent = this.doneCompleteLabelValue;
+ } else {
+ this.applicationPasswordInputTarget.classList.add('d-none');
+ this.submitButtonTarget.textContent = this.doneCompleteWithoutLabelValue;
}
}
}
diff --git a/modules/storages/app/components/storages/admin/forms/automatically_managed_project_folders_form_component.html.erb b/modules/storages/app/components/storages/admin/forms/automatically_managed_project_folders_form_component.html.erb
index fa8b39bf19f..b45464e6570 100644
--- a/modules/storages/app/components/storages/admin/forms/automatically_managed_project_folders_form_component.html.erb
+++ b/modules/storages/app/components/storages/admin/forms/automatically_managed_project_folders_form_component.html.erb
@@ -7,7 +7,6 @@
method: form_method,
data: {
controller: "storages--automatically-managed-project-folders-form",
- "storages--automatically-managed-project-folders-form-provider-type-value": storage.provider_type,
"storages--automatically-managed-project-folders-form-is-automatically-managed-value": storage.automatic_management_enabled?,
"storages--automatically-managed-project-folders-form-done-complete-label-value": I18n.t("storages.buttons.done_complete_setup"),
"storages--automatically-managed-project-folders-form-done-complete-without-label-value": I18n.t("storages.buttons.complete_without_setup")
diff --git a/modules/storages/app/components/storages/admin/forms/general_info_form_component.html.erb b/modules/storages/app/components/storages/admin/forms/general_info_form_component.html.erb
index 2bcfb0414d0..80e86877836 100644
--- a/modules/storages/app/components/storages/admin/forms/general_info_form_component.html.erb
+++ b/modules/storages/app/components/storages/admin/forms/general_info_form_component.html.erb
@@ -1,83 +1,78 @@
<%=
- component_wrapper(tag: "turbo-frame") do
- render(Primer::Beta::Text.new(tag: :div, test_selector: "storage-general-info-form")) do
- primer_form_with(
- model:,
- url: form_url,
- method: form_method,
- data: {
- "turbo-frame": "page-content",
- controller: "storages--automatically-managed-project-folders-form",
- "storages--automatically-managed-project-folders-form-provider-type-value": storage.provider_type,
- "storages--automatically-managed-project-folders-form-is-automatically-managed-value": storage.automatic_management_enabled?
- }
- ) do |form|
- flex_layout do |general_info_row|
- general_info_row.with_row(mb: 3) do
- concat(render(Primer::Beta::Text.new(font_weight: :bold)) { I18n.t("storages.label_file_storage") })
- concat(render(Storages::Admin::ProviderTypeHiddenInputForm.new(form, storage:))) if storage.new_record?
- end
+ component_wrapper(tag: "turbo-frame") do
+ render(Primer::Beta::Text.new(tag: :div, test_selector: "storage-general-info-form")) do
+ primer_form_with(
+ model:,
+ url: form_url,
+ method: form_method,
+ data: { "turbo-frame": "page-content" }
+ ) do |form|
+ flex_layout do |general_info_row|
+ general_info_row.with_row(mb: 3) do
+ concat(render(Primer::Beta::Text.new(font_weight: :bold)) { I18n.t("storages.label_file_storage") })
+ concat(render(Storages::Admin::ProviderTypeHiddenInputForm.new(form, storage:))) if storage.new_record?
+ end
+
+ general_info_row.with_row(mb: 3) do
+ render(Primer::Beta::Text.new(test_selector: "storage-provider-configuration-instructions")) { provider_configuration_instructions }
+ end
+
+ general_info_row.with_row(mb: 3) do
+ render(Storages::Admin::ProviderNameInputForm.new(form))
+ end
+ if storage.provider_type_nextcloud?
general_info_row.with_row(mb: 3) do
- render(Primer::Beta::Text.new(test_selector: "storage-provider-configuration-instructions")) { provider_configuration_instructions }
+ render(Storages::Admin::ProviderHostInputForm.new(form))
end
general_info_row.with_row(mb: 3) do
- render(Storages::Admin::ProviderNameInputForm.new(form))
+ render(Storages::Admin::NextcloudAuthenticationMethodInputForm.new(form))
end
- if storage.provider_type_nextcloud?
- general_info_row.with_row(mb: 3) do
- render(Storages::Admin::ProviderHostInputForm.new(form))
- end
-
- general_info_row.with_row(mb: 3) do
- render(Storages::Admin::NextcloudAuthenticationMethodInputForm.new(form))
- end
-
- general_info_row.with_row(mb: 3) do
- render(
- EnterpriseEdition::BannerComponent.new(
- :nextcloud_sso,
- variant: :medium,
- image: "enterprise/nextcloud-sso-authentication.png"
- )
+ general_info_row.with_row(mb: 3) do
+ render(
+ EnterpriseEdition::BannerComponent.new(
+ :nextcloud_sso,
+ variant: :medium,
+ image: "enterprise/nextcloud-sso-authentication.png"
)
- end
+ )
end
+ end
- if storage.provider_type_one_drive?
- general_info_row.with_row(mb: 3) do
- render(Storages::Admin::ProviderDriveIdInputForm.new(form))
- end
+ if storage.provider_type_one_drive?
+ general_info_row.with_row(mb: 3) do
+ render(Storages::Admin::ProviderDriveIdInputForm.new(form))
+ end
- general_info_row.with_row(mb: 3) do
- render(Storages::Admin::ProviderTenantIdInputForm.new(form))
- end
+ general_info_row.with_row(mb: 3) do
+ render(Storages::Admin::ProviderTenantIdInputForm.new(form))
end
+ end
- if storage.provider_type_share_point?
- general_info_row.with_row(mb: 3) do
- render(Storages::Admin::ProviderTenantIdInputForm.new(form))
- end
+ if storage.provider_type_share_point?
+ general_info_row.with_row(mb: 3) do
+ render(Storages::Admin::ProviderTenantIdInputForm.new(form))
+ end
- general_info_row.with_row(mb: 3) do
- render(Storages::Admin::ProviderHostInputForm.new(form))
- end
+ general_info_row.with_row(mb: 3) do
+ render(Storages::Admin::ProviderHostInputForm.new(form))
end
+ end
- general_info_row.with_row do
- render(
- Storages::Admin::SubmitOrCancelForm.new(
- form,
- storage:,
- submit_button_options:,
- cancel_button_options:
- )
+ general_info_row.with_row do
+ render(
+ Storages::Admin::SubmitOrCancelForm.new(
+ form,
+ storage:,
+ submit_button_options:,
+ cancel_button_options:
)
- end
+ )
end
end
end
end
+ end
%>