fix: remove tiptap missing token

SocialGouv · Oct 19, 2023 · 530cc29 · 530cc29
1 parent e6cfbc0
commit 530cc29
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 118 deletions.
diff --git a/.kontinuous/env/dev/templates/npm.sealed-secret.yaml b/.kontinuous/env/dev/templates/npm.sealed-secret.yaml
diff --git a/.kontinuous/env/preprod/templates/npm.sealed-secret.yaml b/.kontinuous/env/preprod/templates/npm.sealed-secret.yaml
diff --git a/.kontinuous/env/prod/templates/npm.sealed-secret.yaml b/.kontinuous/env/prod/templates/npm.sealed-secret.yaml
diff --git a/.kontinuous/values.yaml b/.kontinuous/values.yaml
@@ -6,37 +6,21 @@ jobs:
       with:
         imagePackage: frontend
         dockerfile: targets/frontend/Dockerfile
-        secrets:
-          npmrc:
-            secretName: npm
-            secretKey: NPMRC
     build-ingester:
       use: build
       with:
         imagePackage: ingester
         dockerfile: targets/ingester/Dockerfile
-        secrets:
-          npmrc:
-            secretName: npm
-            secretKey: NPMRC
     build-alert:
       use: build
       with:
         imagePackage: alert
         dockerfile: targets/alert-cli/Dockerfile
-        secrets:
-          npmrc:
-            secretName: npm
-            secretKey: NPMRC
     build-export:
       use: build
       with:
         imagePackage: export
         dockerfile: targets/export-elasticsearch/Dockerfile
-        secrets:
-          npmrc:
-            secretName: npm
-            secretKey: NPMRC
     build-contributions:
       use: build
       with:
@@ -53,7 +37,7 @@ jobs:
 
 www:
   ~chart: app
-  ~needs: [build-frontend]
+  ~needs: [ build-frontend ]
   probesPath: /healthz
   imagePackage: frontend
   envFrom:
@@ -75,7 +59,7 @@ www:
 
 contributions:
   ~chart: app
-  ~needs: [build-contributions]
+  ~needs: [ build-contributions ]
   probesPath: /
   imagePackage: contributions
   containerPort: 3200
@@ -95,7 +79,7 @@ contributions:
 
 export:
   ~chart: app
-  ~needs: [build-export]
+  ~needs: [ build-export ]
   probesPath: /healthz
   ingress:
     enabled: false
@@ -117,7 +101,7 @@ export:
 
 hasura:
   ~chart: hasura
-  ~needs: [build-hasura]
+  ~needs: [ build-hasura ]
   imagePackage: hasura
   ingress:
     enabled: false

diff --git a/targets/alert-cli/Dockerfile b/targets/alert-cli/Dockerfile
@@ -8,8 +8,7 @@ WORKDIR /
 COPY . /
 
 # hadolint ignore=SC2046
-RUN --mount=type=secret,id=npmrc,target=/.npmrc \
-    yarn --frozen-lockfile
+RUN yarn --frozen-lockfile
 
 RUN yarn workspace @shared/graphql-client build
 

diff --git a/targets/export-elasticsearch/Dockerfile b/targets/export-elasticsearch/Dockerfile
@@ -16,8 +16,7 @@ COPY package.json /package.json
 COPY yarn.lock /yarn.lock
 
 # hadolint ignore=SC2046
-RUN --mount=type=secret,id=npmrc,target=/.npmrc \
-    yarn --frozen-lockfile
+RUN yarn --frozen-lockfile
 
 COPY . /
 

diff --git a/targets/frontend/Dockerfile b/targets/frontend/Dockerfile
@@ -12,12 +12,9 @@ COPY shared/types/package.json /shared/types/package.json
 COPY targets/frontend/package.json /targets/frontend/package.json
 COPY package.json /package.json
 COPY yarn.lock /yarn.lock
-# Hack copy .npmrc file only if exist (dev only) otherwise use secret
-COPY *.npmrc /
 
 # hadolint ignore=SC2046
-RUN --mount=type=secret,id=npmrc,target=/.npmrc \
-    yarn --frozen-lockfile
+RUN yarn --frozen-lockfile
 
 COPY . /
 

diff --git a/targets/frontend/package.json b/targets/frontend/package.json
@@ -27,9 +27,6 @@
     "@socialgouv/cdtn-sources": "^4.52.1",
     "@socialgouv/cdtn-ui": "^4.92.0",
     "@socialgouv/matomo-next": "^1.2.2",
