neo.mjs 8.42.0 → 8.43.0

package/apps/ServiceWorker.mjs

@@ -20,9 +20,9 @@ class ServiceWorker extends ServiceBase {
          */
         singleton: true,
         /**
-         * @member {String} version='8.42.0'
+         * @member {String} version='8.43.0'
          */
-        version: '8.42.0'
+        version: '8.43.0'
     }
 
     /**

package/apps/colors/view/BarChartComponent.mjs

@@ -52,7 +52,7 @@ class BarChartComponent extends AmChartComponent {
                 type: 'ValueAxis',
 
                 title: {
-                    text: 'Occurrences in table cells'
+                    text: 'Occurrences in grid cells'
                 }
             }]
         }

package/apps/colors/view/{TableContainer.mjs → GridContainer.mjs}

@@ -1,16 +1,16 @@
-import Container from '../../../src/table/Container.mjs';
+import BaseGridContainer from '../../../src/grid/Container.mjs';
 
 /**
- * @class Colors.view.TableContainer
- * @extends Neo.table.Container
+ * @class Colors.view.GridContainer
+ * @extends Neo.grid.Container
  */
-class TableContainer extends Container {
+class GridContainer extends BaseGridContainer {
     static config = {
         /**
-         * @member {String} className='Colors.view.TableContainer'
+         * @member {String} className='Colors.view.GridContainer'
          * @protected
          */
-        className: 'Colors.view.TableContainer',
+        className: 'Colors.view.GridContainer',
         /**
          * @member {Number|null} amountColumns_=null
          */
@@ -28,17 +28,9 @@ class TableContainer extends Container {
             store        : 'stores.colors'
         },
         /**
-         * @member {String[]} cls=['colors-table-container']
+         * @member {String[]} cls=['colors-grid-container']
          */
-        cls: ['colors-table-container'],
-        /**
-         * @member {Object} columnDefaults
-         */
-        columnDefaults: {
-            renderer(data) {
-                return {cls: ['color-' + data.value], html: ' '}
-            }
-        }
+        cls: ['colors-grid-container']
     }
 
     /**
@@ -52,12 +44,10 @@ class TableContainer extends Container {
             let startCharCode = 'A'.charCodeAt(0),
                 i             = 0,
                 columns       = [{
-                    cls      : ['neo-index-column', 'neo-table-header-button'],
-                    dataField: 'index',
-                    dock     : 'left',
-                    minWidth : 40,
+                    cellAlign: 'right',
+                    dataField: 'id',
                     text     : '#',
-                    renderer : data => ({cls: ['neo-index-column', 'neo-table-cell'], html: data.rowIndex + 1}),
+                    type     : 'index',
                     width    : 40
                 }],
                 currentChar;
@@ -67,6 +57,7 @@ class TableContainer extends Container {
 
                 columns.push({
                     dataField: 'column' + currentChar,
+                    renderer : 'up.colorRenderer',
                     text     : currentChar
                 })
             }
@@ -84,6 +75,14 @@ class TableContainer extends Container {
     afterSetAmountRows(value, oldValue) {
         this.store?.clear()
     }
+
+    /**
+     * @param {Object} data
+     * @returns {Object}
+     */
+    colorRenderer({value}) {
+        return {cls: ['color-' + value], html: ' '}
+    }
 }
 
-export default Neo.setupClass(TableContainer);
+export default Neo.setupClass(GridContainer);

package/apps/colors/view/HeaderToolbar.mjs

@@ -69,10 +69,10 @@ class HeaderToolbar extends Toolbar {
             cls  : ['header-spacer'],
             flex : 1
         }, {
-            handler  : 'onDetachTableButtonClick',
+            handler  : 'onDetachGridButtonClick',
             iconCls  : 'fas fa-table',
-            reference: 'detach-table-button',
-            text     : 'Table'
+            reference: 'detach-grid-button',
+            text     : 'Grid'
         }, {
             handler  : 'onDetachPieChartButtonClick',
             iconCls  : 'fas fa-chart-pie',

package/apps/colors/view/Viewport.mjs

@@ -2,7 +2,7 @@ import BaseViewport          from '../../../src/container/Viewport.mjs';
 import BarChartComponent     from './BarChartComponent.mjs';
 import HeaderToolbar         from './HeaderToolbar.mjs';
 import PieChartComponent     from './PieChartComponent.mjs';
-import TableContainer        from './TableContainer.mjs';
+import GridContainer         from './GridContainer.mjs';
 import ViewportController    from './ViewportController.mjs';
 import ViewportStateProvider from './ViewportStateProvider.mjs';
 
@@ -36,13 +36,15 @@ class Viewport extends BaseViewport {
             module: HeaderToolbar,
             flex  : 'none'
         }, {
-            module   : TableContainer,
-            reference: 'table'
+            module   : GridContainer,
+            reference: 'grid'
         }, {
             module   : PieChartComponent,
+            flex     : 1.3,
             reference: 'pie-chart'
         }, {
             module   : BarChartComponent,
+            flex     : 1.3,
             reference: 'bar-chart'
         }],
         /**

package/apps/colors/view/ViewportController.mjs

@@ -27,7 +27,7 @@ class ViewportController extends Controller {
     widgetIndexMap = {
         'bar-chart': 3,
         'pie-chart': 2,
-        table      : 1
+        grid       : 1
     }
 
     /**
@@ -188,15 +188,15 @@ class ViewportController extends Controller {
     /**
      * @param {Object} data
      */
-    async onDetachPieChartButtonClick(data) {
-        await this.createBrowserWindow('pie-chart')
+    async onDetachGridButtonClick(data) {
+        await this.createBrowserWindow('grid')
     }
 
     /**
      * @param {Object} data
      */
-    async onDetachTableButtonClick(data) {
-        await this.createBrowserWindow('table')
+    async onDetachPieChartButtonClick(data) {
+        await this.createBrowserWindow('pie-chart')
     }
 
     /**
@@ -256,12 +256,12 @@ class ViewportController extends Controller {
     /**
      * @param {Object[]} records
      */
-    updateTable(records) {
-        let table   = this.getReference('table'),
-            {store} = table;
+    updateGrid(records) {
+        let grid    = this.getReference('grid'),
+            {store} = grid;
 
         if (store.getCount()) {
-            table.bulkUpdateRecords(records)
+            grid.bulkUpdateRecords(records)
         } else {
             // Depending on the delay of the Socket Connection,
             // the next data package could still contain the old settings
@@ -293,7 +293,7 @@ class ViewportController extends Controller {
             if (!me.isDestroyed) {
                 let {data} = response;
 
-                me.updateTable(data.tableData);
+                me.updateGrid(data.tableData);
                 me.updateCharts(data.summaryData)
             }
         }

package/apps/covid/neo-config.json

@@ -4,5 +4,6 @@
     "environment"     : "development",
     "mainPath"        : "./Main.mjs",
     "mainThreadAddons": ["AmCharts", "DragDrop", "MapboxGL", "Navigator", "Stylesheet"],
-    "themes"          : ["neo-theme-dark", "neo-theme-light"]
+    "themes"          : ["neo-theme-dark", "neo-theme-light"],
+    "useFallbackApi"  : true
 }

package/apps/covid/view/MainContainerController.mjs

@@ -22,6 +22,14 @@ class MainContainerController extends ComponentController {
          * @member {Number} activeMainTabIndex=0
          */
         activeMainTabIndex: 0,
+        /**
+         * @member {String} apiSummaryUrl='https://raw.githubusercontent.com/neomjs/pages/main/resources_pub/data/cvid_static/all.json'
+         */
+        apiFallbackSummaryUrl: 'https://raw.githubusercontent.com/neomjs/pages/main/resources_pub/data/cvid_static/all.json',
+        /**
+         * @member {String} apiUrl='https://raw.githubusercontent.com/neomjs/pages/main/resources_pub/data/cvid_static_countries.json'
+         */
+        apiFallbackUrl: 'https://raw.githubusercontent.com/neomjs/pages/main/resources_pub/data/cvid_static_countries.json',
         /**
          * @member {String} apiSummaryUrl='https://disease.sh/v3/covid-19/all'
          */
@@ -77,7 +85,7 @@ class MainContainerController extends ComponentController {
             }
 
             item.casesPerOneMillion = item.casesPerOneMillion > item.cases ? 'N/A' : item.casesPerOneMillion || 0;
-            item.infected           = item.casesPerOneMillion;
+            item.infected           = item.casesPerOneMillion
         });
 
         me.data = data;
@@ -88,23 +96,23 @@ class MainContainerController extends ComponentController {
             me.onCountryFieldChange({
                 component: countryField,
                 value    : countryField.value
-            });
+            })
         }
 
         if (['gallery', 'helix', 'table'].includes(reference)) {
             if (activeTab) {
-                activeTab.store.data = data;
+                activeTab.store.data = data
             }
         }
 
         else if (reference === 'mapboxglmap') {
             me.getReference('mapboxglmap').chartData = data;
-            me.mapboxglMapHasData = true;
+            me.mapboxglMapHasData = true
         }
 
         else if (reference === 'worldmap') {
             activeTab.loadData(data);
-            me.worldMapHasData = true;
+            me.worldMapHasData = true
         }
     }
 
@@ -140,7 +148,7 @@ class MainContainerController extends ComponentController {
             second: 'numeric'
         }).format(new Date(data.updated));
 
