Skip to content

Commit e768f60

Browse files
committed
refactor: improve Docker build output and enhance password change notifications
1 parent e248887 commit e768f60

File tree

4 files changed

+79
-26
lines changed

4 files changed

+79
-26
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ help:
3131
| sort | awk 'BEGIN {FS = ":.*?## "}; {printf " \033[32m%-15s\033[0m %s\n", $$1, $$2}'
3232

3333
build: ## Build the container
34-
@docker build --platform $(PLATFORM) -t $(IMG_NAME) --no-cache .
34+
@docker build --platform $(PLATFORM) -t $(IMG_NAME) --no-cache --progress=plain .
3535

3636
simulation: ## Start production environment in simulation mode
3737
@docker run --rm -it \

apps/web/src/pages/identities/fusion.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@ q-page.container
100100
</template>
101101

102102
<script lang="ts">
103-
import { c } from 'openapi-typescript'
104-
105103
export default defineNuxtComponent({
106104
name: 'IdentitiesFusionPage',
107105
data() {

apps/web/src/pages/identities/table/[_id]/index.vue

Lines changed: 39 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -241,11 +241,12 @@ export default defineNuxtComponent({
241241
})
242242
243243
this.$q.notify({
244-
message: 'Le mot de passe a été changé : ',
244+
message: `Le mot de passe de <${this.identity.inetOrgPerson.uid}> a été changé !`,
245245
color: 'positive',
246246
position: 'top-right',
247247
icon: 'mdi-check-circle-outline',
248248
})
249+
this.refresh()
249250
} catch (error: any) {
250251
this.$q.notify({
251252
message: 'Impossible de modifier le mot de passe : ' + error.response._data.message,
@@ -275,7 +276,7 @@ export default defineNuxtComponent({
275276
})
276277
.onOk(async () => {
277278
try {
278-
const data = await this.$http.post('/management/identities/needtochangepassword', {
279+
await this.$http.post('/management/identities/needtochangepassword', {
279280
body: JSON.stringify({ id: this.identity._id }),
280281
})
281282
this.$q.notify({
@@ -296,28 +297,44 @@ export default defineNuxtComponent({
296297
})
297298
},
298299
async sendInit() {
299-
const {
300-
data: result,
301-
pending,
302-
error,
303-
refresh,
304-
} = await useHttp(`/management/passwd/init`, {
305-
method: 'POST',
306-
body: { uid: this.identity.inetOrgPerson.uid },
307-
})
308-
if (error.value) {
309-
handleError({
310-
error: error.value,
311-
message: "Erreur lors de l'envoi du mail",
300+
this.$q
301+
.dialog({
302+
title: 'Confirmation',
303+
message: `Voulez vous envoyer le mail d'invitation <${this.identity.inetOrgPerson.uid}> ?`,
304+
persistent: true,
305+
ok: {
306+
push: true,
307+
color: 'positive',
308+
label: 'Envoyer',
309+
},
310+
cancel: {
311+
push: true,
312+
color: 'negative',
313+
label: 'Annuler',
314+
},
312315
})
313-
} else {
314-
this.$q.notify({
315-
message: 'Le mail a été envoyé',
316-
color: 'positive',
317-
position: 'top-right',
318-
icon: 'mdi-check-circle-outline',
316+
.onOk(async () => {
317+
try {
318+
await this.$http.post('/management/passwd/init', {
319+
method: 'POST',
320+
body: JSON.stringify({ uid: this.identity.inetOrgPerson.uid }),
321+
})
322+
this.$q.notify({
323+
message: 'Le mail a été envoyé',
324+
color: 'positive',
325+
position: 'top-right',
326+
icon: 'mdi-check-circle-outline',
327+
})
328+
this.refresh()
329+
} catch (e: any) {
330+
this.$q.notify({
331+
message: "Erreur lors de l'envoi du mail : " + e.response._data.message,
332+
color: 'negative',
333+
position: 'top-right',
334+
icon: 'mdi-alert-circle-outline',
335+
})
336+
}
319337
})
320-
}
321338
},
322339
async switchAccountStatus() {
323340
let bouton = ''

yarn.lock

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8521,6 +8521,11 @@ duplexer@^0.1.2:
85218521
resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
85228522
integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
85238523

8524+
eastasianwidth@^0.2.0:
8525+
version "0.2.0"
8526+
resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
8527+
integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
8528+
85248529
ecdsa-sig-formatter@1.0.11:
85258530
version "1.0.11"
85268531
resolved "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz"
@@ -8560,11 +8565,21 @@ emittery@^0.13.1:
85608565
resolved "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz"
85618566
integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==
85628567

8568+
emoji-regex@^10.3.0:
8569+
version "10.6.0"
8570+
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.6.0.tgz#bf3d6e8f7f8fd22a65d9703475bc0147357a6b0d"
8571+
integrity sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==
8572+
85638573
emoji-regex@^8.0.0:
85648574
version "8.0.0"
85658575
resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
85668576
integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
85678577

8578+
emoji-regex@^9.2.2:
8579+
version "9.2.2"
8580+
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
8581+
integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
8582+
85688583
enabled@2.0.x:
85698584
version "2.0.0"
85708585
resolved "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz"
@@ -9694,6 +9709,11 @@ get-caller-file@^2.0.5:
96949709
resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"
96959710
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
96969711

9712+
get-east-asian-width@^1.0.0:
9713+
version "1.4.0"
9714+
resolved "https://registry.yarnpkg.com/get-east-asian-width/-/get-east-asian-width-1.4.0.tgz#9bc4caa131702b4b61729cb7e42735bc550c9ee6"
9715+
integrity sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q==
9716+
96979717
get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@^1.3.0:
96989718
version "1.3.0"
96999719
resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz"
@@ -15222,7 +15242,7 @@ string-length@^4.0.1:
1522215242
is-fullwidth-code-point "^3.0.0"
1522315243
strip-ansi "^6.0.1"
1522415244

15225-
"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3, string-width@^5.0.1, string-width@^5.1.2, string-width@^7.2.0:
15245+
string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
1522615246
version "4.2.3"
1522715247
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
1522815248
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -15231,6 +15251,24 @@ string-length@^4.0.1:
1523115251
is-fullwidth-code-point "^3.0.0"
1523215252
strip-ansi "^6.0.1"
1523315253

15254+
string-width@^5.0.1, string-width@^5.1.2:
15255+
version "5.1.2"
15256+
resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
15257+
integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
15258+
dependencies:
15259+
eastasianwidth "^0.2.0"
15260+
emoji-regex "^9.2.2"
15261+
strip-ansi "^7.0.1"
15262+
15263+
string-width@^7.2.0:
15264+
version "7.2.0"
15265+
resolved "https://registry.yarnpkg.com/string-width/-/string-width-7.2.0.tgz#b5bb8e2165ce275d4d43476dd2700ad9091db6dc"
15266+
integrity sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==
15267+
dependencies:
15268+
emoji-regex "^10.3.0"
15269+
get-east-asian-width "^1.0.0"
15270+
strip-ansi "^7.1.0"
15271+
1523415272
string_decoder@^1.1.1, string_decoder@^1.3.0:
1523515273
version "1.3.0"
1523615274
resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"

0 commit comments

Comments
 (0)