2.0.5 - fix month values in case of numbers 1,2,5

ua-cron · Jan 5, 2023 · 2dad068 · 2dad068
1 parent 56b4b2b
commit 2dad068
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 38 deletions.
diff --git a/cypress/component/test.cy.tsx b/cypress/component/test.cy.tsx
@@ -2,12 +2,13 @@ import React from 'react'
 import { mount } from '@cypress/react'
 
 import { activeTab, cssClasses, localization, disabled, tabChange, tabs, hideTabs, values } from '@sbzen/e2e';
+
 import { App } from './app';
 
 const beforeEachCb = () => beforeEach(() => mount(<App/>));
 
 activeTab(beforeEachCb);
-cssClasses(beforeEachCb);
+cssClasses(beforeEachCb, false);
 localization(beforeEachCb);
 disabled(beforeEachCb);
 tabChange(beforeEachCb);

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -49,7 +49,7 @@
     "@babel/core": "^7.18.6",
     "@babel/preset-typescript": "^7.18.6",
     "@cypress/react": "^6.1.0",
-    "@sbzen/e2e": "https://github.com/ua-cron/e2e/releases/download/20230104041219/dist.tar.gz",
+    "@sbzen/e2e": "https://github.com/ua-cron/e2e/releases/download/20230105205943/dist.tar.gz",
     "@storybook/addon-actions": "^6.5.10",
     "@storybook/addon-essentials": "^6.5.10",
     "@storybook/addon-interactions": "^6.5.10",

diff --git a/src/lib/helpers.ts b/src/lib/helpers.ts
@@ -5,7 +5,7 @@ import { DeepPartial, localization, CronLocalization } from './cron-localization
 export const genSessionId = () => `${Date.now()}_${Math.random()}`;
 
 export const genClassName = (cssClassPrefix = '', classes: string[], noPrefixClasses: string[] = []) => {
-  const prefixed = classes.map(c => cssClassPrefix + c);
+  const prefixed = classes.filter(c => !!c).map(c => cssClassPrefix + c);
   return prefixed.concat(noPrefixClasses).join(' ');
 };
 

diff --git a/src/lib/quartz/quartz.tsx b/src/lib/quartz/quartz.tsx
@@ -102,21 +102,23 @@ export const ReQuartzCron = ({
   const genTab = (tab: QuartzType, activeTab: QuartzType) => {
     const { tabs: tabsLocalization } = localization;
     const isActive = activeTab === tab;
-    const className = genClassName(cssClassPrefix, ['nav-link'], [tab, 'c-tab', isActive ? 'active': '']);
+    const className = genClassName(cssClassPrefix, ['nav-link', isActive ? 'active': ''], [tab, 'c-tab']);
     const tabKey = tab.toLowerCase() as keyof typeof tabsLocalization;
 
     return (
-      <button
-        key={tab}
-        role="tab"
-        type="button"
-        className={className}
-        aria-selected={isActive}
-        tabIndex={isActive ? 0 : -1}
-        onClick={() => changeTab(tab)}>
+      <li className={genClassName(cssClassPrefix, ['nav-item'], ['c-tab-item'])}>
+        <button
+          key={tab}
+          role="tab"
+          type="button"
+          className={className}
+          aria-selected={isActive}
+          tabIndex={isActive ? 0 : -1}
+          onClick={() => changeTab(tab)}>
 
-        {tabsLocalization[tabKey]}
-      </button>
+          {tabsLocalization[tabKey]}
+        </button>
+      </li>
     );
   };
 

diff --git a/src/lib/unix/unix.tsx b/src/lib/unix/unix.tsx
@@ -94,21 +94,23 @@ export const ReUnixCron = ({
   const genTab = (tab: UnixType, activeTab: UnixType) => {
     const { tabs: tabsLocalization } = localization;
     const isActive = activeTab === tab;
-    const className = genClassName(cssClassPrefix, ['nav-link'], [tab, 'c-tab', isActive ? 'active': '']);
+    const className = genClassName(cssClassPrefix, ['nav-link', isActive ? 'active': ''], [tab, 'c-tab']);
     const tabKey = tab.toLowerCase() as keyof typeof tabsLocalization;
 
     return (
-      <button
-        key={tab}
-        role="tab"
-        type="button"
-        className={className}
-        aria-selected={isActive}
-        tabIndex={isActive ? 0 : -1}
-        onClick={() => changeTab(tab)}>
-
-        {tabsLocalization[tabKey]}
-      </button>
+      <li className={genClassName(cssClassPrefix, ['nav-item'], ['c-tab-item'])}>
+        <button
+          key={tab}
+          role="tab"
+          type="button"
+          className={className}
+          aria-selected={isActive}
+          tabIndex={isActive ? 0 : -1}
+          onClick={() => changeTab(tab)}>
+
+          {tabsLocalization[tabKey]}
+        </button>
+      </li>
     );
   };
 

diff --git a/src/stories/unix-cron.stories.tsx b/src/stories/unix-cron.stories.tsx
@@ -44,5 +44,5 @@ export default {
 const Template: Story<ReUnixCronProps> = args => <Wrapper {...args} />;
 export const Default = Template.bind({});
 Default.args = {
-  value: '0 40 7 ? * MON-FRI *'
+  value: '0 0 1 2,4 *'
 };