-        container.update();
+        container.update()
     }
 
     /**
@@ -150,10 +158,10 @@ class MainContainerController extends ComponentController {
      */
     getTabIndex(hashObject) {
         if (!hashObject || !hashObject.mainview) {
-            return 0;
+            return 0
         }
 
-        return this.mainTabs.indexOf(hashObject.mainview);
+        return this.mainTabs.indexOf(hashObject.mainview)
     }
 
     /**
@@ -161,18 +169,19 @@ class MainContainerController extends ComponentController {
      * @returns {Neo.component.Base}
      */
     getView(tabIndex) {
-        return this.getReference(this.mainTabs[tabIndex]);
+        return this.getReference(this.mainTabs[tabIndex])
     }
 
     /**
      *
      */
     loadData() {
-        let me = this;
+        let me     = this,
+            apiUrl = Neo.config.useFallbackApi ? me.apiFallbackUrl : me.apiUrl;
 
-        fetch(me.apiUrl)
+        fetch(apiUrl)
             .then(response => response.json())
-            .catch(err => console.log('Can’t access ' + me.apiUrl, err))
+            .catch(err => console.log('Can’t access ' + apiUrl, err))
             .then(data => me.addStoreItems(data));
     }
 
@@ -180,11 +189,12 @@ class MainContainerController extends ComponentController {
      *
      */
     loadSummaryData() {
-        let me = this;
+        let me            = this,
+            apiSummaryUrl = Neo.config.useFallbackApi ? me.apiFallbackSummaryUrl : me.apiSummaryUrl;
 
-        fetch(me.apiSummaryUrl)
+        fetch(apiSummaryUrl)
             .then(response => response.json())
-            .catch(err => console.log('Can’t access ' + me.apiSummaryUrl, err))
+            .catch(err => console.log('Can’t access ' + apiSummaryUrl, err))
             .then(data => me.applySummaryData(data));
 
         me.timeout(2000).then(() => {
@@ -205,7 +215,7 @@ class MainContainerController extends ComponentController {
                 country   : 'all',
                 hash      : {mainview: 'table'},
                 hashString: 'mainview=table'
-            }, null);
+            }, null)
         }
     }
 
