fix(kb.gbapp): Fix in subjects null pointer.
This commit is contained in:
parent
ef3c5a18e2
commit
e21916f35e
5 changed files with 22 additions and 4 deletions
19
.vscode/tasks.json
vendored
Normal file
19
.vscode/tasks.json
vendored
Normal file
|
@ -0,0 +1,19 @@
|
|||
{
|
||||
// See https://go.microsoft.com/fwlink/?LinkId=733558
|
||||
// for the documentation about the tasks.json format
|
||||
"version": "2.0.0",
|
||||
"tasks": [
|
||||
{
|
||||
"type": "typescript",
|
||||
"tsconfig": "tsconfig.json",
|
||||
"option": "watch",
|
||||
"problemMatcher": [
|
||||
"$tsc-watch"
|
||||
],
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": true
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
|
@ -36,7 +36,6 @@
|
|||
|
||||
'use strict';
|
||||
|
||||
|
||||
import {
|
||||
AutoIncrement,
|
||||
BelongsTo,
|
||||
|
|
|
@ -486,7 +486,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
|
|||
} catch (error) {
|
||||
reject(error);
|
||||
}
|
||||
}, 20000);
|
||||
}, 60000);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -86,6 +86,7 @@ export class KBService {
|
|||
|
||||
public static getSubjectItemsSeparatedBySpaces(subjects: GuaribasSubject[]) {
|
||||
const out = [];
|
||||
if (subjects === undefined) { return ''; }
|
||||
subjects.forEach(subject => {
|
||||
out.push(subject.internalId);
|
||||
});
|
||||
|
@ -168,7 +169,7 @@ export class KBService {
|
|||
query = `${query} ${text}`;
|
||||
}
|
||||
}
|
||||
query = `${query}&$filter=instanceId eq ${instance.instanceId}`;
|
||||
// TODO: query = `${query}&$filter=instanceId eq ${instance.instanceId}`;
|
||||
|
||||
// tslint:disable:no-unsafe-any
|
||||
if (instance.searchKey !== null && GBConfigService.get('STORAGE_DIALECT') === 'mssql') {
|
||||
|
|
|
@ -36,7 +36,6 @@
|
|||
|
||||
'use strict';
|
||||
|
||||
|
||||
import {
|
||||
AutoIncrement,
|
||||
BelongsTo,
|
||||
|
|
Loading…
Add table
Reference in a new issue