merge dev into master

src/components/molecules/GenericBarChart.tsx

@@ -64,7 +64,7 @@ const BarChartContainer: FC<IBarChartBaseProps> = ({ data, textLabel, subtitle,
             style={{ fill: blackColor }}
           />
           <Tooltip />
-          {isStacked && <Legend verticalAlign="bottom" align="right" iconType="circle" height={35} />}
+          {isStacked && <Legend verticalAlign="bottom" align="right" iconType="circle" height={5} />}
           {children}
         </BarChart>
       </ResponsiveContainer>

src/components/molecules/NewsFlashComp.tsx

@@ -14,6 +14,7 @@ import LocationApprove from 'components/organisms/LocationApproveWindow';
 import {locationQualificationOptions} from 'components/organisms/LocationApproveWindow';
 import { INewsFlash } from 'models/NewFlash';
 import {useParams} from 'react-router-dom'
+import { observer } from "mobx-react-lite";
 
 const ICON_HEIGHT = 18
 
@@ -38,7 +39,6 @@ const NewsFlashComp: FC<IProps> = ({ news }) => {
   const locale = useLocale();
   const { userStore, settingsStore } = store;
   const { t } = useTranslation();
-  const userAllowedChange = userStore.isUserAuthenticated && userStore.isAdmin;
 
   function getVerificationIcon(verificationText: string) {
     if (verificationText === locationQualificationOptions.REJECTED) {
@@ -58,16 +58,16 @@ const NewsFlashComp: FC<IProps> = ({ news }) => {
   const criticalIcon = news.critical && <CriticalIcon className={classes.icon} />;
   const {newsId} = useParams()
   const newsID = newsId ? parseInt(newsId) : '' 
-
   const className = news.id === newsID ? classes.activeNewsFlash : '';
-
   const date = news.date == null ? '' : dateFormat(new Date(news.date.replace(/-/g, '/')), locale);
   const handleLocationEditorOpen = () => setOpen(true);
   const handleLocationEditorClose = () => setOpen(false);
-  const locationChangeButton = userAllowedChange &&
+
+  const locationChangeButton = userStore.isUserAdmin &&
     <Button.Small onClick={handleLocationEditorOpen} buttonHeight={ICON_HEIGHT}>
       {t('changeLocationButton')}
     </Button.Small>
+
   return (
     <Link key={news.id} to={`${settingsStore.currentLanguageRouteString}/newsflash/${news.id}`}>
       <Box border={1} borderColor={silverSmokeColor} p={1} className={className}>
@@ -84,8 +84,7 @@ const NewsFlashComp: FC<IProps> = ({ news }) => {
       <LocationApprove isOpen={isOpen} onClose={handleLocationEditorClose}
                        newFlashTitle={date.concat(", ", news.display_source)} news={news} />
     </Link>
-
   );
 }
 
-export default NewsFlashComp;
+export default observer(NewsFlashComp);

src/components/organisms/CardEditorDialog.tsx

@@ -107,7 +107,8 @@ const CardEditor: FC<IProps> = ({ isOpen, onClose, widgetName, text }) => {
             actionButtons={false}
             sizeOptions={sizeOptions}
             dateComment={dateComment}
-            title={text}
+            title={widget?.data?.text?.title}
+            subtitle={widget?.data?.text?.subtitle}
           >
             <MetaTag>{widgetName}</MetaTag>
             <ErrorBoundary>{widgetComponent}</ErrorBoundary>

src/const/cards.const.ts

@@ -1,15 +1,19 @@
 import { WidgetName } from 'models/WidgetName';
 import  orYarokLogo  from 'assets/greenlight.png';
 
-// cards is this least will be avaiaable for operation environments (all non-staging environments)
+// cards in this list will be available for operation environments (all non-staging environments)
 export const operationalCards: WidgetName[] = [
   WidgetName.accident_count_by_severity,
   WidgetName.most_severe_accidents_table,
   WidgetName.most_severe_accidents,
   WidgetName.head_on_collisions_comparison_percentage,
   WidgetName.vision_zero_2_plus_1,
   WidgetName.injured_count_by_severity,
-  WidgetName.accidents_heat_map
+  WidgetName.accidents_heat_map,
+  WidgetName.accident_count_by_accident_year,
+  WidgetName.injured_count_by_accident_year,
+  WidgetName.accident_count_by_driver_type,
+  WidgetName.accident_count_by_day_night
 ];
 
 export type OrgLogoData =  {key : string, path:string} ;

src/store/user.store.ts

@@ -56,6 +56,10 @@ export default class UserStore {
     return this.userInfo?.data.organizations;
   }
 
+  get isUserAdmin(){
+    return this.isUserAuthenticated && this.isAdmin;
+  }
+
   get usersManagementTableData(): any {
     return this.usersInfoList?.map((user) => ({
       name: `${user.first_name} ${user.last_name}`,