MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4970 from Budibase/fix/analytics-cleanup 

updating analytics endpoint, removing old NPS survey
This commit is contained in:
Martin McKeaveney 2022-03-22 16:34:25 +00:00 committed by GitHub
parent f3615cd69d 0f4c0f3ed4
commit 5fc7cf7cb4
5 changed files with 6 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

171
packages/builder/src/components/feedback/NPSFeedbackForm.svelte
View File

@ -1,171 +0,0 @@
<script>
import analytics from "analytics"
import { createEventDispatcher } from "svelte"
import { fade, fly } from "svelte/transition"
import {
ActionButton,
ClearButton,
RadioGroup,
TextArea,
ButtonGroup,
Button,
Heading,
Detail,
Divider,
Layout,
notifications,
} from "@budibase/bbui"
import { auth } from "stores/portal"
let step = 0
let ratings = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
let options = [
"Importing / managing data",
"Designing",
"Automations",
"Managing users / groups",
"Deployment / hosting",
"Documentation",
]
const dispatch = createEventDispatcher()
// Data to send off
let rating
let improvements = ""
let comment = ""
function selectNumber(n) {
rating = n
step = 1
}
function submitFeedback() {
analytics.submitFeedback({
rating,
improvements,
comment,
})
try {
auth.updateSelf({
flags: {
feedbackSubmitted: true,
},
})
} catch (error) {
notifications.error("Error updating user")
}
dispatch("complete")
}
function cancelFeedback() {
try {
auth.updateSelf({
flags: {
feedbackSubmitted: true,
},
})
} catch (error) {
notifications.error("Error updating user")
}
dispatch("complete")
}
</script>
<div
class="position"
in:fade={{ duration: 200 }}
out:fade|local={{ duration: 200 }}
>
<div
class="feedback-frame"
in:fly={{ y: 30, duration: 200 }}
out:fly|local={{ y: 30, duration: 200 }}
>
<div class="close">
<ClearButton on:click={cancelFeedback} />
</div>
<Layout gap="XS">
{#if step === 0}
<Heading size="XS"
>How likely are you to recommend Budibase to a colleague?</Heading
>
<Divider />
<div class="ratings">
{#each ratings as number}
<ActionButton
size="L"
emphasized
selected={number === rating}
on:click={() => selectNumber(number)}
>
{number}
</ActionButton>
{/each}
</div>
<div class="footer">
<Detail size="S">NOT LIKELY</Detail>
<Detail size="S">EXTREMELY LIKELY</Detail>
</div>
{:else if step === 1}
<Heading size="XS">What could be improved most in Budibase?</Heading>
<Divider />
<RadioGroup bind:value={improvements} {options} />
<div class="footer">
<Detail size="S">STEP 2 OF 3</Detail>
<ButtonGroup>
<Button secondary on:click={() => (step -= 1)}>Previous</Button>
<Button primary on:click={() => (step += 1)}>Next</Button>
</ButtonGroup>
</div>
{:else}
<Heading size="XS">How can we improve your experience?</Heading>
<Divider />
<TextArea bind:value={comment} placeholder="Add comments" />
<div class="footer">
<Detail size="S">STEP 3 OF 3</Detail>
<ButtonGroup>
<Button secondary on:click={() => (step -= 1)}>Previous</Button>
<Button cta on:click={submitFeedback}>Complete</Button>
</ButtonGroup>
</div>
{/if}
</Layout>
</div>
</div>
<style>
.feedback-frame :global(textarea) {
min-height: 180px !important;
}
.position {
position: absolute;
right: var(--spacing-l);
bottom: calc(5 * var(--spacing-xl));
}
.feedback-frame {
position: absolute;
bottom: 0;
right: 0;
min-width: 510px;
background: var(--background);
border-radius: var(--spectrum-global-dimension-size-50);
border: 2px solid var(--spectrum-global-color-blue-400);
padding: var(--spacing-xl);
}
.ratings {
display: flex;
justify-content: space-between;
}
.close {
position: absolute;
top: 0;
right: 0;
}
.footer {
display: flex;
justify-content: space-between;
align-items: center;
}
</style>

9
packages/builder/src/pages/builder/app/[application]/_layout.svelte
View File

@ -5,7 +5,6 @@
import DeployModal from "components/deploy/DeployModal.svelte"
import RevertModal from "components/deploy/RevertModal.svelte"
import VersionModal from "components/deploy/VersionModal.svelte"
import NPSFeedbackForm from "components/feedback/NPSFeedbackForm.svelte"
import { API } from "api"
import { auth, admin } from "stores/portal"
import { isActive, goto, layout, redirect } from "@roxi/routify"
@ -21,15 +20,11 @@
// Sync once when you load the app
let hasSynced = false
let userShouldPostFeedback = false
$: selected = capitalise(
$layout.children.find(layout => $isActive(layout.path))?.title ?? "data"
)
function previewApp() {
if (!$auth?.user?.flags?.feedbackSubmitted) {
userShouldPostFeedback = true
}
window.open(`/${application}`)
}
@ -126,10 +121,6 @@
<p>Something went wrong: {error.message}</p>
{/await}
{#if userShouldPostFeedback}
<NPSFeedbackForm on:complete={() => (userShouldPostFeedback = false)} />
{/if}
<style>
.loading {
min-height: 100%;

4
packages/frontend-core/src/api/analytics.js
View File

@ -4,7 +4,7 @@ export const buildAnalyticsEndpoints = API => ({
*/
pingEndUser: async () => {
return await API.post({
url: `/api/analytics/ping`,
url: `/api/bbtel/ping`,
})
},
@ -13,7 +13,7 @@ export const buildAnalyticsEndpoints = API => ({
*/
getAnalyticsStatus: async () => {
return await API.get({
url: "/api/analytics",
url: "/api/bbtel",
})
},
})

4
packages/server/src/api/routes/analytics.js
View File

@ -4,7 +4,7 @@ const controller = require("../controllers/analytics")
const router = Router()
router
.get("/api/analytics", controller.isEnabled)
.post("/api/analytics/ping", controller.endUserPing)
.get("/api/bbtel", controller.isEnabled)
.post("/api/bbtel/ping", controller.endUserPing)
module.exports = router

4
packages/server/src/api/routes/tests/misc.spec.js
View File

@ -11,10 +11,10 @@ describe("run misc tests", () => {
await config.init()
})
describe("/analytics", () => {
describe("/bbtel", () => {
it("check if analytics enabled", async () => {
const res = await request
.get(`/api/analytics`)
.get(`/api/bbtel`)
.set(config.defaultHeaders())
.expect("Content-Type", /json/)
.expect(200)