Skip to content

SUP-20181: Removed obsolete https checkbox in editor-ui #877

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

Open
deckdom wants to merge 1 commit into
base: hotfix-6.4.x
Choose a base branch
from
Open

SUP-20181: Removed obsolete https checkbox in editor-ui #877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cms-oss-changelog/src/changelog/entries/2026/09/8907.SUP-20181.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Editor User Interface: Removed obsolete "https" checkbox, which was already removed with CMS 6.3.
7 changes: 1 addition & 6 deletions ...editor-ui/src/app/content-frame/components/node-properties/node-properties.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,13 @@
}
</div>
<div class="flex-row hostname-group">
<gtx-checkbox
label="https"
formControlName="https"
[gtxDisabled]="disabled"
></gtx-checkbox>
<gtx-select
class="hostname-type"
[label]="('editor.node_hostname_type_label' | gtxI18n) + ' *'"
[value]="hostnameType"
[clearable]="false"
[disabled]="disabled"
(valueChange)="updateHostnameType($event)"
(valueChange)="updateHostnameType($any($event))"
>
@for (type of HOSTNAME_TYPES; track type.id) {
<gtx-option
Expand Down
25 changes: 12 additions & 13 deletions ...s/editor-ui/src/app/content-frame/components/node-properties/node-properties.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable @typescript-eslint/no-unsafe-call */
import {
ChangeDetectionStrategy,
ChangeDetectorRef,
Expand Down Expand Up @@ -47,7 +46,7 @@ const PUBLISH_MAP_CONTROLS: (keyof EditableNodeProps)[] = [

export enum NodePropertiesMode {
CREATE = 'create',
EDIT = 'edit'
EDIT = 'edit',
}

/**
Expand All @@ -62,7 +61,7 @@ export enum NodePropertiesMode {
generateFormProvider(NodePropertiesComponent),
generateValidatorProvider(NodePropertiesComponent),
],
standalone: false
standalone: false,
})
export class NodePropertiesComponent
extends BasePropertiesComponent<EditableNodeProps>
Expand All @@ -73,7 +72,7 @@ export class NodePropertiesComponent
public readonly NodeUrlMode = NodeUrlMode;

/** selectable options for node input hostnameType */
public readonly HOSTNAME_TYPES: { id: NodeHostnameType; label: string; }[] = [
public readonly HOSTNAME_TYPES: { id: NodeHostnameType; label: string }[] = [
{
id: NodeHostnameType.VALUE,
label: 'editor.node_hostname_type_value',
Expand Down Expand Up @@ -113,7 +112,7 @@ export class NodePropertiesComponent
this.initLinkedDir();
}

this.subscriptions.push(this.client.contentRepository.list().subscribe(res => {
this.subscriptions.push(this.client.contentRepository.list().subscribe((res) => {
this.contentRepositories = res.items;
if (this.form) {
this.configureForm(this.form.value as any, false);
Expand All @@ -123,7 +122,7 @@ export class NodePropertiesComponent
}

public ngOnDestroy(): void {
this.subscriptions.forEach(s => s.unsubscribe());
this.subscriptions.forEach((s) => s.unsubscribe());
}

protected createForm(): FormGroup {
Expand All @@ -147,11 +146,11 @@ export class NodePropertiesComponent
publishFs: new FormControl(this.safeValue('publishFs') ?? false),
publishFsPages: new FormControl(this.safeValue('publishFsPages') ?? false),
publishFsFiles: new FormControl(this.safeValue('publishFsFiles') ?? false),
publishDir: new FormControl(this.safeValue('publishDir') || '', [
publishDir: new FormControl(this.safeValue('publishDir') || '', [
Validators.maxLength(255),
// createRegexValidator(NODE_PATH_REGEXP),
]),
binaryPublishDir: new FormControl(this.safeValue('binaryPublishDir') || '', [
binaryPublishDir: new FormControl(this.safeValue('binaryPublishDir') || '', [
Validators.maxLength(255),
// createRegexValidator(NODE_PATH_REGEXP),
]),
Expand All @@ -175,7 +174,7 @@ export class NodePropertiesComponent

let cr: ContentRepository | null = null;
if (this.form.value.contentRepositoryId > 0) {
cr = this.contentRepositories.find(cr => cr.id === this.form.value.contentRepositoryId);
cr = this.contentRepositories.find((cr) => cr.id === this.form.value.contentRepositoryId);
}
const isMeshCr = cr?.crType === ContentRepositoryType.MESH;
const isProjectPerNode = cr?.projectPerNode;
Expand All @@ -194,10 +193,10 @@ export class NodePropertiesComponent
// When the `publishContentMap` changes to `true`, check if all other `publishXXX` fields are `false`.
// If so, then set these to `true`, to enable them by default.
if (tmpValue?.publishContentMap
&& !this.previousPublishCr
&& !tmpValue?.publishContentMapFiles
&& !tmpValue?.publishContentMapFolders
&& !tmpValue?.publishContentMapPages
&& !this.previousPublishCr
&& !tmpValue?.publishContentMapFiles
&& !tmpValue?.publishContentMapFolders
&& !tmpValue?.publishContentMapPages
) {
this.form.patchValue({
publishContentMapFiles: true,
Expand Down