Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 70e3351

Browse files
ChocobozzzChocobozzz
committed
Small edit config refactor
1 parent 5f46d28 commit 70e3351

9 files changed

+136
-61
lines changed

‎client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.html‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,29 @@
1313
<ng-container formGroupName="cache">
1414
<div class="form-group" formGroupName="previews">
1515
<label i18n for="cachePreviewsSize">Number of previews to keep in cache</label>
16+
1617
<div class="number-with-unit">
1718
<input
1819
type="number" min="0" id="cachePreviewsSize" class="form-control"
1920
formControlName="size" [ngClass]="{ 'input-error': formErrors['cache.previews.size'] }"
2021
>
21-
<span i18n>{form.value['cache']['previews']['size'], plural, =1 {cached image} other {cached images}}</span>
22+
<span i18n>{getCacheSize('previews'), plural, =1 {cached image} other {cached images}}</span>
2223
</div>
24+
2325
<div *ngIf="formErrors.cache.previews.size" class="form-error">{{ formErrors.cache.previews.size }}</div>
2426
</div>
2527

2628
<div class="form-group" formGroupName="captions">
2729
<label i18n for="cacheCaptionsSize">Number of video captions to keep in cache</label>
30+
2831
<div class="number-with-unit">
2932
<input
3033
type="number" min="0" id="cacheCaptionsSize" class="form-control"
3134
formControlName="size" [ngClass]="{ 'input-error': formErrors['cache.captions.size'] }"
3235
>
33-
<span i18n>{form.value['cache']['captions']['size'], plural, =1 {cached image} other {cached images}}</span>
36+
<span i18n>{getCacheSize('captions'), plural, =1 {cached caption} other {cached captions}}</span>
3437
</div>
38+
3539
<div *ngIf="formErrors.cache.captions.size" class="form-error">{{ formErrors.cache.captions.size }}</div>
3640
</div>
3741
</ng-container>

‎client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,8 @@ import { FormGroup } from '@angular/forms'
1111
export class EditAdvancedConfigurationComponent {
1212
@Input() form: FormGroup
1313
@Input() formErrors: any
14+
15+
getCacheSize (type: 'captions' | 'previews') {
16+
return this.form.value['cache'][type]['size']
17+
}
1418
}

‎client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
<div class="form-group" formGroupName="instance">
2727
<label i18n for="instanceDefaultClientRoute">Landing page</label>
28+
2829
<div class="peertube-select-container">
2930
<select id="instanceDefaultClientRoute" formControlName="defaultClientRoute" class="form-control">
3031
<option i18n value="/videos/overview">Discover videos</option>
@@ -41,13 +42,15 @@
4142
<option i18n value="/videos/local">Local videos</option>
4243
</select>
4344
</div>
45+
4446
<div *ngIf="formErrors.instance.defaultClientRoute" class="form-error">{{ formErrors.instance.defaultClientRoute }}</div>
4547
</div>
4648

4749
<div class="form-group" formGroupName="trending">
4850
<ng-container formGroupName="videos">
4951
<ng-container formGroupName="algorithms">
5052
<label i18n for="trendingVideosAlgorithmsDefault">Default trending page</label>
53+
5154
<div class="peertube-select-container">
5255
<select id="trendingVideosAlgorithmsDefault" formControlName="default" class="form-control">
5356
<option i18n value="best">Best videos</option>
@@ -56,6 +59,7 @@
5659
<option i18n value="most-liked">Most liked videos</option>
5760
</select>
5861
</div>
62+
5963
<div *ngIf="formErrors.trending.videos.algorithms.default" class="form-error">{{ formErrors.trending.videos.algorithms.default }}</div>
6064
</ng-container>
6165
</ng-container>
@@ -92,22 +96,26 @@
9296

9397
<div class="form-group">
9498
<label i18n for="broadcastMessageLevel">Broadcast message level</label>
99+
95100
<div class="peertube-select-container">
96101
<select id="broadcastMessageLevel" formControlName="level" class="form-control">
97102
<option value="info">info</option>
98103
<option value="warning">warning</option>
99104
<option value="error">error</option>
100105
</select>
101106
</div>
107+
102108
<div *ngIf="formErrors.broadcastMessage.level" class="form-error">{{ formErrors.broadcastMessage.level }}</div>
103109
</div>
104110

105111
<div class="form-group">
106112
<label i18n for="broadcastMessageMessage">Message</label><my-help helpType="markdownText"></my-help>
113+
107114
<my-markdown-textarea
108115
name="broadcastMessageMessage" formControlName="message" textareaMaxWidth="500px"
109116
[classes]="{ 'input-error': formErrors['broadcastMessage.message'] }"
110117
></my-markdown-textarea>
118+
111119
<div *ngIf="formErrors.broadcastMessage.message" class="form-error">{{ formErrors.broadcastMessage.message }}</div>
112120
</div>
113121

@@ -139,22 +147,25 @@
139147
</ng-container>
140148

