Merge pull request #495 from dhis2/next

chore(release): release redesign

CHANGELOG.md

@@ -1,3 +1,100 @@
+# [2.23.0](https://github.com/dhis2/app-hub/compare/v2.22.0...v2.23.0) (2021-05-25)
+
+
+### Features
+
+* more informative user-facing errors regarding metadata verification ([#490](https://github.com/dhis2/app-hub/issues/490)) ([47fb951](https://github.com/dhis2/app-hub/commit/47fb951868aafc2c8fd236b38ffeda98437e30e5))
+
+# [2.22.0](https://github.com/dhis2/app-hub/compare/v2.21.0...v2.22.0) (2021-05-21)
+
+
+### Features
+
+* **apps:** add filter-option for core-apps ([#482](https://github.com/dhis2/app-hub/issues/482)) ([a7b27c8](https://github.com/dhis2/app-hub/commit/a7b27c855df956c319f1a4174dbde4c6f4adc3e3))
+
+# [2.21.0](https://github.com/dhis2/app-hub/compare/v2.20.0...v2.21.0) (2021-05-20)
+
+
+### Features
+
+* verify metadata ([#466](https://github.com/dhis2/app-hub/issues/466)) ([196698e](https://github.com/dhis2/app-hub/commit/196698e68498aea9a2623761135e2c2aa902542b))
+
+# [2.20.0](https://github.com/dhis2/app-hub/compare/v2.19.0...v2.20.0) (2021-05-19)
+
+
+### Features
+
+* emailservice and user email migration ([#463](https://github.com/dhis2/app-hub/issues/463)) ([27e91a5](https://github.com/dhis2/app-hub/commit/27e91a5a60014d3f471a12888082732d01531da0))
+* UI redesign ([#458](https://github.com/dhis2/app-hub/issues/458)) ([d4621ca](https://github.com/dhis2/app-hub/commit/d4621ca3ab58fe5f92f9be00bc17e3e3f3e732c5))
+
+# [2.19.0](https://github.com/dhis2/app-hub/compare/v2.18.2...v2.19.0) (2021-05-07)
+
+
+### Bug Fixes
+
+* **version-api:** use server-package.json for version information ([#476](https://github.com/dhis2/app-hub/issues/476)) ([5a1e1be](https://github.com/dhis2/app-hub/commit/5a1e1be96bacb7bb4fba24211eeadbeda9ef10d0))
+
+
+### Features
+
+* add version API ([#473](https://github.com/dhis2/app-hub/issues/473)) ([dbc2732](https://github.com/dhis2/app-hub/commit/dbc2732dba8eb63b93cf9b5731087405da5a65e7))
+
+## [2.18.2](https://github.com/dhis2/app-hub/compare/v2.18.1...v2.18.2) (2021-05-04)
+
+
+### Bug Fixes
+
+* use punycode.toASCII instead of punycode.encode ([#471](https://github.com/dhis2/app-hub/issues/471)) ([857a180](https://github.com/dhis2/app-hub/commit/857a180ba13a80caa70a381f19a3cdbeee9c2b41))
+
+## [2.18.1](https://github.com/dhis2/app-hub/compare/v2.18.0...v2.18.1) (2021-04-30)
+
+
+### Bug Fixes
+
+* encode strings with punycode before generating slug ([#468](https://github.com/dhis2/app-hub/issues/468)) ([26edb4b](https://github.com/dhis2/app-hub/commit/26edb4b3c8802c08b8967c0e6e519b3d4f0b4c47))
+
+# [2.18.0](https://github.com/dhis2/app-hub/compare/v2.17.1...v2.18.0) (2021-04-30)
+
+
+### Features
+
+* backend changes required by redesign ([#467](https://github.com/dhis2/app-hub/issues/467)) ([4cc9e44](https://github.com/dhis2/app-hub/commit/4cc9e4491e743336fa78342f8b0e4102bc553176))
+
+## [2.17.1](https://github.com/dhis2/app-hub/compare/v2.17.0...v2.17.1) (2021-04-20)
+
+
+### Bug Fixes
+
+* remove debug lines that spam logs ([#460](https://github.com/dhis2/app-hub/issues/460)) ([9059307](https://github.com/dhis2/app-hub/commit/9059307ececc7da600f0fd8a34a0b10afa952772))
+
+# [2.17.0](https://github.com/dhis2/app-hub/compare/v2.16.1...v2.17.0) (2021-04-15)
+
+
+### Features
+
+* validate mimetypes ([#461](https://github.com/dhis2/app-hub/issues/461)) ([0e8fba3](https://github.com/dhis2/app-hub/commit/0e8fba33ec6c1ce92eb72a51901ad22bca80b452))
+
+## [2.16.1](https://github.com/dhis2/app-hub/compare/v2.16.0...v2.16.1) (2021-04-06)
+
+
+### Bug Fixes
+
+* show query in input when returning from search result ([#456](https://github.com/dhis2/app-hub/issues/456)) ([3890057](https://github.com/dhis2/app-hub/commit/389005710a4fd32632ec66ea154083e52fe65e1f))
+
+# [2.16.0](https://github.com/dhis2/app-hub/compare/v2.15.0...v2.16.0) (2021-03-22)
+
+
+### Features
+
+* add env-var for skipping db-migration ([#455](https://github.com/dhis2/app-hub/issues/455)) ([b5e8aae](https://github.com/dhis2/app-hub/commit/b5e8aaeae5512b1cbf324d436af0baaed431faf4))
+
+# [2.15.0](https://github.com/dhis2/app-hub/compare/v2.14.0...v2.15.0) (2021-03-18)
+
+
+### Features
+
+* **apikey:** frontend for api key generation ([#454](https://github.com/dhis2/app-hub/issues/454)) ([4096b03](https://github.com/dhis2/app-hub/commit/4096b036947000599ad4bc6722f9b9e5e1e239de))
+
 # [2.14.0](https://github.com/dhis2/app-hub/compare/v2.13.1...v2.14.0) (2021-03-12)
 
 

client/.eslintrc.js

@@ -3,7 +3,18 @@ const { config } = require('@dhis2/cli-style')
 module.exports = {
     extends: [config.eslintReact],
     rules: {
-        "react/prop-types": [1],
-        "no-unused-vars": ['error', { ignoreRestSiblings: true }],
-    }
+        'react/prop-types': [1],
+        'no-unused-vars': ['error', { ignoreRestSiblings: true }],
+        'react/no-unescaped-entities': 'off',
+        'react/react-in-jsx-scope': 'off',
+    },
+    globals: {
+        __APP_INFO__: 'readonly',
+        __APP_CONFIG__: 'readonly',
+        Cypress: 'readonly',
+        cy: 'readonly',
+    },
+    settings: {
+        'import/resolver': 'webpack',
+    },
 }

client/.prettierrc.js

@@ -0,0 +1,5 @@
+const { config } = require('@dhis2/cli-style')
+
+module.exports = {
+    ...require(config.prettier),
+}

client/babel.config.js

@@ -1,19 +1,15 @@
-module.exports = function(api) {
+module.exports = function (api) {
     api.cache(true)
 
     return {
         presets: [
+            '@babel/preset-env',
             [
-                '@babel/preset-env',
+                '@babel/preset-react',
                 {
-                    useBuiltIns: 'entry',
-                    corejs: '3',
-                    targets: {
-                        node: 'current',
-                    },
+                    runtime: 'automatic',
                 },
             ],
-            '@babel/preset-react',
         ],
         plugins: [
             [

client/config/configResolver.js

@@ -22,20 +22,25 @@ function getConfig() {
     if (getConfig.config) {
         return getConfig.config
     }
+
     const production = process.env.NODE_ENV || (!isDevBuild && 'production')
     const nodeEnv = production || 'development'
     const config = {}
 
     //Get default config
-    let configs = defaultConfigs.map(filename => loadFile(filename))
-    configs = configs.filter(config => !!config).map(cfg => merge(config, cfg))
+    const configs = defaultConfigs
+        .map(filename => loadFile(filename))
+        .filter(config => !!config)
+    configs.forEach(cfg => merge(config, cfg))
+
     //Get environment specific config
     if (envConfigNames[nodeEnv]) {
-        const configs = envConfigNames[nodeEnv].map(filename =>
-            loadFile(filename)
-        )
-        configs.filter(config => !!config).map(cfg => merge(config, cfg))
+        const configs = envConfigNames[nodeEnv]
+            .map(filename => loadFile(filename))
+            .filter(config => !!config)
+        configs.forEach(cfg => merge(config, cfg))
     }
+
     getConfig.config = config
     return config
 }

client/cypress/integration/app-details/index.js

@@ -7,10 +7,6 @@ Given('that a user clicks an app in the list', () => {
 })
 
 Then('the user can see details about that app', () => {
-    cy.get('[data-test="app-card-header"]')
-        .its('length')
-        .should('be', 1)
-    cy.get('.multiline-content')
-        .its('length')
-        .should('be', 1)
+    cy.get('[data-test="app-card-header"]').its('length').should('be', 1)
+    cy.get('.multiline-content').its('length').should('be', 1)
 })

client/cypress/integration/browse-published-apps/index.js

@@ -5,7 +5,5 @@ Given('that I visit the start page', () => {
 })
 
 Then('I can see at least one available app', () => {
-    cy.get('[data-test="app-card"]')
-        .its('length')
-        .should('be.gte', 1)
+    cy.get('[data-test="app-card"]').its('length').should('be.gte', 1)
 })

client/cypress/plugins/index.js

@@ -13,6 +13,6 @@
 
 const cucumber = require('cypress-cucumber-preprocessor').default
 
-module.exports = (on, config) => {
+module.exports = on => {
     on('file:preprocessor', cucumber())
 }

client/default.config.js

@@ -32,11 +32,12 @@ module.exports = {
             DASHBOARD_WIDGET: 'Dashboard',
             TRACKER_DASHBOARD_WIDGET: 'Tracker Dashboard',
         },
+        defaultAppType: 'APP',
         appChannelToDisplayName: {
             stable: 'Stable',
             development: 'Development',
             canary: 'Canary',
         },
-        defaultAppChannel: 'stable'
+        defaultAppChannel: 'stable',
     },
 }

client/development.config.js

@@ -12,5 +12,5 @@ module.exports = {
     routes: {
         baseAppName: '/',
     },
-    ui: defaultConfig.ui
+    ui: defaultConfig.ui,
 }

client/indexbuild.html

@@ -22,10 +22,9 @@
             rel="stylesheet"
         />
         <link
-            href="https://fonts.googleapis.com/css?family=Roboto:100,200,300,400"
+            href="https://fonts.googleapis.com/css?family=Roboto:400,500,700"
             rel="stylesheet"
         />
-
     </head>
     <body>
         <div id="appHub"></div>

client/package.json

@@ -1,57 +1,47 @@
 {
     "name": "client",
-    "version": "2.14.0",
+    "version": "2.23.0",
     "description": "The App Hub Client",
-    "main": "src/index.js",
     "repository": "https://github.com/dhis2/app-hub",
     "author": "Birk Johansson <[email protected]>",
     "license": "BSD-3-Clause",
     "private": true,
     "scripts": {
         "build": "cross-env NODE_ENV=production webpack -p --config ./webpack.config.js",
         "start": "cross-env NODE_ENV=development webpack-dev-server",
-        "test": "cross-env NODE_ENV=test mocha --opts test/mocha.opts"
+        "test": "cross-env NODE_ENV=test mocha --opts test/mocha.opts",
+        "format": "yarn format:js && yarn format:text",
+        "format:staged": "yarn format:js --staged && yarn format:text --staged",
+        "format:js": "d2-style js apply",
+        "format:text": "d2-style text apply"
     },
     "dependencies": {
         "@auth0/auth0-react": "^1.2.0",
+        "@dhis2/d2-i18n": "^1.1.0",
+        "@dhis2/ui": "^6.6.1",
         "classnames": "^2.2.5",
+        "copy-text-to-clipboard": "^3.0.1",
         "core-js": "^3.4.8",
-        "css-loader": "^0.26.1",
         "debug": "^4.1.1",
-        "file-loader": "^3.0.1",
         "history": "^4.5.1",
         "html-webpack-plugin": "^3.2.0",
+        "jsonwebtoken": "^8.5.1",
         "jwt-decode": "^2.1.0",
         "lodash": "^4.17.19",
-        "material-components-web": "^0.16.0",
-        "material-design-icons": "^3.0.1",
-        "material-ui": "0",
         "query-string": "^6.14.0",
-        "react": "^16.14.0",
-        "react-animate-height": "^2.0.23",
-        "react-dom": "16",
+        "react": "^17.0.2",
+        "react-dom": "^17.0.2",
         "react-redux": "^7.2.1",
-        "react-router": "^5.2.0",
         "react-router-dom": "^5.2.0",
-        "react-slick": "^0.28.0",
-        "react-transition-group": "^2.2.0",
-        "recompose": "^0.30.0",
         "redux": "^4.0.5",
-        "redux-form": "8",
         "redux-logger": "^3.0.6",
         "redux-observable": "1",
-        "redux-optimistic-ui": "^3.0.0",
-        "regenerator-runtime": "^0.13.3",
-        "reselect": "^4.0.0",
         "rxjs": "6",
         "semver": "^7.3.2",
-        "slick-carousel": "^1.8.1",
-        "style-loader": "^0.13.1",
-        "svg-loader": "^0.0.2",
+        "styled-jsx": "3.3.0",
         "swr": "^0.4.1",
-        "transform-imports": "^2.0.0",
-        "use-query-params": "^1.1.9",
-        "whatwg-fetch": "^3.4.1"
+        "use-debounce": "^6.0.0",
+        "use-query-params": "^1.1.9"
     },
     "devDependencies": {
         "@babel/core": "^7.8.7",
@@ -60,16 +50,26 @@
         "@babel/preset-env": "^7.9.0",
         "@babel/preset-react": "^7.9.1",
         "@babel/register": "^7.9.0",
+        "@svgr/webpack": "^5.5.0",
         "babel-loader": "^8.1.0",
         "babel-plugin-rewire": "^1.2.0",
         "babel-plugin-transform-imports": "^1.5.1",
         "chai": "^4.2.0",
         "chai-as-promised": "^7.1.1",
         "copy-webpack-plugin": "^5.1.1",
+        "css-loader": "^1.0.1",
+        "cypress-cucumber-preprocessor": "^4.0.3",
+        "eslint-import-resolver-webpack": "^0.13.0",
+        "file-loader": "^3.0.1",
+        "html-webpack-plugin": "^3.2.0",
+        "isomorphic-fetch": "^3.0.0",
         "jsdom": "^15.2.0",
         "mocha": "^6.2.2",
         "sinon": "^7.5.0",
         "sinon-chai": "^3.3.0",
+        "style-loader": "^0.13.1",
+        "svg-loader": "^0.0.2",
+        "transform-imports": "^2.0.0",
         "webpack": "^4.41.2",
         "webpack-cli": "^3.3.5",
         "webpack-dev-server": "^3.8.2"