-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #802 from SSWConsulting/staging
Merge Staging to Main
- Loading branch information
Showing
7 changed files
with
134 additions
and
78 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,42 @@ | ||
| const admin = require('firebase-admin'); | ||
| const { initializeApp } = require('firebase-admin/app'); | ||
| const { getFirestore } = require('firebase-admin/firestore'); | ||
| const { CONSTANTS } = require('./consts'); | ||
|
|
||
| exports.getUserIdFromApiKey = (api) => { | ||
| return admin | ||
| .firestore() | ||
| .collection(CONSTANTS.users) | ||
| .where(CONSTANTS.apiKey, '==', api) | ||
| .get() | ||
| .then((x) => (x.docs.length === 1 ? x.docs[0].id : null)); | ||
| initializeApp(); | ||
| const db = getFirestore(); | ||
|
|
||
| exports.getUserIdFromApiKey = async (api) => { | ||
| const q = db.collection(CONSTANTS.users); | ||
| const users = await q.where(CONSTANTS.apiKey, '==', api).limit(1).get(); | ||
| return users.empty ? null : users.docs[0].id; | ||
| }; | ||
|
|
||
| exports.updateLastBuild = (userId, apikey, runId) => { | ||
| return admin | ||
| .firestore() | ||
| .collection(CONSTANTS.users) | ||
| .doc(userId) | ||
| .update({ | ||
| lastBuild: new Date(), | ||
| runId, | ||
| }) | ||
| .then(() => | ||
| admin.firestore().collection(CONSTANTS.runs).doc(runId).set({ | ||
| apikey, | ||
| runId, | ||
| }) | ||
| ); | ||
| exports.updateLastBuild = async (userId, apikey, runId) => { | ||
| await db.collection(CONSTANTS.users).doc(userId).set( | ||
| { | ||
| lastBuild: new Date(), | ||
| runId, | ||
| }, | ||
| { merge: true } | ||
| ); | ||
| await db.collection(CONSTANTS.runs).doc(runId).set( | ||
| { | ||
| apikey, | ||
| runId, | ||
| }, | ||
| { merge: true } | ||
| ); | ||
| }; | ||
|
|
||
| exports.getRun = (runId) => | ||
| admin | ||
| .firestore() | ||
| .collection(CONSTANTS.runs) | ||
| .doc(runId) | ||
| .get() | ||
| .then((doc) => doc.data()); | ||
| exports.getRun = async (runId) => { | ||
| const doc = await db.collection(CONSTANTS.runs).doc(runId).get(); | ||
| return doc.data(); | ||
| }; | ||
|
|
||
| exports.getAlertEmailConfig = () => { | ||
| return admin | ||
| .firestore() | ||
| .collection(CONSTANTS.config) | ||
| .doc('alertEmailConfig') | ||
| .get() | ||
| .then((doc) => doc.data()) | ||
| }; | ||
| exports.getAlertEmailConfig = async () => { | ||
| const doc = await db | ||
| .collection(CONSTANTS.config) | ||
| .doc('alertEmailConfig') | ||
| .get(); | ||
| return doc.data(); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 16 additions & 15 deletions
31
ui/src/components/misccomponents/TooltipFromAction.svelte
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,20 @@ | ||
| <script> | ||
| export let title; | ||
| export let x; | ||
| export let y; | ||
| export let title; | ||
| export let x; | ||
| export let y; | ||
| </script> | ||
| <div style=" | ||
| top: {y + 5}px; | ||
| left: {x + 5}px;">{title}</div> | ||
|
|
||
| <div style="top: {y + 5}px; left: {x + 5}px;"> | ||
| <i class="fa-solid fa-circle-info text-blue-600"></i> {title} | ||
| </div> | ||
|
|
||
| <style> | ||
| div { | ||
| border: 1px solid #ddd; | ||
| box-shadow: 1px 1px 1px #ddd; | ||
| background: white; | ||
| border-radius: 4px; | ||
| padding: 4px; | ||
| position: absolute; | ||
| } | ||
| </style> | ||
| div { | ||
| border: 1px solid #ddd; | ||
| box-shadow: 1px 1px 1px #ddd; | ||
| background: white; | ||
| border-radius: 4px; | ||
| padding: 4px; | ||
| position: absolute; | ||
| } | ||
| </style> |