merge dev into master (#991)

* [Feat-885] Add selection for stack bar graphs (#935)

* Added stacked bar widgets a checkbox option

* Add option to choose colors when changing displayed bars

* Changed any to proper type, make number of bar generic and add function createBarWidget

* Fix bug of changed values when closing card editor

* PR review changes

* Remove redundent imports

* add conditional label, refactor utils (#938)

Co-authored-by: Daniel Shely <>

* Update .env.staging (#947)

* Add critical indication (#948)

* Added image

* Added critical icon based on field value

* Added critical option to the filter panel

* Added enum value

* Had to increase width

* Added local critical filter

* Added field to model

* add alt attrinbte on image tag (#951)

* Update .env.staging (#952)

* Make critical filter non local (#958)

* sufficient condition

* Use object for fetch args

* Send params in object format

* Make fields optional

* don't use "any" type hint

* Update News.tsx (#961)

* Update news-flash-store.ts (#962)

* Update News.tsx

* Update thank-you-names.csv

* transaction dialog box (#966)

Co-authored-by: EyalIlan <eyalilan8@gmail.com>

* [Feat-925] Add location approval feature (#969)

* initial feature commit with icon and new field

* Added icon choice and display

* Move critical icon

* Add location change button

* Make critical icon transperent

* replace critical.gif with svg

* Window open pressing button, seperated newsFlash comp to new file

* Added user info

* Status icon and buttons

* Added map choice (need to finish with saving data)

* Saving location and qualificaion data

* Added manual option for location qualification and added user change

* Fix responsibilty issue between the two files

* Split Search city to 2 files

* Spacing and page look

* Changed initialLocation to be a function, and improved onClose location window

* Split radio buttons to seperate file

* updated put function for news flash

---------

Co-authored-by: Daniel Shely <>

* Feature add transcrption 4 widgets 957 (#968)

* transaction dialog box

* show transaction icon only widgets that has transaction

* add copy image to transaction box

* add widget vision_10_30_90 (#972)

* Feature widget vision zero 10 50 90 (#975)

* add widget vision_10_30_90

* change widget 10_30_90 to 10_50_90

* change the location of the start command in package.json (#977)

* change the location of the start command in package.json

change the location of the start command
after receive this error:
/usr/local/bin/node: bad option: --openssl-legacy-provider

* add npx browserslist@latest --update-db before start the docker

* add logo (#979)

* add natun square logo (#982)

* add widget lower bar (#981)

* update logo (#980)

* Update Footer.tsx (#986)

* add data-for-change (#988)

* Delete src/assets/hasadna.png (#989)

* Bug click twice to change news backround (#984)

* add widget lower bar

* fix news menu bar bug you need to click twice to make the news backround active

---------

Co-authored-by: shaked-hayek <85109951+shaked-hayek@users.noreply.github.com>
Co-authored-by: danielsh28 <danielshely1@gmail.com>
Co-authored-by: carmelp16 <46032304+carmelp16@users.noreply.github.com>
Co-authored-by: EyalIlan <55767736+EyalIlan@users.noreply.github.com>
Co-authored-by: EyalIlan <eyalilan8@gmail.com>
Co-authored-by: Shai2022 <106345640+Shai2022@users.noreply.github.com>

package.json

@@ -40,7 +40,7 @@
     "typescript": "^4.3.5"
   },
   "scripts": {
-    "start": "react-scripts start --openssl-legacy-provider",
+    "start": "react-scripts --openssl-legacy-provider start",
     "build": "react-scripts build",
     "build:staging": "env-cmd -f .env.staging react-scripts build",
     "build:demo": "env-cmd -f .env.demo react-scripts build",

src/components/molecules/NewsFlashComp.tsx

@@ -13,6 +13,7 @@ import { useTranslation } from 'react-i18next';
 import LocationApprove from 'components/organisms/LocationApproveWindow';
 import {locationQualificationOptions} from 'components/organisms/LocationApproveWindow';
 import { INewsFlash } from 'models/NewFlash';
+import {useParams} from 'react-router-dom'
 
 const ICON_HEIGHT = 18
 
@@ -35,7 +36,7 @@ const NewsFlashComp: FC<IProps> = ({ news }) => {
   const store: RootStore = useStore();
   const classes = useStyles();
   const locale = useLocale();
-  const { userStore, newsFlashStore, settingsStore } = store;
+  const { userStore, settingsStore } = store;
   const { t } = useTranslation();
   const userAllowedChange = userStore.isUserAuthenticated && userStore.isAdmin;
 
@@ -55,7 +56,11 @@ const NewsFlashComp: FC<IProps> = ({ news }) => {
   const [isOpen, setOpen] = useState(false);
   const verificationIcon = getVerificationIcon(news.newsflash_location_qualification);
   const criticalIcon = news.critical && <CriticalIcon className={classes.icon} />;
-  const className = news.id === newsFlashStore.activeNewsFlashId ? classes.activeNewsFlash : '';
+  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);
@@ -79,6 +84,7 @@ const NewsFlashComp: FC<IProps> = ({ news }) => {
       <LocationApprove isOpen={isOpen} onClose={handleLocationEditorClose}
                        newFlashTitle={date.concat(", ", news.display_source)} news={news} />
     </Link>
+
   );
 }
 

src/components/organisms/News.tsx

@@ -32,7 +32,7 @@ const News: FC = () => {
           {street && city && <LocationSearchIndicator searchType={'cityAndStreet'} />}
           {newsFlashStore.newsFlashCollection.length > 0 ? (
             newsFlashStore.newsFlashCollection.map((news) =>
-              <NewsFlashComp news={news} />
+              <NewsFlashComp news={news} /> 
             )
           ) : (
             <Box p={1}>

src/components/organisms/SideBar.tsx

@@ -62,7 +62,7 @@ const SideBar: FC<IProps> = () => {
         {location && (
           <ErrorBoundary>
             <SideBarMap items={[location]} />
-          </ErrorBoundary>
+          </ErrorBoundary>  
         )}
       </Box>
     </Box>