141149
<ng-container ngProjectAs="extra">
142-
<my-peertube-checkbox [ngClass]="{ 'disabled-checkbox-extra': !isSignupEnabled() }"
150+
<my-peertube-checkbox [ngClass]="getDisabledSignupClass()"
143151
inputName="signupRequiresEmailVerification" formControlName="requiresEmailVerification"
144152
i18n-labelText labelText="Signup requires email verification"
145153
></my-peertube-checkbox>
146154

147-
<div [ngClass]="{ 'disabled-checkbox-extra': !isSignupEnabled() }" class="mt-3">
155+
<div [ngClass]="getDisabledSignupClass()" class="mt-3">
148156
<label i18n for="signupLimit">Signup limit</label>
157+
149158
<div class="number-with-unit">
150159
<input
151160
type="number" min="-1" id="signupLimit" class="form-control"
152161
formControlName="limit" [ngClass]="{ 'input-error': formErrors['signup.limit'] }"
153162
>
154163
<span i18n>{form.value['signup']['limit'], plural, =1 {user} other {users}}</span>
155164
</div>
165+
156166
<div *ngIf="formErrors.signup.limit" class="form-error">{{ formErrors.signup.limit }}</div>
157-
<small *ngIf="form.value['signup']['limit'] === -1" class="text-muted">Signup won't be limited to a fixed number of users.</small>
167+
168+
<small i18n *ngIf="hasUnlimitedSignup()" class="text-muted">Signup won't be limited to a fixed number of users.</small>
158169
</div>
159170
</ng-container>
160171
</my-peertube-checkbox>
@@ -207,9 +218,7 @@
207218

208219
<div class="form-group mt-4">
209220
<label i18n for="importConcurrency">Import jobs concurrency</label>
210-
<span class="text-muted ml-1">
211-
<span i18n>allows to import multiple videos in parallel. ⚠️ Requires a PeerTube restart.</span>
212-
</span>
221+
<span i18n class="text-muted ml-1">allows to import multiple videos in parallel. ⚠️ Requires a PeerTube restart.</span>
213222

214223
<div class="number-with-unit">
215224
<input type="number" name="importConcurrency" formControlName="concurrency" />
@@ -307,24 +316,26 @@
307316
</ng-container>
308317

309318
<ng-container ngProjectAs="extra">
310-
<div [ngClass]="{ 'disabled-checkbox-extra': !isSearchIndexEnabled() }">
319+
<div [ngClass]="getDisabledSearchIndexClass()">
311320
<label i18n for="searchIndexUrl">Search index URL</label>
321+
312322
<input
313323
type="text" id="searchIndexUrl" class="form-control"
314324
formControlName="url" [ngClass]="{ 'input-error': formErrors['search.searchIndex.url'] }"
315325
>
326+
316327
<div *ngIf="formErrors.search.searchIndex.url" class="form-error">{{ formErrors.search.searchIndex.url }}</div>
317328
</div>
318329

319330
<div class="mt-3">
320-
<my-peertube-checkbox [ngClass]="{ 'disabled-checkbox-extra': !isSearchIndexEnabled() }"
331+
<my-peertube-checkbox [ngClass]="getDisabledSearchIndexClass()"
321332
inputName="searchIndexDisableLocalSearch" formControlName="disableLocalSearch"
322333
i18n-labelText labelText="Disable local search in search bar"
323334
></my-peertube-checkbox>
324335
</div>
325336

326337
<div class="mt-3">
327-
<my-peertube-checkbox [ngClass]="{ 'disabled-checkbox-extra': !isSearchIndexEnabled() }"
338+
<my-peertube-checkbox [ngClass]="getDisabledSearchIndexClass()"
328339
inputName="searchIndexIsDefaultSearch" formControlName="isDefaultSearch"
329340
i18n-labelText labelText="Search bar uses the global search index by default"
330341
>
@@ -433,10 +444,12 @@
433444

434445
<div class="form-group" formGroupName="admin">
435446
<label i18n for="adminEmail">Admin email</label>
447+
436448
<input
437449
type="text" id="adminEmail" class="form-control"
438450
formControlName="email" [ngClass]="{ 'input-error': formErrors['admin.email'] }"
439451
>
452+
440453
<div *ngIf="formErrors.admin.email" class="form-error">{{ formErrors.admin.email }}</div>
441454
</div>
442455

@@ -471,6 +484,7 @@
471484
type="text" id="servicesTwitterUsername" class="form-control"
472485
formControlName="username" [ngClass]="{ 'input-error': formErrors['services.twitter.username'] }"
473486
>
487+
474488
<div *ngIf="formErrors.services.twitter.username" class="form-error">{{ formErrors.services.twitter.username }}</div>
475489
</div>
476490

‎client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,22 @@ export class EditBasicConfigurationComponent implements OnInit {
5050
return this.form.value['signup']['enabled'] === true
5151
}
5252

53+
getDisabledSignupClass () {
54+
return { 'disabled-checkbox-extra': !this.isSignupEnabled() }
55+
}
56+
57+
hasUnlimitedSignup () {
58+
return this.form.value['signup']['limit'] === -1
59+
}
60+
5361
isSearchIndexEnabled () {
5462
return this.form.value['search']['searchIndex']['enabled'] === true
5563
}
5664

