Skip to content

Commit

Permalink
feat(moderation): auto go back after marked as proceseed (#98)
Browse files Browse the repository at this point in the history
Closes #12
  • Loading branch information
douglasduteil authored Feb 27, 2024
1 parent 85a400a commit 62b2fd2
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 25 deletions.
6 changes: 5 additions & 1 deletion e2e/cypress/support/step_definitions/general.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@ Then("je vois {string}", function (text: string) {
cy.contains(text);
});

Then("je ne vois pas {string}", function (text: string) {
cy.contains(text).should("not.exist");
});

Then("je vois la ligne de table {string}", function (text: string) {
cy.contains(text).parent().as("row");
cy.contains("td", text).parent().as("row");
});

Then("sur la même ligne je vois {string}", function (text: string) {
Expand Down
7 changes: 7 additions & 0 deletions e2e/features/moderations/jean_bon_join_abracadabra.feature
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ Fonctionnalité: Moderation blockante à accepter
Quand sur la même ligne je clique sur "➡️"
Alors je vois "Jean Bon veut rejoindre l'organisation « Abracadabra » avec l’adresse [email protected]"

Alors je vois "Domain internes"
* je vois la ligne de table "yopmail.com"
* sur la même ligne je vois "❌"

Quand je clique sur le bouton "🪄 Action en un click : Envoyer l'email « Votre demande a été traitée »"
Alors je vois "Modération traitée"
* je vois "Cette modération a été marqué comme traitée le"

Alors je vois "Liste des moderations"
Alors je ne vois pas "51935970700022"
12 changes: 6 additions & 6 deletions packages/~/infra/moncomptepro/database/src/seed/delete.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,25 @@ import type { MonComptePro_PgDatabase } from "../index";
export async function delete_database(db: MonComptePro_PgDatabase) {
try {
const users_organizations = await db.delete(schema.users_organizations);
consola.info(
consola.verbose(
`🚮 ${users_organizations.command} ${users_organizations.rowCount} users_organizations`,
);
const users_oidc_clients = await db.delete(schema.users_oidc_clients);
consola.info(
consola.verbose(
`🚮 ${users_oidc_clients.command} ${users_oidc_clients.rowCount} users_oidc_clients`,
);
const oidc_clients = await db.delete(schema.oidc_clients);
consola.info(
consola.verbose(
`🚮 ${oidc_clients.command} ${oidc_clients.rowCount} oidc_clients`,
);
const users = await db.delete(schema.users);
consola.info(`🚮 ${users.command} ${users.rowCount} users`);
consola.verbose(`🚮 ${users.command} ${users.rowCount} users`);
const organizations = await db.delete(schema.organizations);
consola.info(
consola.verbose(
`🚮 ${organizations.command} ${organizations.rowCount} organizations`,
);
const moderations = await db.delete(schema.moderations);
consola.info(
consola.verbose(
`🚮 ${moderations.command} ${moderations.rowCount} moderations`,
);
} catch (err) {
Expand Down
36 changes: 19 additions & 17 deletions packages/~/infra/moncomptepro/database/src/seed/insert.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,44 +10,46 @@ import type { MCP_Moderation } from "../moncomptepro";
export async function insert_database(db: MonComptePro_PgDatabase) {
try {
const raphael = await insert_raphael(db);
consola.info(`🌱 INSERT user ${raphael.given_name} ${raphael.family_name}`);
consola.verbose(
`🌱 INSERT user ${raphael.given_name} ${raphael.family_name}`,
);
const jean_bon = await insert_jeanbon(db);
consola.info(
consola.verbose(
`🌱 INSERT user ${jean_bon.given_name} ${jean_bon.family_name}`,
);
const pierre_bon = await insert_pierrebon(db);
consola.info(
consola.verbose(
`🌱 INSERT user ${pierre_bon.given_name} ${pierre_bon.family_name}`,
);
const richard_bon = await insert_richardbon(db);
consola.info(
consola.verbose(
`🌱 INSERT user ${richard_bon.given_name} ${richard_bon.family_name}`,
);
const marie_bon = await insert_mariebon(db);
consola.info(
consola.verbose(
`🌱 INSERT user ${marie_bon.given_name} ${marie_bon.family_name}`,
);

//

const dinum = await insert_dinum(db);
consola.info(`🌱 INSERT organization ${dinum.cached_nom_complet}`);
consola.verbose(`🌱 INSERT organization ${dinum.cached_nom_complet}`);
const aldp = await insert_aldp(db);
consola.info(`🌱 INSERT organization ${aldp.cached_nom_complet}`);
consola.verbose(`🌱 INSERT organization ${aldp.cached_nom_complet}`);
const abracadabra = await insert_abracadabra(db);
consola.info(`🌱 INSERT organization ${abracadabra.cached_nom_complet}`);
consola.verbose(`🌱 INSERT organization ${abracadabra.cached_nom_complet}`);
const dengi = await insert_dengi(db);
consola.info(`🌱 INSERT organization ${dengi.cached_nom_complet}`);
consola.verbose(`🌱 INSERT organization ${dengi.cached_nom_complet}`);
const bosch = await insert_bosch(db);
consola.info(`🌱 INSERT organization ${bosch.cached_nom_complet}`);
consola.verbose(`🌱 INSERT organization ${bosch.cached_nom_complet}`);

//

const raphael_dinum = await insert_users_organizations(db, {
organization_id: dinum.id,
user_id: raphael.id,
});
consola.info(
consola.verbose(
`🌱 ${raphael_dinum.command} ${raphael_dinum.rowCount} ${raphael.given_name} join ${dinum.cached_libelle}`,
);

Expand All @@ -58,7 +60,7 @@ export async function insert_database(db: MonComptePro_PgDatabase) {
type: "organization_join_block" as MCP_Moderation["type"],
user_id: jean_bon.id,
});
consola.info(
consola.verbose(
`🌱 ${jeanbon_dinum.command} ${jeanbon_dinum.rowCount} ${jean_bon.given_name} wants to join ${dinum.cached_libelle}`,
);

Expand All @@ -67,7 +69,7 @@ export async function insert_database(db: MonComptePro_PgDatabase) {
type: "organization_join_block" as MCP_Moderation["type"],
user_id: jean_bon.id,
});
consola.info(
consola.verbose(
`🌱 ${jeanbon_abracadabra.command} ${jeanbon_abracadabra.rowCount} ${jean_bon.given_name} wants to join ${abracadabra.cached_libelle}`,
);

Expand All @@ -76,7 +78,7 @@ export async function insert_database(db: MonComptePro_PgDatabase) {
type: "big_organization_join" as MCP_Moderation["type"],
user_id: pierre_bon.id,
});
consola.info(
consola.verbose(
`🌱 ${pierrebon_aldp.command} ${pierrebon_aldp.rowCount} ${pierre_bon.family_name} wants to join ${aldp.cached_libelle}`,
);

Expand All @@ -86,7 +88,7 @@ export async function insert_database(db: MonComptePro_PgDatabase) {
user_id: richard_bon.id,
moderated_at: new Date("2023-06-22 14:34:34"),
});
consola.info(
consola.verbose(
`🌱 ${richard_bon_dengi.command} ${richard_bon_dengi.rowCount} ${richard_bon.given_name} wants to join ${dengi.cached_nom_complet}`,
);

Expand All @@ -95,7 +97,7 @@ export async function insert_database(db: MonComptePro_PgDatabase) {
type: "organization_join_block" as MCP_Moderation["type"],
user_id: richard_bon.id,
});
consola.info(
consola.verbose(
`🌱 ${richard_bon_dengi_bis.command} ${richard_bon_dengi_bis.rowCount} ${richard_bon.given_name} wants to join ${dengi.cached_nom_complet} again...`,
);

Expand All @@ -104,7 +106,7 @@ export async function insert_database(db: MonComptePro_PgDatabase) {
type: "non_verified_domain" as MCP_Moderation["type"],
user_id: marie_bon.id,
});
consola.info(
consola.verbose(
`🌱 ${marie_bon_dengi_bis.command} ${marie_bon_dengi_bis.rowCount} ${marie_bon.given_name} wants to join ${bosch.cached_nom_complet} again...`,
);
} catch (err) {
Expand Down
4 changes: 3 additions & 1 deletion packages/~/moderations/api/src/:id/03.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@ function SendModerationProcessedEmail() {
wait for ${Htmx_Events.enum.afterOnLoad} from :form
go to the top of body smoothly
wait 1s
go back
`}
class={button({ intent: "dark" })}
disabled={disabled}
Expand Down Expand Up @@ -317,9 +318,10 @@ function MarkModerationProcessed() {
toggle @disabled until ${Htmx_Events.enum.afterOnLoad} from :form
on click
wait for ${Htmx_Events.enum.afterOnLoad} from :form
wait 0.33s
wait 1s
go to the top of body smoothly
wait 1s
go back
`}
class={button({ intent: "dark" })}
>
Expand Down

0 comments on commit 62b2fd2

Please sign in to comment.