3 files changed, 102 insertions, 4 deletions

diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
index 4ee573696..b8682ffe0 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
@@ -396,9 +396,9 @@
           </div>
         </div>
 
-        <div class="form-row mt-4"> <!-- new videos grid -->
+        <div class="form-row mt-4"> <!-- videos grid -->
           <div class="form-group col-12 col-lg-4 col-xl-3">
-            <div i18n class="inner-form-title">NEW VIDEOS</div>
+            <div i18n class="inner-form-title">VIDEOS</div>
           </div>
 
           <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
@@ -445,6 +445,86 @@
           </div>
         </div>
 
+        <div class="form-row mt-4"> <!-- search grid -->
+          <div class="form-group col-12 col-lg-4 col-xl-3">
+            <div i18n class="inner-form-title">SEARCH</div>
+          </div>
+
+          <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
+
+            <ng-container formGroupName="search">
+              <ng-container formGroupName="remoteUri">
+
+                <div class="form-group">
+                  <my-peertube-checkbox
+                    inputName="searchRemoteUriUsers" formControlName="users"
+                    i18n-labelText labelText="Allow users to do remote URI/handle search"
+                  >
+                    <ng-container ngProjectAs="description">
+                      <span i18n>Add ability for <strong>your users</strong> to fetch remote videos/actors by their URI, that may not be federated with your instance</span>
+                    </ng-container>
+                  </my-peertube-checkbox>
+                </div>
+
+                <div class="form-group">
+                  <my-peertube-checkbox
+                    inputName="searchRemoteUriAnonymous" formControlName="anonymous"
+                    i18n-labelText labelText="Allow anonymous to do remote URI/handle search"
+                  >
+                    <ng-container ngProjectAs="description">
+                      <span i18n>Add ability for <strong>anonymous</strong> to fetch remote videos/actors by their URI, that may not be federated with your instance</span>
+                    </ng-container>
+                  </my-peertube-checkbox>
+                </div>
+
+              </ng-container>
+
+              <ng-container formGroupName="searchIndex">
+                <div class="form-group">
+                  <my-peertube-checkbox
+                    inputName="searchIndexEnabled" formControlName="enabled"
+                    i18n-labelText labelText="Enable search index"
+                  >
+
+                  <ng-container ngProjectAs="extra">
+                    <div [ngClass]="{ 'disabled-checkbox-extra': !isSearchIndexEnabled() }">
+                      <label i18n for="searchIndexUrl">Search index URL</label>
+                      <input
+                        type="text"  id="searchIndexUrl" class="form-control"
+                        formControlName="url" [ngClass]="{ 'input-error': formErrors['search.searchIndex.url'] }"
+                      >
+                      <div *ngIf="formErrors.search.searchIndex.url" class="form-error">{{ formErrors.search.searchIndex.url }}</div>
+                    </div>
+
+                    <div class="mt-3">
+                      <my-peertube-checkbox [ngClass]="{ 'disabled-checkbox-extra': !isSearchIndexEnabled() }"
+                        inputName="searchIndexDisableLocalSearch" formControlName="disableLocalSearch"
+                        i18n-labelText labelText="Disable local search"
+                      ></my-peertube-checkbox>
+                    </div>
+
+                    <div class="mt-3">
+                      <my-peertube-checkbox [ngClass]="{ 'disabled-checkbox-extra': !isSearchIndexEnabled() }"
+                        inputName="searchIndexIsDefaultSearch" formControlName="isDefaultSearch"
+                        i18n-labelText labelText="Set search index as default"
+                      >
+                        <ng-container ngProjectAs="description">
+                          <span i18n>The local search is used by default</span>
+                        </ng-container>
+                      </my-peertube-checkbox>
+                    </div>
+
+                  </ng-container>
+                </my-peertube-checkbox>
+                </div>
+
+              </ng-container>
+
+            </ng-container>
+
+          </div>
+        </div>
+
         <div class="form-row mt-4"> <!-- federation grid -->
           <div class="form-group col-12 col-lg-4 col-xl-3">
             <div i18n class="inner-form-title">FEDERATION</div>
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
index 2bfa92da4..9618100b5 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
@@ -64,8 +64,10 @@ textarea {
 }
 
 .disabled-checkbox-extra {
-  opacity: .5;
-  pointer-events: none;
+  &, ::ng-deep label {
+    opacity: .5;
+    pointer-events: none;
+  }
 }
 
 .form-group-right {
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
index 6d59494c8..3a47ba25e 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
@@ -221,6 +221,18 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit, A
         level: null,
         dismissable: null,
         message: null
+      },
+      search: {
+        remoteUri: {
+          users: null,
+          anonymous: null
+        },
+        searchIndex: {
+          enabled: null,
+          url: this.customConfigValidatorsService.SEARCH_INDEX_URL,
+          disableLocalSearch: null,
+          isDefaultSearch: null
+        }
       }
     }
 
@@ -254,6 +266,10 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit, A
     return this.form.value['signup']['enabled'] === true
   }
 
+  isSearchIndexEnabled () {
+    return this.form.value['search']['searchIndex']['enabled'] === true
+  }
+
   isAutoFollowIndexEnabled () {
     return this.form.value['followings']['instance']['autoFollowIndex']['enabled'] === true
   }