@@ -220,7 +230,7 @@ class MainContainerController extends ComponentController {
         me.loadData();
         me.loadSummaryData();
 
-        me.component.on('mounted', me.onMainViewMounted, me);
+        me.component.on('mounted', me.onMainViewMounted, me)
     }
 
     /**
@@ -235,15 +245,15 @@ class MainContainerController extends ComponentController {
         if (store.getCount() > 0) {
             if (Neo.isRecord(value)) {
                 record = value;
-                value  = value[component.displayField];
+                value  = value[component.displayField]
             } else {
-                record = value && store.find('country', value)?.[0];
+                record = value && store.find('country', value)?.[0]
             }
 
             this.setState({
                 country      : value,
                 countryRecord: record || null
-            });
+            })
         }
     }
 
@@ -283,22 +293,22 @@ class MainContainerController extends ComponentController {
         if (ntype === 'mapboxgl' && me.data) {
             if (me.mapboxStyle) {
                 activeView.mapboxStyle = activeView[me.mapboxStyle];
-                delete me.mapboxStyle;
+                delete me.mapboxStyle
             }
 
             if (!me.mapboxglMapHasData) {
                 activeView.chartData = me.data;
-                me.mapboxglMapHasData = true;
+                me.mapboxglMapHasData = true
             }
 
             countryRecord = me.getStateProvider().data.countryRecord;
             countryRecord && MainContainerController.selectMapboxGlCountry(activeView, countryRecord);
 
-            activeView.autoResize();
+            activeView.autoResize()
         } else if (ntype === 'covid-world-map' && me.data) {
             if (!me.worldMapHasData) {
                 activeView.loadData(me.data);
-                me.worldMapHasData = true;
+                me.worldMapHasData = true
             }
         }
     }
@@ -321,7 +331,7 @@ class MainContainerController extends ComponentController {
             ].join('')
         });
 
-        table.update();
+        table.update()
     }
 
     /**
@@ -336,7 +346,7 @@ class MainContainerController extends ComponentController {
             src  : 'https://buttons.github.io/buttons.js'
         });
 
-        me.getReference('tab-container').on('moveTo', me.onTabMove, me);
+        me.getReference('tab-container').on('moveTo', me.onTabMove, me)
     }
 
     /**
@@ -344,7 +354,7 @@ class MainContainerController extends ComponentController {
      */
     onReloadDataButtonClick(data) {
         this.loadData();
-        this.loadSummaryData();
+        this.loadSummaryData()
     }
 
     /**
@@ -357,7 +367,7 @@ class MainContainerController extends ComponentController {
         me.component.remove(me.getReference('footer'), true);
 
         if (activeTab.ntype === 'covid-mapboxgl-container') {
-            me.getReference('mapboxglmap').autoResize();
+            me.getReference('mapboxglmap').autoResize()
         }
     }
 
@@ -372,20 +382,18 @@ class MainContainerController extends ComponentController {
             logoPath   = 'https://raw.githubusercontent.com/neomjs/pages/main/resources_pub/images/apps/covid/',
             mapView    = me.getReference('mapboxglmap'),
             themeLight = button.text === 'Theme Light',
-            buttonText, cls, href, iconCls, mapViewStyle, theme;
+            buttonText, cls, iconCls, mapViewStyle, theme;
 
         if (themeLight) {
             buttonText   = 'Theme Dark';
-            href         = '../dist/development/neo-theme-light-no-css-vars.css';
             iconCls      = 'fa fa-moon';
             mapViewStyle = mapView?.mapboxStyleLight;
-            theme        = 'neo-theme-light';
+            theme        = 'neo-theme-light'
         } else {
             buttonText   = 'Theme Light';
-            href         = '../dist/development/neo-theme-dark-no-css-vars.css';
             iconCls      = 'fa fa-sun';
             mapViewStyle = mapView?.mapboxStyleDark;
-            theme        = 'neo-theme-dark';
+            theme        = 'neo-theme-dark'
         }
 
         logo.vdom.src = logoPath + (theme === 'neo-theme-dark' ? 'covid_logo_dark.jpg' : 'covid_logo_light.jpg');
@@ -395,7 +403,7 @@ class MainContainerController extends ComponentController {
 
         component.cls.forEach(item => {
             if (item.includes('neo-theme')) {
-                NeoArray.remove(cls, item);
+                NeoArray.remove(cls, item)
             }
         });
 
@@ -405,9 +413,9 @@ class MainContainerController extends ComponentController {
         button.set({iconCls, text: buttonText});
 
         if (mapView) {
-            mapView.mapboxStyle = mapViewStyle;
+            mapView.mapboxStyle = mapViewStyle
         } else {
-            me.mapboxStyle = themeLight ? 'mapboxStyleLight' : 'mapboxStyleDark';
+            me.mapboxStyle = themeLight ? 'mapboxStyleLight' : 'mapboxStyleDark'
         }
     }
 
@@ -415,14 +423,14 @@ class MainContainerController extends ComponentController {
      * @param {Object} data
      */
     onTabMove(data) {
-        NeoArray.move(this.mainTabs, data.fromIndex, data.toIndex);
+        NeoArray.move(this.mainTabs, data.fromIndex, data.toIndex)
     }
 
     /**
      * @param view
      * @param record
      */
