Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 client/src/app/_models/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ export class DaqStore {
type = DaqStoreType.SQlite;
varsion?: string;
url?: string;
host = '127.0.0.1';
tableName = 'meters';
configurationString = 'http::addr=localhost:9000;';
organization?: string;
credentials?: StoreCredentials;
bucket?: string;
Expand All @@ -74,6 +77,9 @@ export class DaqStore {
if (daqstore) {
this.type = daqstore.type;
this.url = daqstore.url;
this.host = daqstore.host;
this.tableName = daqstore.tableName || 'meters';
this.configurationString = daqstore.configurationString;
this.organization = daqstore.organization;
this.credentials = daqstore.credentials;
this.bucket = daqstore.bucket;
Expand All @@ -84,6 +90,7 @@ export class DaqStore {

isEquals(store: DaqStore) {
if (this.type === store.type && this.bucket === store.bucket && this.url === store.url &&
this.host === store.host && this.tableName === store.tableName && this.configurationString === store.configurationString &&
this.organization === store.organization && this.database === store.database &&
(this.credentials && StoreCredentials.isEquals(this.credentials, store.credentials)) && this.retention === store.retention) {
return true;
Expand Down Expand Up @@ -115,6 +122,7 @@ export enum DaqStoreType {
influxDB = 'influxDB',
influxDB18 = 'influxDB 1.8',
TDengine = 'TDengine' ,
questDB = 'questDB',
}

export enum influxDBVersionType {
Expand Down
28 changes: 28 additions & 0 deletions client/src/app/editor/app-settings/app-settings.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,34 @@ <h1 mat-dialog-title style="display:inline-block;cursor:move;" mat-dialog-dragga
<input [(ngModel)]="settings.daqstore.credentials.password" placeholder="taosdata" class="input-row" type="text">
</div>
</div>
<div *ngSwitchCase="daqstoreType.questDB">
<div class="block mt20 w100">
<span>{{'dlg.app-settings-daqstore-queryconn' | translate}}</span>
</div>
<div class="my-form-field block mt15 w100">
<span>{{'dlg.app-settings-smtp-host' | translate}}</span>
<input [(ngModel)]="settings.daqstore.host" placeholder="127.0.0.1" class="input-row" type="text">
</div>
<div class="my-form-field block mt15 w100">
<span>{{'dlg.app-settings-daqstore-database' | translate}}</span>
<input [(ngModel)]="settings.daqstore.tableName" placeholder="meters" class="input-row" type="text">
</div>
<div class="my-form-field block mt15 w100">
<span>{{'dlg.app-settings-daqstore-username' | translate}}</span>
<input [(ngModel)]="settings.daqstore.credentials.username" placeholder="admin" class="input-row" type="text">
</div>
<div class="my-form-field block mt15 w100">
<span>{{'dlg.app-settings-daqstore-password' | translate}}</span>
<input [(ngModel)]="settings.daqstore.credentials.password" placeholder="quest" class="input-row" type="text">
</div>
<div class="block mt20 w100">
<span>{{'dlg.app-settings-daqstore-ingestconn' | translate}}</span>
</div>
<div class="my-form-field block mt15 w100">
<span>{{'dlg.app-settings-daqstore-configurl' | translate}}</span>
<input [(ngModel)]="settings.daqstore.configurationString" placeholder="http::addr=localhost:9000;" class="input-row" type="text">
</div>
</div>
</div>
</div>
</div>
Expand Down
6 changes: 6 additions & 0 deletions client/src/assets/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -1240,6 +1240,9 @@
"dlg.app-settings-daqstore": "DAQ-Speicher",
"dlg.app-settings-daqstore-type": "Datenbanktyp",
"dlg.app-settings-daqstore-url": "URL",
"dlg.app-settings-daqstore-configurl": "Config URL",
"dlg.app-settings-daqstore-queryconn": "Query connection (PGWire)",
"dlg.app-settings-daqstore-ingestconn": "Ingestion connection (ILP)",
"dlg.app-settings-daqstore-token": "Token",
"dlg.app-settings-daqstore-bucket": "Bucket",
"dlg.app-settings-daqstore-organization": "Organisation",
Expand Down Expand Up @@ -1306,3 +1309,6 @@
"msg.report-build-error": "Senden zum Erstellen des Berichts fehlgeschlagen!",
"msg.device-tags-request-result": "Lade {{value}} von {{current}}"
}



6 changes: 6 additions & 0 deletions client/src/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1812,6 +1812,9 @@
"dlg.app-settings-daqstore": "DAQ storage",
"dlg.app-settings-daqstore-type": "Database type",
"dlg.app-settings-daqstore-url": "URL",
"dlg.app-settings-daqstore-configurl": "Config URL",
"dlg.app-settings-daqstore-queryconn": "Query connection (PGWire)",
"dlg.app-settings-daqstore-ingestconn": "Ingestion connection (ILP)",
"dlg.app-settings-daqstore-token": "Token",
"dlg.app-settings-daqstore-bucket": "Bucket",
"dlg.app-settings-daqstore-organization": "Organization",
Expand Down Expand Up @@ -1931,3 +1934,6 @@
"msg.operation-unauthorized": "Operation Unauthorized!",
"msg.secret-code-required": "Secret code required to sign authentication tokens"
}



7 changes: 7 additions & 0 deletions client/src/assets/i18n/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -736,6 +736,10 @@
"dlg.app-settings-server-port": "Servidor esta escuchando el puerto",
"dlg.app-settings-alarms-clear": "Borrar todas las alarmas y el historias",
"dlg.app-settings-auth-token": "Autenticación con token",
"dlg.app-settings-daqstore-url": "URL",
"dlg.app-settings-daqstore-configurl": "Config URL",
"dlg.app-settings-daqstore-queryconn": "Query connection (PGWire)",
"dlg.app-settings-daqstore-ingestconn": "Ingestion connection (ILP)",
"dlg.app-auth-disabled": "Deshabilitado",
"dlg.app-auth-expiration-15m": "Habilitado con token expira en 15 min.",
"dlg.app-auth-expiration-1h": "Habilitado con token expira en 1 hora.",
Expand Down Expand Up @@ -774,3 +778,6 @@
"msg.editor-mode-locked": "El editor ya esta abierto!",
"msg.alarms-clear-success": "Todas las alarmas han sido canceladas!"
}



6 changes: 6 additions & 0 deletions client/src/assets/i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -1618,6 +1618,9 @@
"dlg.app-settings-daqstore": "Stockage DAQ",
"dlg.app-settings-daqstore-type": "Type de base de données",
"dlg.app-settings-daqstore-url": "URL",
"dlg.app-settings-daqstore-configurl": "Config URL",
"dlg.app-settings-daqstore-queryconn": "Query connection (PGWire)",
"dlg.app-settings-daqstore-ingestconn": "Ingestion connection (ILP)",
"dlg.app-settings-daqstore-token": "Jeton",
"dlg.app-settings-daqstore-bucket": "Seau",
"dlg.app-settings-daqstore-organization": "Organisation",
Expand Down Expand Up @@ -1715,3 +1718,6 @@
"msg.texts-text-remove": "Souhaitez-vous supprimer le texte '{{value}}' ?",
"msg.operation-unauthorized": "Opération non autorisée !"
}



7 changes: 6 additions & 1 deletion client/src/assets/i18n/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -1652,6 +1652,9 @@
"dlg.app-settings-daqstore": "DAQストレージ",
"dlg.app-settings-daqstore-type": "データベースタイプ",
"dlg.app-settings-daqstore-url": "URL",
"dlg.app-settings-daqstore-configurl": "Config URL",
"dlg.app-settings-daqstore-queryconn": "Query connection (PGWire)",
"dlg.app-settings-daqstore-ingestconn": "Ingestion connection (ILP)",
"dlg.app-settings-daqstore-token": "トークン",
"dlg.app-settings-daqstore-bucket": "バケット",
"dlg.app-settings-daqstore-organization": "組織",
Expand Down Expand Up @@ -1748,4 +1751,6 @@
"msg.text-name-exist": "テキスト名が既に存在します!",
"msg.texts-text-remove": "テキスト '{{value}}' を削除しますか?",
"msg.operation-unauthorized": "操作が許可されていません!"
}
}


7 changes: 7 additions & 0 deletions client/src/assets/i18n/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -734,6 +734,10 @@
"dlg.app-settings-server-port": "서버가 포팅 수신 대기중",
"dlg.app-settings-alarms-clear": "모든 알림과 기록 삭제",
"dlg.app-settings-auth-token": "토큰 권한",
"dlg.app-settings-daqstore-url": "URL",
"dlg.app-settings-daqstore-configurl": "Config URL",
"dlg.app-settings-daqstore-queryconn": "Query connection (PGWire)",
"dlg.app-settings-daqstore-ingestconn": "Ingestion connection (ILP)",
"dlg.app-auth-disabled": "비활성화",
"dlg.app-auth-expiration-15m": "15분 후 토큰 만료로 활성화.",
"dlg.app-auth-expiration-1h": "1시간 후 토큰 만료로 활성화.",
Expand Down Expand Up @@ -772,3 +776,6 @@
"msg.editor-mode-locked": "편집자가 이미 열려있습니다!",
"msg.alarms-clear-success": "모든 알림이 취소되었습니다!"
}



