Skip to content

Commit

Permalink
fix for deployment of non-docker adapters
Browse files Browse the repository at this point in the history
  • Loading branch information
datomo committed May 18, 2024
1 parent e7a7c46 commit 362396a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/app/views/adapters/adapters.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ <h4 cModalTitle>{{ activeMode() ? "Settings" : "Deployment Mode" }}</h4>
[formControlName]="control.key"
(change)="onChange(control.key,control.value)">
<option *ngFor="let option of getAdapterSetting(control.key).template.options"
[value]="option">{{ getAdapterSetting(control.key).template.alias[option] }}
[value]="option">{{ getAdapterSetting(control.key).template?.alias?.[option] ? getAdapterSetting(control.key).template?.alias?.[option] : option }}
</option>
</select>
<c-form-feedback>{{ getGenericFeedback(control.key) }}</c-form-feedback>
Expand Down
5 changes: 1 addition & 4 deletions src/app/views/querying/console/console.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ export class ConsoleComponent implements OnInit, OnDestroy {
const namespace = this._catalog.namespaces();
untracked(() => {
this.namespaces.set(Array.from(namespace.values()));
this.loadAndSetNamespaceDB();
});
});

Expand All @@ -122,9 +121,6 @@ export class ConsoleComponent implements OnInit, OnDestroy {
}

private loadAndSetNamespaceDB() {
if (this.activeNamespace || this.delayedNamespace) {
return;
}
let namespaceName = localStorage.getItem(this.LOCAL_STORAGE_NAMESPACE_KEY);

if (namespaceName === null || (this.namespaces && this.namespaces.length > 0 && (this.namespaces().filter(n => n.name === namespaceName).length === 0))) {
Expand Down Expand Up @@ -327,6 +323,7 @@ export class ConsoleComponent implements OnInit, OnDestroy {
} else if (Array.isArray(msg) && ((msg[0].hasOwnProperty('data') || msg[0].hasOwnProperty('affectedTuples') || msg[0].hasOwnProperty('error')))) { // array of ResultSets
if (this.delayedNamespace && !msg[0].hasOwnProperty('error')) {
this.activeNamespace.set(this.delayedNamespace);
this.storeNamespace(this.delayedNamespace)
}
this.delayedNamespace = null;

Expand Down

0 comments on commit 362396a

Please sign in to comment.