SocialGouv
diff --git a/‎package.json‎
Lines changed: 1 addition & 0 deletions b/‎package.json‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎packages/code-du-travail-frontend/app/convention-collective/page.tsx‎
Lines changed: 11 additions & 5 deletions b/‎packages/code-du-travail-frontend/app/convention-collective/page.tsx‎
Lines changed: 11 additions & 5 deletions
diff --git a/‎packages/code-du-travail-frontend/app/outils/convention-collective/convention/page.tsx‎
Lines changed: 45 additions & 0 deletions b/‎packages/code-du-travail-frontend/app/outils/convention-collective/convention/page.tsx‎
Lines changed: 45 additions & 0 deletions
diff --git a/‎packages/code-du-travail-frontend/app/outils/convention-collective/entreprise/[slug]/page.tsx‎
Lines changed: 58 additions & 0 deletions b/‎packages/code-du-travail-frontend/app/outils/convention-collective/entreprise/[slug]/page.tsx‎
Lines changed: 58 additions & 0 deletions
diff --git a/‎packages/code-du-travail-frontend/app/outils/convention-collective/entreprise/page.tsx‎
Lines changed: 47 additions & 0 deletions b/‎packages/code-du-travail-frontend/app/outils/convention-collective/entreprise/page.tsx‎
Lines changed: 47 additions & 0 deletions
diff --git a/‎packages/code-du-travail-frontend/app/outils/convention-collective/page.tsx‎
Lines changed: 47 additions & 0 deletions b/‎packages/code-du-travail-frontend/app/outils/convention-collective/page.tsx‎
Lines changed: 47 additions & 0 deletions
diff --git a/‎packages/code-du-travail-frontend/app/widgets/convention-collective/entreprise/[slug]/page.tsx‎
Lines changed: 46 additions & 0 deletions b/‎packages/code-du-travail-frontend/app/widgets/convention-collective/entreprise/[slug]/page.tsx‎
Lines changed: 46 additions & 0 deletions
diff --git a/‎packages/code-du-travail-frontend/app/widgets/convention-collective/page.tsx‎
Lines changed: 42 additions & 0 deletions b/‎packages/code-du-travail-frontend/app/widgets/convention-collective/page.tsx‎
Lines changed: 42 additions & 0 deletions
diff --git a/‎packages/code-du-travail-frontend/cypress/integration/light/integration-convention-collective.spec.ts‎
Lines changed: 18 additions & 18 deletions b/‎packages/code-du-travail-frontend/cypress/integration/light/integration-convention-collective.spec.ts‎
Lines changed: 18 additions & 18 deletions
@@ -45,6 +45,7 @@
     "url": "https://github.com/SocialGouv/code-du-travail-numerique/issues"
   },
   "devDependencies": {
+    "cypress-iframe": "^1.0.1",
     "husky": "^9.1.6",
     "lerna": "8.1.8"
   },
 
@@ -3,24 +3,30 @@ import {
   Agreements,
   AgreementsPerLetter,
 } from "../../src/modules/convention-collective/Agreements";
-import { fetchAgreements } from "../../src/modules/convention-collective";
+import { fetchAllAgreements } from "../../src/modules/convention-collective";
 import { generateDefaultMetadata } from "../../src/modules/common/metas";