7 changes: 7 additions & 0 deletions client/src/assets/i18n/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,10 @@
"dlg.app-language-zh-cn": "Chinês",
"dlg.app-settings-server-port": "Servidor está à escuta no porto",
"dlg.app-settings-auth-token": "Autentificar com Token",
"dlg.app-settings-daqstore-url": "URL",
"dlg.app-settings-daqstore-configurl": "Config URL",
"dlg.app-settings-daqstore-queryconn": "Query connection (PGWire)",
"dlg.app-settings-daqstore-ingestconn": "Ingestion connection (ILP)",
"dlg.app-auth-disabled": "Desativado",
"dlg.app-auth-expiration-15m": "Ativar token com expiração em 15 minutos.",
"dlg.app-auth-expiration-1h": "Ativar token com expiração em 1 horas.",
Expand Down Expand Up @@ -658,3 +662,6 @@
"msg.login-password-required": "Entra uma palavra-passe",
"msg.signin-failed": "Não autorizado"
}



6 changes: 6 additions & 0 deletions client/src/assets/i18n/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -1170,6 +1170,9 @@
"dlg.app-settings-daqstore": "Хранилище данных",
"dlg.app-settings-daqstore-type": "СУБД",
"dlg.app-settings-daqstore-url": "URL",
"dlg.app-settings-daqstore-configurl": "Config URL",
"dlg.app-settings-daqstore-queryconn": "Query connection (PGWire)",
"dlg.app-settings-daqstore-ingestconn": "Ingestion connection (ILP)",
"dlg.app-settings-daqstore-token": "Token",
"dlg.app-settings-daqstore-bucket": "Bucket",
"dlg.app-settings-daqstore-organization": "Организация",
Expand Down Expand Up @@ -1226,3 +1229,6 @@
"msg.report-build-error": "Send to build Report failed!",
"msg.device-tags-request-result": "Загружено {{value}} из {{current}}"
}