-    static selectMapboxGlCountry(view, record) {console.log(record.countryInfo.iso2);
+    static selectMapboxGlCountry(view, record) {
         // https://github.com/neomjs/neo/issues/490
         // there are missing iso2&3 values on natural earth vector
         const map = {
@@ -441,7 +449,7 @@ class MainContainerController extends ComponentController {
             lng: record.countryInfo.long
         });
 
-        view.zoom = 5; // todo: we could use a different value for big countries (Russia, USA,...)
+        view.zoom = 5 // todo: we could use a different value for big countries (Russia, USA,...)
     }
 }
 

package/apps/covid/view/TableContainerController.mjs

@@ -16,6 +16,14 @@ class TableContainerController extends ComponentController {
          * @member {String} apiBaseUrl='https://disease.sh/'
          */
         apiBaseUrl: 'https://disease.sh/',
+        /**
+         * @member {String} apiBaseUrl='https://raw.githubusercontent.com/neomjs/pages/main/resources_pub/data/'
+         */
+        apiFallbackBaseUrl: 'https://raw.githubusercontent.com/neomjs/pages/main/resources_pub/data/',
+        /**
+         * @member {String} apiHistoricalDataEndpoint='cvid_static/historical/'
+         */
+        apiFallbackHistoricalDataEndpoint: 'cvid_static/historical/',
         /**
          * @member {String} apiHistoricalDataEndpoint='v3/covid-19/historical/'
          */
@@ -83,7 +91,7 @@ class TableContainerController extends ComponentController {
                 }
             });
 