65+
getDisabledSearchIndexClass () {
66+
return { 'disabled-checkbox-extra': !this.isSearchIndexEnabled() }
67+
}
68+
5769
isAutoFollowIndexEnabled () {
5870
return this.form.value['followings']['instance']['autoFollowIndex']['enabled'] === true
5971
}

‎client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.html‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,34 @@
1111

1212
<div class="form-group">
1313
<label i18n for="instanceName">Name</label>
14+
1415
<input
1516
type="text" id="instanceName" class="form-control"
1617
formControlName="name" [ngClass]="{ 'input-error': formErrors.instance.name }"
1718
>
19+
1820
<div *ngIf="formErrors.instance.name" class="form-error">{{ formErrors.instance.name }}</div>
1921
</div>
2022

2123
<div class="form-group">
2224
<label i18n for="instanceShortDescription">Short description</label>
25+
2326
<textarea
2427
id="instanceShortDescription" formControlName="shortDescription" class="form-control small"
2528
[ngClass]="{ 'input-error': formErrors['instance.shortDescription'] }"
2629
></textarea>
30+
2731
<div *ngIf="formErrors.instance.shortDescription" class="form-error">{{ formErrors.instance.shortDescription }}</div>
2832
</div>
2933

3034
<div class="form-group">
3135
<label i18n for="instanceDescription">Description</label><my-help helpType="markdownText"></my-help>
36+
3237
<my-markdown-textarea
3338
name="instanceDescription" formControlName="description" textareaMaxWidth="500px"
3439
[classes]="{ 'input-error': formErrors['instance.description'] }"
3540
></my-markdown-textarea>
41+
3642
<div *ngIf="formErrors.instance.description" class="form-error">{{ formErrors.instance.description }}</div>
3743
</div>
3844

@@ -111,24 +117,29 @@
111117
<option i18n value="display">Display</option>
112118
</select>
113119
</div>
120+
114121
<div *ngIf="formErrors.instance.defaultNSFWPolicy" class="form-error">{{ formErrors.instance.defaultNSFWPolicy }}</div>
115122
</div>
116123

117124
<div class="form-group">
118125
<label i18n for="instanceTerms">Terms</label><my-help helpType="markdownText"></my-help>
126+
119127
<my-markdown-textarea
120128
name="instanceTerms" formControlName="terms" textareaMaxWidth="500px"
121129
[ngClass]="{ 'input-error': formErrors['instance.terms'] }"
122130
></my-markdown-textarea>
131+
123132
<div *ngIf="formErrors.instance.terms" class="form-error">{{ formErrors.instance.terms }}</div>
124133
</div>
125134

126135
<div class="form-group">
127136
<label i18n for="instanceCodeOfConduct">Code of conduct</label><my-help helpType="markdownText"></my-help>
137+
128138
<my-markdown-textarea
129139
name="instanceCodeOfConduct" formControlName="codeOfConduct" textareaMaxWidth="500px"
130140
[ngClass]="{ 'input-error': formErrors['instance.codeOfConduct'] }"
131141
></my-markdown-textarea>
142+
132143
<div *ngIf="formErrors.instance.codeOfConduct" class="form-error">{{ formErrors.instance.codeOfConduct }}</div>
133144
</div>
134145

@@ -140,6 +151,7 @@
140151
name="instanceModerationInformation" formControlName="moderationInformation" textareaMaxWidth="500px"
141152
[ngClass]="{ 'input-error': formErrors['instance.moderationInformation'] }"
142153
></my-markdown-textarea>
154+
143155
<div *ngIf="formErrors.instance.moderationInformation" class="form-error">{{ formErrors.instance.moderationInformation }}</div>
144156
</div>
145157

@@ -173,6 +185,7 @@
173185
name="instanceCreationReason" formControlName="creationReason" textareaMaxWidth="500px"
174186
[ngClass]="{ 'input-error': formErrors['instance.creationReason'] }"
175187
></my-markdown-textarea>
188+
176189
<div *ngIf="formErrors.instance.creationReason" class="form-error">{{ formErrors.instance.creationReason }}</div>
177190
</div>
178191

@@ -184,6 +197,7 @@
184197
name="instanceMaintenanceLifetime" formControlName="maintenanceLifetime" textareaMaxWidth="500px"
185198
[ngClass]="{ 'input-error': formErrors['instance.maintenanceLifetime'] }"
186199
></my-markdown-textarea>
200+
187201
<div *ngIf="formErrors.instance.maintenanceLifetime" class="form-error">{{ formErrors.instance.maintenanceLifetime }}</div>
188202
</div>
189203

@@ -195,6 +209,7 @@
195209
name="instanceBusinessModel" formControlName="businessModel" textareaMaxWidth="500px"
196210
[ngClass]="{ 'input-error': formErrors['instance.businessModel'] }"
197211
></my-markdown-textarea>
212+
198213
<div *ngIf="formErrors.instance.businessModel" class="form-error">{{ formErrors.instance.businessModel }}</div>
199214
</div>
200215

0 commit comments

Comments
 (0)