cozy-ui 111.14.0 → 111.15.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [111.15.1](https://github.com/cozy/cozy-ui/compare/v111.15.0...v111.15.1) (2024-10-09)
+
+
+### Bug Fixes
+
+* Show additional apps only when there ones ([64c6c5e](https://github.com/cozy/cozy-ui/commit/64c6c5e))
+
+# [111.15.0](https://github.com/cozy/cozy-ui/compare/v111.14.0...v111.15.0) (2024-10-09)
+
+
+### Features
+
+* **Icon:** Add `stop` ([f975a5d](https://github.com/cozy/cozy-ui/commit/f975a5d))
+
 # [111.14.0](https://github.com/cozy/cozy-ui/compare/v111.13.0...v111.14.0) (2024-10-03)
 
 

package/assets/icons/ui/stop.svg

@@ -0,0 +1 @@
+<svg width="12" height="12" viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg"><path d="M.75 1.5A.75.75 0 0 1 1.5.75h9a.75.75 0 0 1 .75.75v9a.75.75 0 0 1-.75.75h-9a.75.75 0 0 1-.75-.75v-9Z"/></svg>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-ui",
-  "version": "111.14.0",
+  "version": "111.15.1",
   "description": "Cozy apps UI SDK",
   "main": "./index.js",
   "bin": {

package/react/AppSections/__snapshots__/index.spec.jsx.snap

@@ -1075,11 +1075,6 @@ exports[`AppsSection component should render dropdown filter on mobile if no nav
           "type": "webapp",
           "value": "partners",
         },
-        Object {
-          "label": "Additional apps",
-          "secondary": false,
-          "value": "shortcuts",
-        },
         Object {
           "label": "Services",
           "secondary": false,
@@ -1481,11 +1476,6 @@ exports[`AppsSection component should render dropdown filter on tablet if no nav
           "type": "webapp",
           "value": "partners",
         },
-        Object {
-          "label": "Additional apps",
-          "secondary": false,
-          "value": "shortcuts",
-        },
         Object {
           "label": "Services",
           "secondary": false,

package/react/AppSections/categories.js

@@ -109,7 +109,9 @@ export const generateOptionsFromApps = (apps, options = {}) => {
         })
       )
     }
-    if (type === APP_TYPE.FILE) {
+
+    const categories = Object.keys(catApps)
+    if (type === APP_TYPE.FILE && categories.length > 0) {
       allCategoryOptions.push(
         addLabel({
           value: 'shortcuts',
@@ -117,7 +119,8 @@ export const generateOptionsFromApps = (apps, options = {}) => {
         })
       )
     }
-    const categoryOptions = Object.keys(catApps).map(cat => {
+
+    const categoryOptions = categories.map(cat => {
       return addLabel({
         value: cat,
         type: type,

package/react/AppSections/categories.spec.js

@@ -10,7 +10,14 @@ import { I18nContext } from '../jestLib/I18n'
 import mockApps from '../mocks/apps'
 
 const i18nContext = I18nContext({
-  locale: en
+  locale: {
+    ...en,
+    app_categories: {
+      ...en.app_categories,
+      foo: 'Foo',
+      bar: 'Bar'
+    }
+  }
 })
 const tMock = i18nContext.t
 
@@ -104,7 +111,6 @@ describe('generateOptionsFromApps', () => {
         type: 'webapp',
         value: 'others'
       },
-      { label: 'Additional apps', secondary: false, value: 'shortcuts' },
       {
         label: 'Services',
         secondary: false,
@@ -157,11 +163,6 @@ describe('generateOptionsFromApps', () => {
         type: 'webapp',
         value: 'others'
       },
-      {
-        label: 'Additional apps',
-        secondary: false,
-        value: 'shortcuts'
-      },
       {
         label: 'Services',
         secondary: false,
@@ -199,4 +200,90 @@ describe('generateOptionsFromApps', () => {
       catUtils.generateOptionsFromApps(null, { includeAll: false, addLabel })
     ).toEqual([])
   })
+
+  it('should return additional apps categories when there more than one', () => {
+    const appsWithAdditionlOnes = [
+      ...mockApps,
+      {
+        _id: 'shortcutA',
+        name: 'Shortcut A',
+        categories: ['foo'],
+        type: 'file',
+        _type: 'io.cozy.files'
+      },
+      {
+        _id: 'shortcutB',
+        name: 'Shortcut B',
+        categories: ['bar'],
+        type: 'file',
+        _type: 'io.cozy.files'
+      }
+    ]
+
+    expect(
+      catUtils.generateOptionsFromApps(appsWithAdditionlOnes, {
+        includeAll: false,
+        addLabel
+      })
+    ).toEqual([
+      {
+        label: 'The essentials',
+        secondary: false,
+        type: 'webapp',
+        value: 'cozy'
+      },
+      {
+        label: 'Partners',
+        secondary: false,
+        type: 'webapp',
+        value: 'partners'
+      },
+      {
+        label: 'Others',
+        secondary: false,
+        type: 'webapp',
+        value: 'others'
+      },
+      {
+        label: 'Additional apps',
+        secondary: false,
+        value: 'shortcuts'
+      },
+      {
+        label: 'Bar',
+        secondary: true,
+        type: 'file',
+        value: 'bar'
+      },
+      {
+        label: 'Foo',
+        secondary: true,
+        type: 'file',
+        value: 'foo'
+      },
+      {
+        label: 'Services',
+        secondary: false,
+        value: 'konnectors'
+      },
+      {
+        label: 'Mobile and Internet',
+        secondary: true,
+        type: 'konnector',
+        value: 'isp'
+      },
+      {
+        label: 'Telecom',
+        secondary: true,
+        type: 'konnector',
+        value: 'telecom'
+      },
+      {
+        label: 'Transportation',
+        secondary: true,
+        type: 'konnector',
+        value: 'transport'
+      }
+    ])
+  })
 })

package/react/Icon/Readme.md

@@ -288,6 +288,7 @@ import Stack from 'cozy-ui/transpiled/react/Icons/Stack'
 import Star from 'cozy-ui/transpiled/react/Icons/Star'
 import StarOutline from 'cozy-ui/transpiled/react/Icons/StarOutline'
 import Stats from 'cozy-ui/transpiled/react/Icons/Stats'
+import Stop from 'cozy-ui/transpiled/react/Icons/Stop'
 import Subway from 'cozy-ui/transpiled/react/Icons/Subway'
 import Support from 'cozy-ui/transpiled/react/Icons/Support'
 import Swap from 'cozy-ui/transpiled/react/Icons/Swap'
@@ -550,6 +551,7 @@ const icons = [
   Star,
   StarOutline,
   Stats,
+  Stop,
   Subway,
   Support,
   Swap,
@@ -923,7 +925,7 @@ import Typography from 'cozy-ui/transpiled/react/Typography'
 
 const colors = ['#297EF2', '#08b442', '#B449E7', '#F52D2D', '#FF962F']
 let i = 0
-const availableIcons = ['album-add','album-remove','album','answer','apple','archive','arrowUp','attachment','attention','bank-check','bank','banking-add','banking','bell','benefit','bike','bill','bottom','browser-brave','browser-chrome','browser-duckduckgo','browser-edge','browser-edge-chromium','browser-firefox','browser-ie','browser-opera','browser-safari','burger','bus','calendar','camera','car','carbonCopy','carpooling','categories','certified','check-circle','check-list','check-square','check','checkbox','chess','child','circle-filled','clock','clock-outline','cloud-happy','cloud','collect','cocktail','comment','company','compare','compass','connector','contract','contrast','copy','cozy-circle','cozy-laugh', 'cozy-lock', 'cozy-text', 'cozy-release', 'credit-card-add','credit-card','credit','crop','cross-circle-outline','cross-circle','cross-medium','cross-small','cross','cube','dash','dashboard','data-control','debit','devices','dots','down','download','drawing-arrow-up','dropdown-close','dropdown-open','dropdown','dropup','electric-bike','electric-car','electric-scooter','email-notification','email','eu','euro','exchange','eye-closed','eye','face-id','file-add','file-duotone','file-new','file-none','file-outline','file','filter','fingerprint','fitness','flag-outlined','flag','flash-auto','flashlight','folder-add','folder-moveto','folder','forbidden','from-user','gear','globe','gouv','graph-circle','grid','group-list','groups','growth','hand','heart','help','help-outlined','history','home','hourglass','image','info-outlined','info','justice','key','label-outlined','laudry','laptop','left','library','lightbulb','lightning','link-out','link','list','list-min','location','lock', 'lock-screen', 'logout','magic-trick','magnet','magnifier','merge','moped','mosaic-min','motorcycle','mountain','movement-in','movement-out','mouvement','moveto','multi-files','music','new','next','note','notification-email','offline','online', 'openapp', 'openwith','palette','paper','paperplane','password','pen','people','percent-circle','percent','personal-data','phone-download','phone-upload','phone','pie-chart','pin','plane','plus-small','plus', 'pop-inside', 'previous','printer','qualify','radio-checked','radio-unchecked','refresh','relationship','remboursement','rename','repare','reply','restaurant','restore-straight','restore','right','rise','rotate-left','rotate-right','sad-cozy','safe','school','scooter','select-all','setting','share-circle','share','shield','shop','sound','spinner','sport-bag','stack','star','star-outline','stats','subway', 'support', 'swap', 'sync-cozy','sync','tag','target','task','team','telecom','telephone','text-info','to-the-cloud','top','train','tram','trash','trophy', 'uncloud', 'unknow','unlink','unlock','up','upload','videos','walk','wallet-add','wallet-new','wallet','warn','warning-circle','warning','water','wrench-circle','work']
+const availableIcons = ['album-add','album-remove','album','answer','apple','archive','arrowUp','attachment','attention','bank-check','bank','banking-add','banking','bell','benefit','bike','bill','bottom','browser-brave','browser-chrome','browser-duckduckgo','browser-edge','browser-edge-chromium','browser-firefox','browser-ie','browser-opera','browser-safari','burger','bus','calendar','camera','car','carbonCopy','carpooling','categories','certified','check-circle','check-list','check-square','check','checkbox','chess','child','circle-filled','clock','clock-outline','cloud-happy','cloud','collect','cocktail','comment','company','compare','compass','connector','contract','contrast','copy','cozy-circle','cozy-laugh', 'cozy-lock', 'cozy-text', 'cozy-release', 'credit-card-add','credit-card','credit','crop','cross-circle-outline','cross-circle','cross-medium','cross-small','cross','cube','dash','dashboard','data-control','debit','devices','dots','down','download','drawing-arrow-up','dropdown-close','dropdown-open','dropdown','dropup','electric-bike','electric-car','electric-scooter','email-notification','email','eu','euro','exchange','eye-closed','eye','face-id','file-add','file-duotone','file-new','file-none','file-outline','file','filter','fingerprint','fitness','flag-outlined','flag','flash-auto','flashlight','folder-add','folder-moveto','folder','forbidden','from-user','gear','globe','gouv','graph-circle','grid','group-list','groups','growth','hand','heart','help','help-outlined','history','home','hourglass','image','info-outlined','info','justice','key','label-outlined','laudry','laptop','left','library','lightbulb','lightning','link-out','link','list','list-min','location','lock', 'lock-screen', 'logout','magic-trick','magnet','magnifier','merge','moped','mosaic-min','motorcycle','mountain','movement-in','movement-out','mouvement','moveto','multi-files','music','new','next','note','notification-email','offline','online', 'openapp', 'openwith','palette','paper','paperplane','password','pen','people','percent-circle','percent','personal-data','phone-download','phone-upload','phone','pie-chart','pin','plane','plus-small','plus', 'pop-inside', 'previous','printer','qualify','radio-checked','radio-unchecked','refresh','relationship','remboursement','rename','repare','reply','restaurant','restore-straight','restore','right','rise','rotate-left','rotate-right','sad-cozy','safe','school','scooter','select-all','setting','share-circle','share','shield','shop','sound','spinner','sport-bag','stack','star','star-outline','stats','stop', 'subway', 'support', 'swap', 'sync-cozy','sync','tag','target','task','team','telecom','telephone','text-info','to-the-cloud','top','train','tram','trash','trophy', 'uncloud', 'unknow','unlink','unlock','up','upload','videos','walk','wallet-add','wallet-new','wallet','warn','warning-circle','warning','water','wrench-circle','work']
 ;
 <div style={{ fontSize: '2rem', display: 'grid', gridTemplateColumns: 'repeat(6, 1fr)' }}>
   <Sprite />

package/react/Icons/Stop.jsx

@@ -0,0 +1,12 @@
+// Automatically created, please run `scripts/generate-svgr-icon.sh assets/icons/ui/stop.svg` to regenerate;
+import React from 'react'
+
+function SvgStop(props) {
+  return (
+    <svg viewBox="0 0 12 12" {...props}>
+      <path d="M.75 1.5A.75.75 0 011.5.75h9a.75.75 0 01.75.75v9a.75.75 0 01-.75.75h-9a.75.75 0 01-.75-.75v-9z" />
+    </svg>
+  )
+}
+
+export default SvgStop

package/transpiled/react/AppSections/categories.js

@@ -141,14 +141,16 @@ export var generateOptionsFromApps = function generateOptionsFromApps(apps) {
       }));
     }
 
-    if (type === APP_TYPE.FILE) {
+    var categories = Object.keys(catApps);
+
+    if (type === APP_TYPE.FILE && categories.length > 0) {
       allCategoryOptions.push(addLabel({
         value: 'shortcuts',
         secondary: false
       }));
     }
 
-    var categoryOptions = Object.keys(catApps).map(function (cat) {
+    var categoryOptions = categories.map(function (cat) {
       return addLabel({
         value: cat,
         type: type,