7 changes: 6 additions & 1 deletion client/src/assets/i18n/sv.json
Original file line number Diff line number Diff line change
Expand Up @@ -1599,6 +1599,9 @@
"dlg.app-settings-daqstore": "DAQ-lagring",
"dlg.app-settings-daqstore-type": "Databastyp",
"dlg.app-settings-daqstore-url": "URL",
"dlg.app-settings-daqstore-configurl": "Config URL",
"dlg.app-settings-daqstore-queryconn": "Query connection (PGWire)",
"dlg.app-settings-daqstore-ingestconn": "Ingestion connection (ILP)",
"dlg.app-settings-daqstore-token": "Token",
"dlg.app-settings-daqstore-bucket": "Bucket",
"dlg.app-settings-daqstore-organization": "Organisation",
Expand Down Expand Up @@ -1693,4 +1696,6 @@
"msg.text-name-exist": "Textnamnet finns redan!",
"msg.texts-text-remove": "Vill du ta bort texten '{{value}}'?",
"msg.operation-unauthorized": "Operation obehörig!"
}
}


8 changes: 7 additions & 1 deletion client/src/assets/i18n/tr.json
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,10 @@
"dlg.app-language-tr": "Turkish",
"dlg.app-settings-server-port": "Sunucuya erişmek için port",
"dlg.app-settings-auth-token": "Anahtar şifre işe yetkilendir",
"dlg.app-settings-daqstore-url": "URL",
"dlg.app-settings-daqstore-configurl": "Config URL",
"dlg.app-settings-daqstore-queryconn": "Query connection (PGWire)",
"dlg.app-settings-daqstore-ingestconn": "Ingestion connection (ILP)",

