From 5a1d5899fe5b3d9398f7ef99db697eb73a7c0177 Mon Sep 17 00:00:00 2001 From: Emil Lipskij Date: Sun, 30 Jul 2023 14:52:35 +0300 Subject: [PATCH 1/2] BottomStatus Vue component --- .../quad-status/BottomStatusIcons.stories.js | 16 ++ .../quad-status/BottomStatusIcons.vue | 137 ++++++++++++++++++ 2 files changed, 153 insertions(+) create mode 100644 src/components/quad-status/BottomStatusIcons.stories.js create mode 100644 src/components/quad-status/BottomStatusIcons.vue diff --git a/src/components/quad-status/BottomStatusIcons.stories.js b/src/components/quad-status/BottomStatusIcons.stories.js new file mode 100644 index 0000000000..e8ff2a35aa --- /dev/null +++ b/src/components/quad-status/BottomStatusIcons.stories.js @@ -0,0 +1,16 @@ +import BottomStatusIcons from "./BottomStatusIcons"; + +// More on default export: https://storybook.js.org/docs/vue/writing-stories/introduction#default-export +export default { + title: "Bottom status icons", + component: BottomStatusIcons, +}; + +// More on component templates: https://storybook.js.org/docs/vue/writing-stories/introduction#using-args +const Template = (_args, { argTypes }) => ({ + props: Object.keys(argTypes), + components: { BottomStatusIcons }, + template: '', +}); + +export const Primary = Template.bind({}); diff --git a/src/components/quad-status/BottomStatusIcons.vue b/src/components/quad-status/BottomStatusIcons.vue new file mode 100644 index 0000000000..de89414fbf --- /dev/null +++ b/src/components/quad-status/BottomStatusIcons.vue @@ -0,0 +1,137 @@ + + + + + From 8a1ac26eadf5e164f0cef84939e322860344bcfa Mon Sep 17 00:00:00 2001 From: Emil Lipskij Date: Sun, 30 Jul 2023 15:25:12 +0300 Subject: [PATCH 2/2] refactor sugestions --- .../quad-status/BottomStatusIcons.vue | 38 ++++++------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/src/components/quad-status/BottomStatusIcons.vue b/src/components/quad-status/BottomStatusIcons.vue index de89414fbf..516c7ee628 100644 --- a/src/components/quad-status/BottomStatusIcons.vue +++ b/src/components/quad-status/BottomStatusIcons.vue @@ -25,39 +25,25 @@ export default { props: { lastReceivedTimestamp: { type: Number, default: 0 }, mode: { type: Number, default: 0 }, - auxConfig: { type: Object, default: null }, + auxConfig: { type: Array, default: null }, }, computed: { setActiveArmed() { - if (!this.auxConfig?.length) { - return false; - } - if ( - this.auxConfig.includes("ARM") && - bit_check(this.mode, this.auxConfig.indexOf("ARM")) - ) { - return true; - } - return false; + return ( + this.auxConfig?.length && + this.auxConfig?.includes("ARM") && + bit_check(this.mode, this.auxConfig?.indexOf("ARM")) + ); }, setFailsafeActive() { - if (!this.auxConfig?.length) { - return false; - } - if ( - this.auxConfig.includes("FAILSAFE") && - bit_check(this.mode, this.auxConfig.indexOf("FAILSAFE")) - ) { - return true; - } - return false; + return ( + this.auxConfig?.length && + this.auxConfig?.includes("FAILSAFE") && + bit_check(this.mode, this.auxConfig?.indexOf("FAILSAFE")) + ); }, setActiveLink() { - const active = performance.now() - this.lastReceivedTimestamp < 300; - if (active) { - return true; - } - return false; + return (performance.now() - this.lastReceivedTimestamp < 300); }, }, };