-    "@tiptap-pro/extension-details": "^2.2.3",
-    "@tiptap-pro/extension-details-content": "^2.2.3",
-    "@tiptap-pro/extension-details-summary": "^2.2.3",
     "@tiptap/extension-placeholder": "^2.1.10",
     "@tiptap/extension-table": "^2.1.7",
     "@tiptap/extension-table-cell": "^2.1.7",

diff --git a/targets/frontend/src/components/forms/EditionField/Editor.tsx b/targets/frontend/src/components/forms/EditionField/Editor.tsx
@@ -13,9 +13,6 @@ import { TitleBox } from "../TitleBox";
 import { MenuSpecial } from "./MenuSpecial";
 import { MenuStyle } from "./MenuStyle";
 import { MenuTable } from "./MenuTable";
-import { Details } from "@tiptap-pro/extension-details";
-import { DetailsSummary } from "@tiptap-pro/extension-details-summary";
-import { DetailsContent } from "@tiptap-pro/extension-details-content";
 import { Placeholder } from "@tiptap/extension-placeholder";
 
 export type EditorProps = {
@@ -41,14 +38,6 @@ export const Editor = ({ content, onUpdate, error, disabled }: EditorProps) => {
       TableRow,
       TableHeader,
       TableCell,
-      Details.configure({
-        persist: false,
-        HTMLAttributes: {
-          class: "details",
-        },
-      }),
-      DetailsSummary,
-      DetailsContent,
       Placeholder.configure({
         includeChildren: true,
         placeholder: ({ node }) => {

diff --git a/targets/frontend/src/components/forms/EditionField/MenuSpecial.tsx b/targets/frontend/src/components/forms/EditionField/MenuSpecial.tsx
@@ -2,7 +2,6 @@ import { Editor, FloatingMenu } from "@tiptap/react";
 import FormatListBulletedIcon from "@mui/icons-material/FormatListBulleted";
 import FormatListNumberedIcon from "@mui/icons-material/FormatListNumbered";
 import GridOnIcon from "@mui/icons-material/GridOn";
-import StorageIcon from "@mui/icons-material/Storage";
 import { styled } from "@mui/system";
 
 const tableHTML = `
@@ -59,18 +58,6 @@ export const MenuSpecial = ({ editor }: { editor: Editor | null }) => {
       >
         <GridOnIcon />
       </button>
-      <button
-        onClick={() =>
-          editor.isActive("details")
-            ? editor.chain().focus().unsetDetails().run()
-            : editor.chain().focus().setDetails().run()
-        }
-        className={editor.isActive("details") ? "is-active" : ""}
-        type="button"
-        title="Ajouter un accordéon"
-      >
-        <StorageIcon />
-      </button>
     </StyledFloatingMenu>
   ) : (
     <></>

diff --git a/targets/frontend/src/components/forms/EditionField/MenuStyle.tsx b/targets/frontend/src/components/forms/EditionField/MenuStyle.tsx
@@ -1,7 +1,6 @@
 import { BubbleMenu, Editor } from "@tiptap/react";
 import FormatBoldIcon from "@mui/icons-material/FormatBold";
 import FormatItalicIcon from "@mui/icons-material/FormatItalic";
-import StorageIcon from "@mui/icons-material/Storage";
 import { styled } from "@mui/system";
 
 export const MenuStyle = ({ editor }: { editor: Editor | null }) => {
@@ -43,18 +42,6 @@ export const MenuStyle = ({ editor }: { editor: Editor | null }) => {
       >
         <FormatItalicIcon />
       </button>
-      <button
-        onClick={() => {
-          editor.isActive("details")
-            ? editor.chain().focus().unsetDetails().run()
-            : editor.chain().focus().setDetails().run();
-        }}
-        className={editor.isActive("details") ? "is-active" : ""}
-        type="button"
-        title="Placer dans un accordéon"
-      >
-        <StorageIcon />
-      </button>
     </StyledBubbleMenu>
   ) : (
     <></>

diff --git a/targets/ingester/Dockerfile b/targets/ingester/Dockerfile
@@ -10,8 +10,7 @@ COPY . /
 RUN apk add --update python3 make g++ && rm -rf /var/cache/apk/*
 
 # hadolint ignore=SC2046
-RUN --mount=type=secret,id=npmrc,target=/.npmrc \
-    yarn --frozen-lockfile
+RUN yarn --frozen-lockfile
 
 RUN yarn workspace @shared/graphql-client build