Adding validation and fixing caption frames wrong url

labhackercd · Jul 6, 2021 · 8f3a423 · 8f3a423
1 parent 7171ea1
commit 8f3a423
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/src/components/ChartAndReport/index.js b/src/components/ChartAndReport/index.js
@@ -57,7 +57,7 @@ function getColumns(data) {
 export default function ChartAndReport(props) {
   const {
     isLoaded, title, data, chartType, chartOptions, exportData,
-    apiLastUpdate, tool, height,
+    apiLastUpdate, tool, height, apiUrl,
   } = props;
   const [wayOfVisualizeData, setWayOfVisualizeData] = useState('chart');
   const convertDataToJson = convertArrayToJSON(data);
@@ -80,7 +80,7 @@ export default function ChartAndReport(props) {
       exportData={exportData}
       download
       align="center"
-      apiUrl={process.env.NEXT_PUBLIC_AUDIENCIAS_SWAGGER_URL}
+      apiUrl={apiUrl}
       apiLastUpdate={apiLastUpdate}
       tool={tool}
     >
@@ -143,6 +143,7 @@ ChartAndReport.propTypes = {
   apiLastUpdate: PropTypes.string,
   tool: PropTypes.string,
   height: PropTypes.string,
+  apiUrl: PropTypes.string,
 };
 
 ChartAndReport.defaultProps = {
@@ -155,4 +156,5 @@ ChartAndReport.defaultProps = {
   apiLastUpdate: 'Carregando',
   tool: '',
   height: '35vh',
+  apiUrl: process.env.NEXT_PUBLIC_EDEMOCRACIA_SWAGGER_URL,
 };
diff --git a/src/containers/Audiencias/index.js b/src/containers/Audiencias/index.js
@@ -492,6 +492,7 @@ function Audiencias(props) {
               apiLastUpdate={apiLastConsolidateOfDataDate}
               tool={TOOLNAME}
               isLoaded
+              apiUrl={process.env.NEXT_PUBLIC_AUDIENCIAS_SWAGGER_URL}
             />
           ) : (
             <NoDataForSelectedPeriod
@@ -569,6 +570,7 @@ function Audiencias(props) {
                 download
                 apiLastUpdate={apiLastConsolidateOfDataDate}
                 tool={TOOLNAME}
+                apiUrl={process.env.NEXT_PUBLIC_AUDIENCIAS_SWAGGER_URL}
               />
             </div>
           ) : (
@@ -597,6 +599,7 @@ function Audiencias(props) {
                 chartOptions={audiencesChartsUsersSettings.options}
                 apiLastUpdate={apiLastConsolidateOfDataDate}
                 tool={TOOLNAME}
+                apiUrl={process.env.NEXT_PUBLIC_AUDIENCIAS_SWAGGER_URL}
               />
             </div>
           ) : (

diff --git a/src/pages/_app.js b/src/pages/_app.js
@@ -44,7 +44,7 @@ export default function MyApp(props) {
     <>
       <Head>
         <meta name="viewport" content="minimum-scale=1, initial-scale=1, width=device-width" />
-        <meta NAME="language" CONTENT="pt-br" />
+        <meta NAME="language" content="pt-br" />
         <meta name="robots" content="noindex,nofollow" />
         <link rel="preconnect" href="https://fonts.gstatic.com" />
         <link href="https://fonts.googleapis.com/css2?family=Open+Sans&display=swap" rel="stylesheet" />

diff --git a/src/utils/format/date/index.js b/src/utils/format/date/index.js
@@ -2,6 +2,10 @@
 
 // Format date to format DD/MM/YYYY
 export function formatDate(input) {
+  if (!input) {
+    return '00/00/00';
+  }
+
   const datePart = input.match(/\d+/g);
   const year = datePart[0].substring(2);
   const month = datePart[1];