+import { notFound } from "next/navigation";
+import { SITE_URL } from "../../src/config";
 
 export const metadata = generateDefaultMetadata({
   title: "Votre convention collective",
   description:
     "Retrouvez les questions/réponses fréquentes organisées par thème pour votre convention collective",
   path: "/convention-collective",
+  overrideCanonical: `{${SITE_URL}/outils/convention-collective}`,
 });
 
 const removeAccents = (text: string) =>
   text.normalize("NFD").replace(/[\u0300-\u036f]/g, "");
 
 async function AgreementPage() {
-  const agreements = await fetchAgreements(
-    ["slug", "shortTitle"],
-    "shortTitle"
-  );
+  const agreements = await fetchAllAgreements({
+    fields: ["slug", "shortTitle"],
+    sortBy: "shortTitle",
+  });
+  if (!agreements.length) {
+    return notFound();
+  }
   const firstLettersAgreements = agreements.reduce<AgreementsPerLetter>(
     (agreementPerletter, agreement) => {
       const { shortTitle } = agreement;
 
@@ -0,0 +1,45 @@
+import { DsfrLayout } from "../../../../src/modules/layout";
+import { DocumentElasticResult } from "../../../../src/modules/documents";
+import { fetchTool, FindAgreementLayout } from "../../../../src/modules/outils";
+import { notFound } from "next/navigation";
+import { generateDefaultMetadata } from "../../../../src/modules/common/metas";
+import { ElasticTool } from "../../../../src/modules/outils/type";
+import { AgreementSearch } from "../../../../src/modules/convention-collective";
+import { agreementRelatedItems } from "../../../../src/modules/convention-collective/agreementRelatedItems";
+import { SITE_URL } from "../../../../src/config";
+
+export async function generateMetadata() {
+  const { title, description } = await getTool();
+
+  return generateDefaultMetadata({
+    title: `Simulateur - ${title}`,
+    description: description,
+    path: `${SITE_URL}/outils/convention-collective/convention`,
+    overrideCanonical: `${SITE_URL}/outils/convention-collective`,
+  });
+}
+
+async function FindAgreementByNamePage() {
+  const tool = await getTool();
+  return (
+    <DsfrLayout>
+      <FindAgreementLayout
+        relatedItems={agreementRelatedItems}
+        description={tool.description}
+      >
+        <AgreementSearch />
+      </FindAgreementLayout>
+    </DsfrLayout>
+  );
+}
+
+const getTool = async () => {
+  const tool = await fetchTool("convention-collective");
+
+  if (!tool) {
+    return notFound();
+  }
+  return tool;
+};
+
+export default FindAgreementByNamePage;
@@ -0,0 +1,58 @@
+import { DsfrLayout } from "../../../../../src/modules/layout";
+import { DocumentElasticResult } from "../../../../../src/modules/documents";
+import {
+  fetchTool,
+  FindAgreementLayout,
+} from "../../../../../src/modules/outils";
+import { notFound } from "next/navigation";
+import { generateDefaultMetadata } from "../../../../../src/modules/common/metas";
+import { ElasticTool } from "../../../../../src/modules/outils/type";
+import { EnterpriseAgreementSelection } from "../../../../../src/modules/enterprise";
+import { searchEnterprises } from "../../../../../src/modules/enterprise/queries";
+import { agreementRelatedItems } from "../../../../../src/modules/convention-collective/agreementRelatedItems";
+import { SITE_URL } from "../../../../../src/config";
+
+export async function generateMetadata({ params }) {
+  const { title, description } = await getTool();
+
+  return generateDefaultMetadata({
+    title: `Simulateur - ${title}`,
+    description: description,
+    path: `${SITE_URL}/outils/convention-collective/selection/${params.slug}`,
+    overrideCanonical: `${SITE_URL}/outils/convention-collective`,
+  });
+}
+
+async function AgreementSelectionPage({ params }) {
+  const [enterprise] = await searchEnterprises({
+    query: params.slug,
+  });
+  if (!enterprise) {
+    return notFound();
+  }
+  const tool = await getTool();
+  return (
+    <DsfrLayout>
+      <meta name="robots" content="noindex,nofollow" />
+      <FindAgreementLayout
+        relatedItems={agreementRelatedItems}
+        description={tool.description}
+      >
+        <EnterpriseAgreementSelection enterprise={enterprise} />
+      </FindAgreementLayout>
+    </DsfrLayout>
+  );
+}
+
+const getTool = async () => {
+  const tool: DocumentElasticResult<ElasticTool> = await fetchTool(
+    "convention-collective"
+  );
+
+  if (!tool) {
+    return notFound();
+  }
+  return tool;
+};
+
+export default AgreementSelectionPage;
@@ -0,0 +1,47 @@
+import { DsfrLayout } from "../../../../src/modules/layout";
+import { DocumentElasticResult } from "../../../../src/modules/documents";
+import { fetchTool, FindAgreementLayout } from "../../../../src/modules/outils";
+import { notFound } from "next/navigation";
+import { generateDefaultMetadata } from "../../../../src/modules/common/metas";
+import { ElasticTool } from "../../../../src/modules/outils/type";
+import { EnterpriseAgreementSearch } from "../../../../src/modules/enterprise";
+import { agreementRelatedItems } from "../../../../src/modules/convention-collective/agreementRelatedItems";
+import { SITE_URL } from "../../../../src/config";
+
+export async function generateMetadata() {
+  const { title, description } = await getTool();
+
+  return generateDefaultMetadata({
+    title: `Simulateur - ${title}`,
+    description: description,
+    path: `${SITE_URL}/outils/convention-collective/entreprise`,
+    overrideCanonical: `${SITE_URL}/outils/convention-collective`,
+  });
+}
+
+async function FindAgreementByEnterprisePage() {
+  const tool = await getTool();
+  return (
+    <DsfrLayout>
+      <FindAgreementLayout
+        relatedItems={agreementRelatedItems}
+        description={tool.description}
+      >
+        <EnterpriseAgreementSearch />
+      </FindAgreementLayout>
+    </DsfrLayout>
+  );
+}
+
+const getTool = async () => {
+  const tool: DocumentElasticResult<ElasticTool> = await fetchTool(
+    "convention-collective"
+  );
+
+  if (!tool) {
+    return notFound();
+  }
+  return tool;
+};
+
+export default FindAgreementByEnterprisePage;
@@ -0,0 +1,47 @@
+import { DsfrLayout } from "../../../src/modules/layout";
+import { DocumentElasticResult } from "../../../src/modules/documents";
+import { fetchTool, FindAgreementLayout } from "../../../src/modules/outils";
+import { notFound } from "next/navigation";
+import { generateDefaultMetadata } from "../../../src/modules/common/metas";
+import { ElasticTool } from "../../../src/modules/outils/type";
+import { AgreementSearchIntro } from "../../../src/modules/convention-collective";
+import { agreementRelatedItems } from "../../../src/modules/convention-collective/agreementRelatedItems";
+import { SITE_URL } from "../../../src/config";
+
+export async function generateMetadata() {
+  const { title, description } = await getTool();
+
+  return generateDefaultMetadata({
+    title: `Simulateur - ${title}`,
+    description: description,
+    path: `/outils/convention-collective`,
+    overrideCanonical: `${SITE_URL}/outils/convention-collective`,
+  });
+}
+
+async function FindAgreementPage() {
+  const tool = await getTool();
+  return (
+    <DsfrLayout>
+      <FindAgreementLayout
+        relatedItems={agreementRelatedItems}
+        description={tool.description}
+      >
+        <AgreementSearchIntro />
+      </FindAgreementLayout>
+    </DsfrLayout>
+  );
+}
+
+const getTool = async () => {
+  const tool: DocumentElasticResult<ElasticTool> = await fetchTool(
+    "convention-collective"
+  );
+
+  if (!tool) {
+    return notFound();
+  }
+  return tool;
+};
+
+export default FindAgreementPage;
@@ -0,0 +1,46 @@
+import { DocumentElasticResult } from "../../../../../src/modules/documents";
+import {
+  fetchTool,
+  FindAgreementWidgetLayout,
+} from "../../../../../src/modules/outils";
+import { notFound } from "next/navigation";
+import { generateDefaultMetadata } from "../../../../../src/modules/common/metas";
+import { ElasticTool } from "../../../../../src/modules/outils/type";
+import { EnterpriseAgreementSelection } from "../../../../../src/modules/enterprise";
+import { searchEnterprises } from "../../../../../src/modules/enterprise/queries";
+import { SITE_URL } from "../../../../../src/config";
+
+export async function generateMetadata({ params }) {
+  const { title, description } = await getTool();
+
+  return generateDefaultMetadata({
+    title: `Simulateur - ${title}`,
+    description: description,
+    path: `${SITE_URL}/widgets/convention-collective/selection/${params.slug}`,
+    overrideCanonical: `${SITE_URL}/outils/convention-collective`,
+  });
+}
+
+async function AgreementSelectionPage({ params }) {
+  const [enterprise] = await searchEnterprises({
+    query: params.slug,
+  });
+  return (
+    <FindAgreementWidgetLayout>
+      <EnterpriseAgreementSelection enterprise={enterprise} widgetMode />
+    </FindAgreementWidgetLayout>
+  );
+}
+
+const getTool = async () => {
+  const tool: DocumentElasticResult<ElasticTool> = await fetchTool(
+    "convention-collective"
+  );
+
+  if (!tool) {
+    return notFound();
+  }
+  return tool;
+};
+
+export default AgreementSelectionPage;
@@ -0,0 +1,42 @@
+import { DocumentElasticResult } from "../../../src/modules/documents";
+import {
+  fetchTool,
+  FindAgreementWidgetLayout,
+} from "../../../src/modules/outils";
+import { notFound } from "next/navigation";
+import { generateDefaultMetadata } from "../../../src/modules/common/metas";
+import { ElasticTool } from "../../../src/modules/outils/type";
+import { EnterpriseAgreementSearch } from "../../../src/modules/enterprise";
+import { SITE_URL } from "../../../src/config";
+
+export async function generateMetadata() {
+  const { title, description } = await getTool();
+
+  return generateDefaultMetadata({
+    title: `Simulateur - ${title}`,
+    description: description,
+    path: `${SITE_URL}/widgets/convention-collective`,
+    overrideCanonical: `${SITE_URL}/outils/convention-collective`,
+  });
+}
+
+async function FindAgreementByEnterprisePage() {
+  return (
+    <FindAgreementWidgetLayout>
+      <EnterpriseAgreementSearch widgetMode />
+    </FindAgreementWidgetLayout>
+  );
+}
+
+const getTool = async () => {
+  const tool: DocumentElasticResult<ElasticTool> = await fetchTool(
+    "convention-collective"
+  );
+
+  if (!tool) {
+    return notFound();
+  }
+  return tool;
+};
+
+export default FindAgreementByEnterprisePage;
@@ -1,11 +1,3 @@
-Cypress.Commands.add("getIframe" as any, () => {
-  return cy
-    .get("iframe")
-    .its("0.contentDocument.body")
-    .should("not.be.empty")
-    .then(cy.wrap);
-});
-
 describe("Pages integration convention collective", () => {
   it("should display iframe convention collective", () => {
     cy.visit("/integration/convention-collective", {
@@ -14,17 +6,25 @@ describe("Pages integration convention collective", () => {
       },
     });
 
-    // @ts-ignore
-    cy.getIframe().as("iframe");
+    cy.frameLoaded({ url: "/widgets/convention-collective" });
+
+    cy.iframe()
+      .findByRole("heading", { level: 1 })
+      .should("have.text", "Trouver sa convention collective")
+      .click();
+
+    cy.iframe()
+      // @ts-ignore
+      .findByLabel("Nom de votre entreprise ou numéro Siren/Siret")
+      .as("inputSiret");
+
+    cy.get("@inputSiret").type("carrefour", { force: true });
 
-    cy.get("@iframe").contains("Trouver sa convention collective");
-    cy.get("@iframe").find("#enterprise-search").as("entreprise-search");
-    cy.get("@entreprise-search").type("carrefour");
-    cy.get("@iframe").find("button[type=submit]").as("button-submit");
-    cy.get("@button-submit").click();
-    cy.get("@iframe").contains("CARREFOUR HYPERMARCHES").as("entreprise");
-    cy.get("@entreprise").click();
-    cy.get("@iframe").contains("Conventions collectives").as("cc");
+    cy.iframe().find("button[type=submit]").contains("Rechercher").click();
+    cy.iframe().contains("CARREFOUR HYPERMARCHES").click();
+    cy.iframe()
+      .contains("Commerce de détail et de gros à prédominance alimentaire")
+      .as("cc");
     cy.get("@cc").click();
     cy.get("@postMessage")
       .should("have.been.calledOnce")