-            Object.entries(map).forEach(([key, value]) => {
+            Object.values(map).forEach(value => {
                 value.active = value.cases - value.deaths - value.recovered;
                 dataArray.push(value);
             });
@@ -158,8 +166,17 @@ class TableContainerController extends ComponentController {
      * @param {String} countryName
      */
     loadHistoricalData(countryName) {
-        let me      = this,
-            apiPath = me.apiBaseUrl + me.apiHistoricalDataEndpoint + countryName + '?lastdays=' + me.apiHistoricalDataTimeRange;
+        let me               = this,
+            {useFallbackApi} = Neo.config,
+            apiPath = useFallbackApi ?
+                (me.apiFallbackBaseUrl + me.apiFallbackHistoricalDataEndpoint) :
+                (me.apiBaseUrl         + me.apiHistoricalDataEndpoint);
+
+        if (useFallbackApi) {
+            apiPath += (countryName + '.json')
+        } else {
+            apiPath += (countryName + '?lastdays=' + me.apiHistoricalDataTimeRange)
+        }
 
         fetch(apiPath)
             .then(response => response.json())
@@ -205,7 +222,6 @@ class TableContainerController extends ComponentController {
             me.selectedRecord = null;
         }
 
-        // removed optional chaining for now, see: https://github.com/neomjs/neo/issues/467
         me.loadHistoricalData(record?.countryInfo?.iso2 || 'all');
 
         me.getReference('historical-data-label').html = 'Historical Data (' + (record?.country || 'World') + ')';

package/apps/covid/view/country/Table.mjs

@@ -120,9 +120,9 @@ class Table extends Container {
      */
     afterSetCountry(value, oldValue) {
         if (oldValue !== undefined) {
-            let me             = this,
-                selectionModel = me.selectionModel,
-                view           = me.view,
+            let me               = this,
+                {view}           = me,
+                {selectionModel} = view,
                 id;
 
             if (view) {

package/apps/portal/index.html

@@ -16,7 +16,7 @@
         "@type": "Organization",
         "name": "Neo.mjs"
       },
-      "datePublished": "2025-04-09",
+      "datePublished": "2025-04-14",
       "publisher": {
         "@type": "Organization",
         "name": "Neo.mjs"

package/apps/portal/view/home/FooterContainer.mjs

@@ -107,7 +107,7 @@ class FooterContainer extends Container {
             }, {
                 module: Component,
                 cls   : ['neo-version'],
-                html  : 'v8.42.0'
+                html  : 'v8.43.0'
             }]
         }],
         /**

package/apps/sharedcovid/neo-config.json

@@ -5,5 +5,6 @@
     "mainPath"        : "./Main.mjs",
     "mainThreadAddons": ["AmCharts", "DragDrop", "MapboxGL", "Navigator", "Stylesheet"],
     "themes"          : ["neo-theme-dark", "neo-theme-light"],
+    "useFallbackApi"  : true,
     "useSharedWorkers": true
 }