jprdonnelly/qmi-cloud
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some expceptions controlled

Browse Source
This commit is contained in:
Manuel Romero
2023-12-01 09:54:27 +01:00
parent 36741b06ad
commit bca55b62df
5 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/qmi-cloud/index.html vendored
View File

@@ -17,5 +17,5 @@
<link rel="stylesheet" href="styles.fc71de1623889098932b.css"></head>
<body>
<app-root></app-root>
<script src="runtime.c51bd5b1c616d9ffddc1.js" defer></script><script src="polyfills-es5.6fef7e679f78bcc42760.js" nomodule defer></script><script src="polyfills.51f5cc3d1309de3a873d.js" defer></script><script src="scripts.1af868998801499c8755.js" defer></script><script src="main.e4d092492f035c0560d4.js" defer></script></body>
<script src="runtime.c51bd5b1c616d9ffddc1.js" defer></script><script src="polyfills-es5.6fef7e679f78bcc42760.js" nomodule defer></script><script src="polyfills.51f5cc3d1309de3a873d.js" defer></script><script src="scripts.1af868998801499c8755.js" defer></script><script src="main.f4e903b239009c284006.js" defer></script></body>
</html>

2
dist/qmi-cloud/main.e4d092492f035c0560d4.js → dist/qmi-cloud/main.f4e903b239009c284006.js vendored
View File

File diff suppressed because one or more lines are too long

17
server/routes/qsProxy.js
View File

@@ -163,7 +163,7 @@ router.get("/api/v1/*", passport.ensureAuthenticated, async (req, res) => {
res.status(status).end(data);
} catch (e2) {
console.log("Error: QlikSession expired, requesting a new one.");
console.log("QSProxy# Error: QlikSession expired, requesting a new one.");
let newS = await newSession(req);
session.qlikSession = newS;
reqHeaders.cookie = decodeURIComponent(session.qlikSession);
@@ -216,7 +216,20 @@ function init (server) {
}
const appId = req.url.match("/app/(.*)\\?")[1];
const csrfToken= qlikCookie.match("_csrfToken=(.*);")[1];
if (!qlikCookie){
console.log("QSProxy# - Error in Websocket: NO qlikCookie!");
return;
}
const matchCookie = qlikCookie.match("_csrfToken=(.*);");
if (!matchCookie) {
console.log("QSProxy# - Error in Websocket: cant find _csrfToken= in qlikCookie");
return;
}
const csrfToken = matchCookie[1];
var wsConnUrl = `wss://${TENANT_DOMAIN}/app/${appId}?qlik-csrf-token=${csrfToken}`;
const qlikWebSocket = new WebSocket(

23
src/app/services/qs.service.ts
View File

@@ -31,7 +31,7 @@ export class QlikService {
}
private async _setCostData(doc, field = null, value = null) : Promise<any>{
await this._selectField(doc,field, value);
await this._selectField(doc, field, value);
const properties = this._getProperties();
const obj = await doc.createSessionObject(properties);
const layout = await obj.getLayout();
@@ -84,7 +84,18 @@ export class QlikService {
private async _getOpenApp(qsEmbed) : Promise<any> {
const refApi = await qsEmbed.getRefApi();
if ( !refApi ) {
console.log("No refApi");
return null;
}
const doc = await refApi.getDoc();
if ( !doc ) {
console.log("No Qlik doc");
return null;
}
console.log("refApi", refApi);
console.log("qsApp", doc);
doc.session.on('closed', () => {
console.log('Session was closed, clean up!');
@@ -105,15 +116,17 @@ export class QlikService {
});
await doc.clearAll();
console.log("refApi", refApi);
console.log("qsApp", doc);
return doc;
}
async setCostData( qsEmbed, currentUser, trigram, provisionId ) {
if ( !qsEmbed ) {
console.log("No qsEmbed");
return;
}
if ( provisionId ) {
if ( !this.all[provisionId] ) {
// Requesting data for a single provision

2
src/app/tables/table-provisions.component.html
View File

@@ -104,7 +104,7 @@
<button style="margin-right: 3px;" title="Abort provision" *ngIf="!provision.isDestroyed && provision.status === 'provisioning'" (click)="openConfirmAbortModal(provision)" class="lui-button lui-text-danger">
Abort
</button>
<button style="margin-right: 3px;" title="Stop" *ngIf="(provision.scenario === 'awsqmi-rds' || provision.scenario === 'azqmi-synapse' || provision.vmImage && provision.vmImage.vm1 || provision.options && provision.options.vm1) && !provision.isDestroyed && provision.status === 'provisioned' && provision.statusVms === 'Running'" (click)="openConfirmStopModal(provision)" class="lui-button">
<button style="margin-right: 3px;" title="Stop" *ngIf="(provision.scenario === 'awsqmi-rds' || provision.scenario === 'azqmi-synapse' || provision.vmImage && provision.vmImage.vm1 || provision.options && provision.options.vm1) && !provision.isDestroyed && provision.status === 'provisioned' && (provision.statusVms === 'Running' || provision.statusVms === 'N/A') " (click)="openConfirmStopModal(provision)" class="lui-button">
<span class="lui-icon lui-icon--stop" aria-hidden="true"></span>
</button>
<button style="margin-right: 3px;" title="Start" *ngIf="(provision.scenario === 'awsqmi-rds' || provision.scenario === 'azqmi-synapse' || provision.vmImage && provision.vmImage.vm1 || provision.options && provision.options.vm1) && !provision.isDestroyed && provision.status === 'provisioned' && provision.statusVms === 'Stopped'" (click)="openConfirmStartModal(provision)" class="lui-button">