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

Status visibility setting #9

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Status visibility setting #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d30cc29
adds a visibility field to the StatusEntity. During import of tsv fil…
tdiepenb Dec 11, 2024
5d1ae02
when viewing a single status, the user can now view and change the vi…
tdiepenb Dec 11, 2024
6fea971
adds a toString method to the visibility enum so it is displayed in l…
tdiepenb Dec 12, 2024
12ebf32
move visibility settings to group level
tdiepenb Jan 10, 2025
49a17e3
remove unnecessary default value setting
tdiepenb Jan 10, 2025
43ba766
reset formatting of StatusEntity
tdiepenb Jan 11, 2025
9820108
some formatting changes #2
tdiepenb Jan 11, 2025
93f8888
add new line at end of enum
tdiepenb Jan 11, 2025
2528ec0
change how the options are displayed in the frontend
tdiepenb Jan 11, 2025
81e08aa
move visibility setting into a advanced options accordion
tdiepenb Jan 11, 2025
12268de
formatting
tdiepenb Jan 11, 2025
8988a98
add row display to advanced options
tdiepenb Jan 22, 2025
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
8 changes: 8 additions & 0 deletions src/main/java/de/uoc/dh/idh/autodone/entities/GroupEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,12 @@
import jakarta.persistence.Id;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.OneToMany;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.Transient;
import lombok.Data;
import de.uoc.dh.idh.autodone.utils.Visibility;


@Data()
@Entity()
Expand Down Expand Up @@ -50,6 +54,10 @@ public class GroupEntity {
@Column(nullable = false)
public boolean threaded;

@Enumerated(EnumType.STRING)
@Column(nullable = false)
public Visibility visibility;

//

@Transient()
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/de/uoc/dh/idh/autodone/services/StatusService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ public StatusEntity publish(StatusEntity status) {
var data = new HashMap<String, Object>();
data.put("status", status.status);

data.put("visibility", status.group.visibility.toString());

if (status.media != null) {
data.put("media_ids", status.media.stream().map((media) -> media.id).toList());
}
Expand Down
28 changes: 28 additions & 0 deletions src/main/java/de/uoc/dh/idh/autodone/utils/Visibility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package de.uoc.dh.idh.autodone.utils;

public enum Visibility {
PUBLIC {
@Override
public String toString() {
return "public";
}
},
PRIVATE {
@Override
public String toString() {
return "private";
}
},
UNLISTED {
@Override
public String toString() {
return "unlisted";
}
},
DIRECT {
@Override
public String toString() {
return "direct";
}
}
}
25 changes: 25 additions & 0 deletions src/main/resources/templates/forms/group.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,31 @@
<label class="form-label">Description for the Group</label>
</div>
</div>
<div class="accordion mb-3" id="advanced-options-accordion">
<div class="accordion-item">
<h2 class="accordion-header" id="heading-advanced-options">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapse-advanced-options" aria-expanded="false" aria-controls="collapse-advanced-options">
Advanced Options
</button>
</h2>
<div id="collapse-advanced-options" class="accordion-collapse collapse" aria-labelledby="heading-advanced-options" data-bs-parent="#advanced-options-accordion">
<div class="row accordion-body">
<div class="col-md-6 mb-3">
<label class="form-label fw-bold" for="visibility">Visibility</label>
<div class="form-floating">
<select th:field="*{visibility}" class="form-select">
<option value="PUBLIC">Public</option>
<option value="PRIVATE">Private</option>
<option value="UNLISTED">Unlisted</option>
<option value="DIRECT">Direct</option>
</select>
<label class="form-label">Visibility of the Group</label>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="accordion-footer d-flex flex-row-reverse">
<button th:text="*{uuid} ? 'Update' : 'Create'" class="btn btn-outline-primary"></button>
Expand Down