Compare commits

...

2 Commits

3 changed files with 35 additions and 12 deletions

View File

@ -1147,6 +1147,8 @@ export default {
opacity: 0 opacity: 0
}); });
g.addChild(g_label); g.addChild(g_label);
// when we are re-setting the entitie (e.g. arfter one entity moved) also check the detail zoom and apply correct dim
g_label.opacity = -2 + this.detailsZoomValue;
g_label.sendToBack(); g_label.sendToBack();
// for (let i = 0; i < this.entites.length; i++) { // for (let i = 0; i < this.entites.length; i++) {
for (let i = 0; i < this.concernement.revisions_byid[this.active_revision].entites.length; i++) { for (let i = 0; i < this.concernement.revisions_byid[this.active_revision].entites.length; i++) {
@ -1236,6 +1238,7 @@ export default {
label.addChild(label_bg); label.addChild(label_bg);
label_txt.insertAbove(label_bg); label_txt.insertAbove(label_bg);
label_click_zone.insertAbove(label_txt); label_click_zone.insertAbove(label_txt);
label.scale(this.scale);
// label.sendToBack(); // label.sendToBack();
g_label.addChild(label); g_label.addChild(label);
@ -2247,17 +2250,20 @@ export default {
} }
}) })
} }
let labels_group = this.paper_main_object.children['entites'].children['entites_labels']; if (this.paper_main_object.children && this.paper_main_object.children['entites']) {
if (labels_group) { let labels_group = this.paper_main_object.children['entites'].children['entites_labels'];
labels_group.children.forEach((item) => { if (labels_group) {
if (this.opened_entite_id && item.item_id === parseInt(this.opened_entite_id) && item.item_type !== 'entite_hidden') { labels_group.children.forEach((item) => {
item.bringToFront(); if (this.opened_entite_id && item.item_id === parseInt(this.opened_entite_id) && item.item_type !== 'entite_hidden') {
item.children[0].strokeColor = "#01ffe2"; item.bringToFront();
}else{ item.children[0].strokeColor = "#01ffe2";
// item.children[0].strokeColor = "#fff"; }else{
} // item.children[0].strokeColor = "#fff";
}) }
})
}
} }
} }
@ -2749,7 +2755,7 @@ export default {
this.recordNewEntitePos(pid, af, mm, p) this.recordNewEntitePos(pid, af, mm, p)
.then((parag) => { .then((parag) => {
// then reload value // then reload value
// redrawing entites is handle by watch concernement.entites // redrawing entites is handled by watch concernement.entites
this.reloadConcernementEntites(this.concernement.id) this.reloadConcernementEntites(this.concernement.id)
.then(() => { .then(() => {
this.wait = false; this.wait = false;

View File

@ -38,6 +38,7 @@ Sentry.init({
normalizeDepth: 10, // Or however deep you want your state context to be. normalizeDepth: 10, // Or however deep you want your state context to be.
environment: "prod", environment: "prod",
// release : '1' // release : '1'
release: __SENTRY_RELEASE__
}); });
const pinia = createPinia() const pinia = createPinia()

View File

@ -6,9 +6,21 @@ import graphql from '@rollup/plugin-graphql';
import { viteRequire } from 'vite-require' import { viteRequire } from 'vite-require'
import svgLoader from 'vite-svg-loader' import svgLoader from 'vite-svg-loader'
import { sentryVitePlugin } from "@sentry/vite-plugin"; import { sentryVitePlugin } from "@sentry/vite-plugin";
import { execSync } from 'child_process'
require('dotenv').config(); require('dotenv').config();
// Get short Git commit hash
function getGitCommitHash() {
try {
return execSync('git rev-parse --short HEAD').toString().trim()
} catch (e) {
console.warn('Could not retrieve Git commit hash')
return 'unknown'
}
}
const release = `ouatterrir@${getGitCommitHash()}`
// https://vitejs.dev/config/ // https://vitejs.dev/config/
export default defineConfig({ export default defineConfig({
plugins: [vue({ plugins: [vue({
@ -23,7 +35,8 @@ export default defineConfig({
project: "atlas-atterrissage.com", project: "atlas-atterrissage.com",
authToken: process.env.AUTH_TOKEN, authToken: process.env.AUTH_TOKEN,
release: { release: {
name: "ouatterrir", // name: "ouatterrir",
name: release
}, },
url: "https://frontlog.figli.io", url: "https://frontlog.figli.io",
}) })
@ -58,4 +71,7 @@ export default defineConfig({
esbuild: { esbuild: {
drop: ['console', 'debugger'], drop: ['console', 'debugger'],
}, },
define: {
__SENTRY_RELEASE__: JSON.stringify(release),
}
}) })