Merge branch 'develop'

italia · Jan 24, 2025 · c33d0de · c33d0de
2 parents 60907ad + 918dbb2
commit c33d0de
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 16 deletions.
diff --git a/src/app/components/Editor.tsx b/src/app/components/Editor.tsx
@@ -65,6 +65,7 @@ const checkWarnings = async (values: PublicCode) => {
 };
 
 const resolver: Resolver<PublicCode | PublicCodeWithDeprecatedFields> = async (values) => {
+  console.log(values)
   const res = await validatorFn(values as PublicCode);
 
   if (res.errors.length === 0)
@@ -373,6 +374,18 @@ export default function Editor() {
                       required
                     />
                   </Col>
+                  <Col>
+                    <EditorDescriptionInput<"documentation">
+                      fieldName="documentation"
+                      lang={lang}
+                    />
+                  </Col>
+                  <Col>
+                    <EditorDescriptionInput<"apiDocumentation">
+                      fieldName="apiDocumentation"
+                      lang={lang}
+                    />
+                  </Col>
                   <Col>
                     <EditorFeatures lang={lang} />
                   </Col>

diff --git a/src/app/components/PubliccodeYmlLanguages.tsx b/src/app/components/PubliccodeYmlLanguages.tsx
@@ -1,12 +1,11 @@
-import { useEffect } from 'react';
+import { upperFirst } from 'lodash';
 import { useTranslation } from "react-i18next";
-import { useAppDispatch } from "../store";
-import { getPubliccodeYmlLanguages, setPubliccodeYmlLanguages } from "../store/publiccodeYmlLanguages";
-import { Multiselect } from "react-widgets";
 import { useSelector } from 'react-redux';
-import { allLangs } from '../../i18n';
-import { upperFirst } from 'lodash';
+import { Multiselect } from "react-widgets";
 import { RenderItemProp } from 'react-widgets/cjs/List';
+import { allLangs } from '../../i18n';
+import { useAppDispatch } from "../store";
+import { getPubliccodeYmlLanguages, setPubliccodeYmlLanguages } from "../store/publiccodeYmlLanguages";
 
 interface Language {
   value: string;
@@ -27,16 +26,11 @@ const renderTagValue = ({ item }: { item: Language }) => (
 
 export const PubliccodeYmlLanguages = (): JSX.Element => {
   const dispatch = useAppDispatch();
-  const { i18n, t } = useTranslation();
+  const { t } = useTranslation();
   const publiccodeYmlLanguages = useSelector(getPubliccodeYmlLanguages)
 
-  useEffect(() => {
-    dispatch(setPubliccodeYmlLanguages([i18n.language]));
-    console.log(i18n.language)
-  }, [dispatch, i18n.language]);
-
   const handleChange = (newSelection: Language[]) => {
-    if (newSelection.length != 0){
+    if (newSelection.length != 0) {
       dispatch(setPubliccodeYmlLanguages(newSelection.map(l => l.value)));
     }
   };

diff --git a/src/main.tsx b/src/main.tsx
@@ -1,10 +1,13 @@
 // import { StrictMode } from 'react'
-import { createRoot } from 'react-dom/client'
-import App from './app/App.tsx'
+import { createRoot } from 'react-dom/client';
+import App from './app/App.tsx';
 // import './index.css'
+import packageJson from '../package.json';
+
+console.log(`${packageJson.name} ${packageJson.version}`);
 
 createRoot(document.getElementById('app')!).render(
   // <StrictMode>
-    <App />
+  <App />
   // </StrictMode>,
 )