"dlg.app-auth-disabled": "Etkisiz",
"dlg.app-auth-expiration-15m": "Anahtar şifre 15dk içinde geçerliliğini yitirecek.",
Expand Down Expand Up @@ -670,4 +674,6 @@
"msg.login-username-required": "Kullanıcı adı girin",
"msg.login-password-required": "Şifre girin",
"msg.signin-failed": "Yetkisiz giriş."
}
}


7 changes: 7 additions & 0 deletions client/src/assets/i18n/ua.json
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,10 @@
"dlg.app-language-ua": "Ukrainian",
"dlg.app-settings-server-port": "Порт сервера",
"dlg.app-settings-auth-token": "Авторизація з токеном",
"dlg.app-settings-daqstore-url": "URL",
"dlg.app-settings-daqstore-configurl": "Config URL",
"dlg.app-settings-daqstore-queryconn": "Query connection (PGWire)",
"dlg.app-settings-daqstore-ingestconn": "Ingestion connection (ILP)",
"dlg.app-auth-disabled": "Вимкнено",
"dlg.app-auth-expiration-15m": "Увімкнено. Автоматичний вихід через 15хв.",
"dlg.app-auth-expiration-1h": "Увімкнено. Автоматичний вихід через 1год.",
Expand Down Expand Up @@ -612,3 +616,6 @@
"msg.login-password-required": "Пароль",
"msg.signin-failed": "Не авторизований"
}



6 changes: 6 additions & 0 deletions client/src/assets/i18n/zh-cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -1621,6 +1621,9 @@
"dlg.app-settings-daqstore": "DAQ存储",
"dlg.app-settings-daqstore-type": "数据库类型",
"dlg.app-settings-daqstore-url": "URL",
"dlg.app-settings-daqstore-configurl": "Config URL",
"dlg.app-settings-daqstore-queryconn": "Query connection (PGWire)",
"dlg.app-settings-daqstore-ingestconn": "Ingestion connection (ILP)",
"dlg.app-settings-daqstore-token":"令牌",
"dlg.app-settings-daqstore-bucket": "Bucket",
"dlg.app-settings-daqstore-organization": "组织",
Expand Down Expand Up @@ -1718,3 +1721,6 @@
"msg.texts-text-remove": "您是否想删除文本'{{value}}'?",
"msg.operation-unauthorized": "操作未经授权!"
}



8 changes: 7 additions & 1 deletion client/src/assets/i18n/zh-tw.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
{
"with param": "示例 {{value}}",

"app.home": "首頁",
Expand Down Expand Up @@ -1619,6 +1619,9 @@
"dlg.app-settings-daqstore": "DAQ 儲存",
"dlg.app-settings-daqstore-type": "資料庫類型",
"dlg.app-settings-daqstore-url": "URL",
"dlg.app-settings-daqstore-configurl": "Config URL",
"dlg.app-settings-daqstore-queryconn": "Query connection (PGWire)",
"dlg.app-settings-daqstore-ingestconn": "Ingestion connection (ILP)",
"dlg.app-settings-daqstore-token":"權杖",
"dlg.app-settings-daqstore-bucket": "Bucket",
"dlg.app-settings-daqstore-organization": "組織",
Expand Down Expand Up @@ -1716,3 +1719,6 @@
"msg.texts-text-remove": "您是否要刪除文字 '{{value}}'?",
"msg.operation-unauthorized": "操作未授權!"
}



Loading