Revert "Modify instances page to not link to blocked instances (#2076)"

This reverts commit 3338887385.
This commit is contained in:
Dessalines 2023-09-29 07:43:32 -04:00
parent 01db851785
commit 8eb016d556
2 changed files with 23 additions and 30 deletions

@ -1 +1 @@
Subproject commit cda65b80a58e24d8d397a835f67b193255e7b806 Subproject commit 22637606f4a4455458e64cefe9f5ec33dccb6c52

View file

@ -94,25 +94,24 @@ export class Instances extends Component<any, InstancesState> {
</h2> </h2>
{this.itemList(instances.linked)} {this.itemList(instances.linked)}
</div> </div>
<div className="col-md-6"> </div>
{instances.allowed && instances.allowed.length > 0 && ( <div className="row">
<> {instances.allowed && instances.allowed.length > 0 && (
<h2 className="h5 mb-3"> <div className="col-md-6">
{I18NextService.i18n.t("allowed_instances")} <h2 className="h5 mb-3">
</h2> {I18NextService.i18n.t("allowed_instances")}
{this.itemList(instances.allowed)} </h2>
</> {this.itemList(instances.allowed)}
)} </div>
)}
{instances.blocked && instances.blocked.length > 0 && ( {instances.blocked && instances.blocked.length > 0 && (
<> <div className="col-md-6">
<h2 className="h5 mb-3"> <h2 className="h5 mb-3">
{I18NextService.i18n.t("blocked_instances")} {I18NextService.i18n.t("blocked_instances")}
</h2> </h2>
{this.itemList(instances.blocked, false)} {this.itemList(instances.blocked)}
</> </div>
)} )}
</div>
</div> </div>
</> </>
) : ( ) : (
@ -134,7 +133,7 @@ export class Instances extends Component<any, InstancesState> {
); );
} }
itemList(items: Instance[], link = true) { itemList(items: Instance[]) {
return items.length > 0 ? ( return items.length > 0 ? (
<div className="table-responsive"> <div className="table-responsive">
<table id="instances_table" className="table table-sm table-hover"> <table id="instances_table" className="table table-sm table-hover">
@ -149,15 +148,9 @@ export class Instances extends Component<any, InstancesState> {
{items.map(i => ( {items.map(i => (
<tr key={i.domain}> <tr key={i.domain}>
<td> <td>
{link ? ( <a href={`https://${i.domain}`} rel={relTags}>
<a href={`https://${i.domain}`} rel={relTags}> {i.domain}
{" "} </a>
{i.domain}{" "}
</a>
) : (
<span> {i.domain} </span>
)}
;
</td> </td>
<td>{i.software}</td> <td>{i.software}</td>
<td>{i.version}</td> <td>{i.version}</td>