JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

web/satellite: migrate last 2 components to use composition api and clean up dependencies

Browse Source 
Migrated last 2 vue components.
Removed class component and vuex dependencies.

Change-Id: I54a82cfae35a1c7eea6efbc07f89bf416a689e79
This commit is contained in:
Vitalii 2023-04-13 16:52:42 +03:00
parent 8d31e13db6
commit 19e9ca921a
18 changed files with 52 additions and 349 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

162
web/satellite/package-lock.json
View File

@ -15,8 +15,6 @@
"chart.js": "4.2.1",
"core-js": "3.22.4",
"graphql": "15.3.0",
"load-script": "1.0.0",
"pbkdf2": "3.1.2",
"pinia": "2.0.23",
"pretty-bytes": "5.6.0",
"qrcode": "1.5.0",
@ -24,20 +22,15 @@
"stripe": "8.215.0",
"util": "0.12.4",
"vue": "2.7.10",
"vue-class-component": "7.2.6",
"vue-clipboard2": "0.3.3",
"vue-fragment": "1.6.0",
"vue-property-decorator": "9.1.2",
"vue-recaptcha": "1.3.0",
"vue-router": "3.5.3",
"vue2-datepicker": "3.10.4",
"vuex": "3.6.2"
"vue2-datepicker": "3.10.4"
},
"devDependencies": {
"@types/filesystem": "0.0.32",
"@types/jest": "27.5.0",
"@types/node": "16.18.14",
"@types/pbkdf2": "3.1.0",
"@types/qrcode": "1.4.2",
"@types/vue2-datepicker": "3.3.1",
"@typescript-eslint/eslint-plugin": "5.22.0",
@ -3157,15 +3150,6 @@
"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
"dev": true
},
"node_modules/@types/pbkdf2": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/@types/pbkdf2/-/pbkdf2-3.1.0.tgz",
"integrity": "sha512-Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ==",
"dev": true,
"dependencies": {
"@types/node": "*"
}
},
"node_modules/@types/prettier": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.0.tgz",
@ -5800,16 +5784,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/clipboard": {
"version": "2.0.11",
"resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz",
"integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
"dependencies": {
"good-listener": "^1.2.2",
"select": "^1.1.2",
"tiny-emitter": "^2.0.0"
}
},
"node_modules/clipboardy": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz",
@ -6913,11 +6887,6 @@
"node": ">=0.4.0"
}
},
"node_modules/delegate": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
"integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
},
"node_modules/depd": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@ -9101,14 +9070,6 @@
"integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==",
"dev": true
},
"node_modules/good-listener": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
"integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
"dependencies": {
"delegate": "^3.1.2"
}
},
"node_modules/graceful-fs": {
"version": "4.2.10",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
@ -12630,11 +12591,6 @@
"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
"dev": true
},
"node_modules/load-script": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/load-script/-/load-script-1.0.0.tgz",
"integrity": "sha512-kPEjMFtZvwL9TaZo0uZ2ml+Ye9HUMmPwbYRJ324qF9tqMejwykJ5ggTyvzmrbBeapCAbk98BSbTeovHEEP1uCA=="
},
"node_modules/loader-runner": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
@ -15816,11 +15772,6 @@
"url": "https://opencollective.com/webpack"
}
},
"node_modules/select": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
"integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
},
"node_modules/select-hose": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
@ -17134,11 +17085,6 @@
"integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
"dev": true
},
"node_modules/tiny-emitter": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
"integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
},
"node_modules/tmpl": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
@ -17758,22 +17704,6 @@
"csstype": "^3.1.0"
}
},
"node_modules/vue-class-component": {
"version": "7.2.6",
"resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-7.2.6.tgz",
"integrity": "sha512-+eaQXVrAm/LldalI272PpDe3+i4mPis0ORiMYxF6Ae4hyuCh15W8Idet7wPUEs4N4YptgFHGys4UrgNQOMyO6w==",
"peerDependencies": {
"vue": "^2.0.0"
}
},
"node_modules/vue-clipboard2": {
"version": "0.3.3",
"resolved": "https://registry.npmjs.org/vue-clipboard2/-/vue-clipboard2-0.3.3.tgz",
"integrity": "sha512-aNWXIL2DKgJyY/1OOeITwAQz1fHaCIGvUFHf9h8UcoQBG5a74MkdhS/xqoYe7DNZdQmZRL+TAdIbtUs9OyVjbw==",
"dependencies": {
"clipboard": "^2.0.0"
}
},
"node_modules/vue-eslint-parser": {
"version": "9.0.3",
"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.0.3.tgz",
@ -17941,15 +17871,6 @@
"node": ">=8"
}
},
"node_modules/vue-property-decorator": {
"version": "9.1.2",
"resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-9.1.2.tgz",
"integrity": "sha512-xYA8MkZynPBGd/w5QFJ2d/NM0z/YeegMqYTphy7NJQXbZcuU6FC6AOdUAcy4SXP+YnkerC6AfH+ldg7PDk9ESQ==",
"peerDependencies": {
"vue": "*",
"vue-class-component": "*"
}
},
"node_modules/vue-recaptcha": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/vue-recaptcha/-/vue-recaptcha-1.3.0.tgz",
@ -18170,14 +18091,6 @@
"vue": "^2.5.0"
}
},
"node_modules/vuex": {
"version": "3.6.2",
"resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz",
"integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==",
"peerDependencies": {
"vue": "^2.0.0"
}
},
"node_modules/w3c-hr-time": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
@ -21389,15 +21302,6 @@
"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
"dev": true
},
"@types/pbkdf2": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/@types/pbkdf2/-/pbkdf2-3.1.0.tgz",
"integrity": "sha512-Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ==",
"dev": true,
"requires": {
"@types/node": "*"
}
},
"@types/prettier": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.0.tgz",
@ -23358,16 +23262,6 @@
"integrity": "sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==",
"dev": true
},
"clipboard": {
"version": "2.0.11",
"resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz",
"integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
"requires": {
"good-listener": "^1.2.2",
"select": "^1.1.2",
"tiny-emitter": "^2.0.0"
}
},
"clipboardy": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz",
@ -24212,11 +24106,6 @@
"integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
"dev": true
},
"delegate": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
"integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
},
"depd": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@ -25870,14 +25759,6 @@
"integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==",
"dev": true
},
"good-listener": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
"integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
"requires": {
"delegate": "^3.1.2"
}
},
"graceful-fs": {
"version": "4.2.10",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
@ -28475,11 +28356,6 @@
"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
"dev": true
},
"load-script": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/load-script/-/load-script-1.0.0.tgz",
"integrity": "sha512-kPEjMFtZvwL9TaZo0uZ2ml+Ye9HUMmPwbYRJ324qF9tqMejwykJ5ggTyvzmrbBeapCAbk98BSbTeovHEEP1uCA=="
},
"loader-runner": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
@ -30768,11 +30644,6 @@
"ajv-keywords": "^3.5.2"
}
},
"select": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
"integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
},
"select-hose": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
@ -31809,11 +31680,6 @@
"integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
"dev": true
},
"tiny-emitter": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
"integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
},
"tmpl": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
@ -32264,20 +32130,6 @@
"csstype": "^3.1.0"
}
},
"vue-class-component": {
"version": "7.2.6",
"resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-7.2.6.tgz",
"integrity": "sha512-+eaQXVrAm/LldalI272PpDe3+i4mPis0ORiMYxF6Ae4hyuCh15W8Idet7wPUEs4N4YptgFHGys4UrgNQOMyO6w==",
"requires": {}
},
"vue-clipboard2": {
"version": "0.3.3",
"resolved": "https://registry.npmjs.org/vue-clipboard2/-/vue-clipboard2-0.3.3.tgz",
"integrity": "sha512-aNWXIL2DKgJyY/1OOeITwAQz1fHaCIGvUFHf9h8UcoQBG5a74MkdhS/xqoYe7DNZdQmZRL+TAdIbtUs9OyVjbw==",
"requires": {
"clipboard": "^2.0.0"
}
},
"vue-eslint-parser": {
"version": "9.0.3",
"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.0.3.tgz",
@ -32399,12 +32251,6 @@
}
}
},
"vue-property-decorator": {
"version": "9.1.2",
"resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-9.1.2.tgz",
"integrity": "sha512-xYA8MkZynPBGd/w5QFJ2d/NM0z/YeegMqYTphy7NJQXbZcuU6FC6AOdUAcy4SXP+YnkerC6AfH+ldg7PDk9ESQ==",
"requires": {}
},
"vue-recaptcha": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/vue-recaptcha/-/vue-recaptcha-1.3.0.tgz",
@ -32595,12 +32441,6 @@
"date-format-parse": "^0.2.7"
}
},
"vuex": {
"version": "3.6.2",
"resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz",
"integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==",
"requires": {}
},
"w3c-hr-time": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",

9
web/satellite/package.json
View File

@ -20,8 +20,6 @@
"chart.js": "4.2.1",
"core-js": "3.22.4",
"graphql": "15.3.0",
"load-script": "1.0.0",
"pbkdf2": "3.1.2",
"pinia": "2.0.23",
"pretty-bytes": "5.6.0",
"qrcode": "1.5.0",
@ -29,20 +27,15 @@
"stripe": "8.215.0",
"util": "0.12.4",
"vue": "2.7.10",
"vue-class-component": "7.2.6",
"vue-clipboard2": "0.3.3",
"vue-fragment": "1.6.0",
"vue-property-decorator": "9.1.2",
"vue-recaptcha": "1.3.0",
"vue-router": "3.5.3",
"vue2-datepicker": "3.10.4",
"vuex": "3.6.2"
"vue2-datepicker": "3.10.4"
},
"devDependencies": {
"@types/filesystem": "0.0.32",
"@types/jest": "27.5.0",
"@types/node": "16.18.14",
"@types/pbkdf2": "3.1.0",
"@types/qrcode": "1.4.2",
"@types/vue2-datepicker": "3.3.1",
"@typescript-eslint/eslint-plugin": "5.22.0",

39
web/satellite/src/components/account/mfa/ConfirmMFAInput.vue
View File

@ -19,29 +19,30 @@
</div>
</template>
<script lang="ts">
import { Component, Prop, Vue } from 'vue-property-decorator';
<script setup lang="ts">
import { ref } from 'vue';
// @vue/component
@Component
export default class ConfirmMFAInput extends Vue {
@Prop({ default: () => () => {} })
public readonly onInput: (value: string) => void;
@Prop({ default: false })
public readonly isRecovery: boolean;
@Prop({ default: false })
public readonly isError: boolean;
const props = withDefaults(defineProps<{
onInput: (value: string) => void;
isRecovery?: boolean;
isError: boolean;
}>(), {
onInput: () => {},
isRecovery: false,
isError: false,
});
public code = '';
const code = ref<string>('');
/**
* Clears input.
* Is used outside of this component.
*/
public clearInput(): void {
this.code = '';
}
/**
* Clears input.
* Is used outside of this component.
*/
function clearInput(): void {
code.value = '';
}
defineExpose({ clearInput });
</script>
<style scoped lang="scss">

34
web/satellite/src/components/common/Resizable.vue
View File

@ -1,34 +0,0 @@
// Copyright (C) 2022 Storj Labs, Inc.
// See LICENSE for copying information.
<script lang="ts">
import { Component, Vue } from 'vue-property-decorator';
// @vue/component
@Component
export default class Resizable extends Vue {
public screenWidth: number = window.innerWidth;
public screenHeight: number = window.innerHeight;
public get isMobile(): boolean {
return this.screenWidth <= 550;
}
public get isTablet(): boolean {
return !this.isMobile && this.screenWidth <= 800;
}
public mounted(): void {
window.addEventListener('resize', this.onResize);
}
public beforeDestroy(): void {
window.removeEventListener('resize', this.onResize);
}
private onResize(): void {
this.screenWidth = window.innerWidth;
this.screenHeight = window.innerHeight;
}
}
</script>

3
web/satellite/src/components/modals/createProjectPassphrase/PassphraseGeneratedStep.vue
View File

@ -69,7 +69,6 @@ const props = withDefaults(defineProps<{
});
const notify = useNotify();
const copy = useCopy();
const currentDate = new Date().toISOString();
@ -81,7 +80,7 @@ const analytics = new AnalyticsHttpApi();
* Copies passphrase to clipboard.
*/
function onCopyPassphraseClick(): void {
copy(props.passphrase);
navigator.clipboard.writeText(props.passphrase);
isPassphraseCopied.value = true;
analytics.eventTriggered(AnalyticsEvent.COPY_TO_CLIPBOARD_CLICKED);
notify.success(`Passphrase was copied successfully`);

45
web/satellite/src/components/onboardingTour/steps/cliFlow/CLISetup.vue
View File

@ -31,11 +31,10 @@
</CLIFlowContainer>
</template>
<script lang="ts">
import { Component, Vue } from 'vue-property-decorator';
<script setup lang="ts">
import { RouteConfig } from '@/router';
import { AnalyticsHttpApi } from '@/api/analytics';
import { useRouter } from '@/utils/hooks';
import CLIFlowContainer from '@/components/onboardingTour/steps/common/CLIFlowContainer.vue';
import OSContainer from '@/components/onboardingTour/steps/common/OSContainer.vue';
@ -43,34 +42,24 @@ import TabWithCopy from '@/components/onboardingTour/steps/common/TabWithCopy.vu
import Icon from '@/../static/images/onboardingTour/cliSetupStep.svg';
// @vue/component
@Component({
components: {
CLIFlowContainer,
Icon,
OSContainer,
TabWithCopy,
},
})
export default class CLISetup extends Vue {
const analytics: AnalyticsHttpApi = new AnalyticsHttpApi();
private readonly analytics: AnalyticsHttpApi = new AnalyticsHttpApi();
const router = useRouter();
/**
* Holds on back button click logic.
*/
public async onBackClick(): Promise<void> {
this.analytics.pageVisit(RouteConfig.OnboardingTour.with(RouteConfig.OnbCLIStep.with(RouteConfig.CLIInstall)).path);
await this.$router.push(RouteConfig.OnboardingTour.with(RouteConfig.OnbCLIStep.with(RouteConfig.CLIInstall)).path);
}
/**
* Holds on back button click logic.
*/
async function onBackClick(): Promise<void> {
analytics.pageVisit(RouteConfig.OnboardingTour.with(RouteConfig.OnbCLIStep.with(RouteConfig.CLIInstall)).path);
await router.push(RouteConfig.OnboardingTour.with(RouteConfig.OnbCLIStep.with(RouteConfig.CLIInstall)).path);
}
/**
* Holds on next button click logic.
*/
public async onNextClick(): Promise<void> {
this.analytics.pageVisit(RouteConfig.OnboardingTour.with(RouteConfig.OnbCLIStep.with(RouteConfig.CreateBucket)).path);
await this.$router.push(RouteConfig.OnboardingTour.with(RouteConfig.OnbCLIStep.with(RouteConfig.CreateBucket)).path);
}
/**
* Holds on next button click logic.
*/
async function onNextClick(): Promise<void> {
analytics.pageVisit(RouteConfig.OnboardingTour.with(RouteConfig.OnbCLIStep.with(RouteConfig.CreateBucket)).path);
await router.push(RouteConfig.OnboardingTour.with(RouteConfig.OnbCLIStep.with(RouteConfig.CreateBucket)).path);
}
</script>

2
web/satellite/src/components/onboardingTour/steps/common/OSContainer.vue
View File

@ -44,7 +44,7 @@ import { useAppStore } from '@/store/modules/appStore';
const appStore = useAppStore();
const props = withDefaults(defineProps<{
isInstallStep: boolean;
isInstallStep?: boolean;
}>(), {
isInstallStep: false,
});

2
web/satellite/src/main.ts
View File

@ -2,7 +2,6 @@
// See LICENSE for copying information.
import Vue from 'vue';
import VueClipboard from 'vue-clipboard2';
import { createPinia, setActivePinia, PiniaVuePlugin } from 'pinia';
import App from './App.vue';
@ -20,7 +19,6 @@ Vue.config.performance = true;
Vue.config.productionTip = false;
Vue.use(new NotificatorPlugin());
Vue.use(VueClipboard);
Vue.use(PiniaVuePlugin);
const pinia = createPinia();
setActivePinia(pinia);

9
web/satellite/src/utils/hooks.ts
View File

@ -14,12 +14,3 @@ export function useRouter() {
export function useNotify() {
return getCurrentInstance()?.proxy.$notify || {} as Notificator;
}
export function useCopy() {
return getCurrentInstance()?.proxy.$copyText || {} as (text: string, container?: object | HTMLElement) => Promise<{
action: string,
text: string,
trigger: string | HTMLElement | HTMLCollection | NodeList,
clearSelection: () => void
}>;
}

9
web/satellite/tests/unit/ignore/common/HeaderArea.spec.ts
View File

@ -1,7 +1,6 @@
// Copyright (C) 2019 Storj Labs, Inc.
// See LICENSE for copying information.
import Vuex from 'vuex';
import { createLocalVue, shallowMount } from '@vue/test-utils';
import { ProjectMemberHeaderState } from '@/types/projectMembers';
@ -9,14 +8,10 @@ import { ProjectMemberHeaderState } from '@/types/projectMembers';
import HeaderArea from '@/components/team/HeaderArea.vue';
const localVue = createLocalVue();
localVue.use(Vuex);
const store = new Vuex.Store({});
describe('Team HeaderArea', () => {
it('renders correctly', () => {
const wrapper = shallowMount<HeaderArea>(HeaderArea, {
store,
localVue,
});
@ -32,7 +27,6 @@ describe('Team HeaderArea', () => {
it('renders correctly with opened Add team member popup', () => {
const wrapper = shallowMount<HeaderArea>(HeaderArea, {
store,
localVue,
});
@ -47,7 +41,6 @@ describe('Team HeaderArea', () => {
const selectedUsersCount = 2;
const wrapper = shallowMount<HeaderArea>(HeaderArea, {
store,
localVue,
propsData: {
selectedProjectMembersCount: selectedUsersCount,
@ -68,7 +61,6 @@ describe('Team HeaderArea', () => {
const selectedUsersCount = 2;
const wrapper = shallowMount<HeaderArea>(HeaderArea, {
store,
localVue,
propsData: {
selectedProjectMembersCount: selectedUsersCount,
@ -93,7 +85,6 @@ describe('Team HeaderArea', () => {
const selectedUsersCount = 1;
const wrapper = shallowMount<HeaderArea>(HeaderArea, {
store,
localVue,
propsData: {
selectedProjectMembersCount: selectedUsersCount,

5
web/satellite/tests/unit/ignore/onboardingTour/OnboardingTourArea.spec.ts
View File

@ -1,7 +1,6 @@
// Copyright (C) 2020 Storj Labs, Inc.
// See LICENSE for copying information.
import Vuex from 'vuex';
import { createLocalVue, shallowMount } from '@vue/test-utils';
import { router } from '@/router';
@ -9,14 +8,10 @@ import { router } from '@/router';
import OnboardingTourArea from '@/components/onboardingTour/OnboardingTourArea.vue';
const localVue = createLocalVue();
localVue.use(Vuex);
const store = new Vuex.Store({});
describe('OnboardingTourArea.vue', () => {
it('renders correctly', (): void => {
const wrapper = shallowMount(OnboardingTourArea, {
store,
localVue,
router,
});

2
web/satellite/tests/unit/ignore/onboardingTour/steps/OverviewStep.spec.ts
View File

@ -1,7 +1,6 @@
// Copyright (C) 2020 Storj Labs, Inc.
// See LICENSE for copying information.
import Vuex from 'vuex';
import { createLocalVue, shallowMount } from '@vue/test-utils';
import { router } from '@/router';
@ -9,7 +8,6 @@ import { router } from '@/router';
import OverviewStep from '@/components/onboardingTour/steps/OverviewStep.vue';
const localVue = createLocalVue();
localVue.use(Vuex);
// TODO: figure out how to fix the test
xdescribe('OverviewStep.vue', (): void => {

8
web/satellite/tests/unit/ignore/project/CreateProject.spec.ts
View File

@ -1,7 +1,6 @@
// Copyright (C) 2020 Storj Labs, Inc.
// See LICENSE for copying information.
import Vuex from 'vuex';
import { createLocalVue, shallowMount } from '@vue/test-utils';
import { NotificatorPlugin } from '@/utils/plugins/notificator';
@ -9,17 +8,11 @@ import { NotificatorPlugin } from '@/utils/plugins/notificator';
import CreateProject from '@/components/project/CreateProject.vue';
const localVue = createLocalVue();
localVue.use(Vuex);
const store = new Vuex.Store({});
localVue.use(new NotificatorPlugin());
describe('CreateProject.vue', (): void => {
it('renders correctly', (): void => {
const wrapper = shallowMount<CreateProject>(CreateProject, {
store,
localVue,
});
@ -28,7 +21,6 @@ describe('CreateProject.vue', (): void => {
it('renders correctly with project name', async (): Promise<void> => {
const wrapper = shallowMount<CreateProject>(CreateProject, {
store,
localVue,
});

18
web/satellite/tests/unit/ignore/project/EditProjectDetails.spec.ts
View File

@ -1,7 +1,6 @@
// Copyright (C) 2020 Storj Labs, Inc.
// See LICENSE for copying information.
import Vuex from 'vuex';
import { createLocalVue, shallowMount } from '@vue/test-utils';
import { ProjectsApiMock } from '@/../tests/unit/mock/api/projects';
@ -11,27 +10,16 @@ import { NotificatorPlugin } from '@/utils/plugins/notificator';
import EditProjectDetails from '@/components/project/EditProjectDetails.vue';
const localVue = createLocalVue();
localVue.use(Vuex);
const projectLimits = new ProjectLimits(1000, 100, 1000, 100);
const projectsApi = new ProjectsApiMock();
projectsApi.setMockLimits(projectLimits);
const store = new Vuex.Store({
modules: {
usersModule: {
state: {
user: { paidTier: false },
},
},
} });
localVue.use(new NotificatorPlugin());
describe('EditProjectDetails.vue', () => {
it('renders correctly', (): void => {
const wrapper = shallowMount<EditProjectDetails>(EditProjectDetails, {
store,
localVue,
});
@ -40,7 +28,6 @@ describe('EditProjectDetails.vue', () => {
it('editing name works correctly', async (): Promise<void> => {
const wrapper = shallowMount<EditProjectDetails>(EditProjectDetails, {
store,
localVue,
});
@ -54,12 +41,11 @@ describe('EditProjectDetails.vue', () => {
await wrapper.vm.onSaveNameButtonClick();
expect(wrapper).toMatchSnapshot();
await expect(store.getters.selectedProject.name).toMatch(newName);
// await expect(store.getters.selectedProject.name).toMatch(newName);
});
it('editing description works correctly', async (): Promise<void> => {
const wrapper = shallowMount<EditProjectDetails>(EditProjectDetails, {
store,
localVue,
});
@ -73,6 +59,6 @@ describe('EditProjectDetails.vue', () => {
await wrapper.vm.onSaveDescriptionButtonClick();
expect(wrapper).toMatchSnapshot();
await expect(store.getters.selectedProject.description).toMatch(newDescription);
// await expect(store.getters.selectedProject.description).toMatch(newDescription);
});
});

11
web/satellite/tests/unit/ignore/projectMembers/ProjectMemberListItem.spec.ts
View File

@ -1,28 +1,20 @@
// Copyright (C) 2019 Storj Labs, Inc.
// See LICENSE for copying information.
import Vuex from 'vuex';
import { createLocalVue, shallowMount } from '@vue/test-utils';
import { ProjectMember } from '@/types/projectMembers';
import { Project } from '@/types/projects';
import ProjectMemberListItem from '@/components/team/ProjectMemberListItem.vue';
const localVue = createLocalVue();
localVue.use(Vuex);
describe('', () => {
const data = new Date(0);
const member: ProjectMember = new ProjectMember('testFullName', 'testShortName', 'test@example.com', data, '1');
const project: Project = new Project('testId', 'testName', 'testDescr', 'testDate', '1');
const store = new Vuex.Store({});
it('should render correctly', function () {
const wrapper = shallowMount(ProjectMemberListItem, {
store,
localVue,
propsData: {
itemData: member,
@ -30,7 +22,7 @@ describe('', () => {
});
expect(wrapper).toMatchSnapshot();
expect(store.getters.selectedProject.ownerId).toBe(member.user.id);
// expect(store.getters.selectedProject.ownerId).toBe(member.user.id);
expect(wrapper.findAll('.owner').length).toBe(1);
});
@ -38,7 +30,6 @@ describe('', () => {
member.isSelected = true;
const wrapper = shallowMount(ProjectMemberListItem, {
store,
localVue,
propsData: {
itemData: member,

16
web/satellite/tests/unit/ignore/projectMembers/ProjectMembersArea.spec.ts
View File

@ -1,7 +1,6 @@
// Copyright (C) 2019 Storj Labs, Inc.
// See LICENSE for copying information.
import Vuex from 'vuex';
import { createLocalVue, shallowMount } from '@vue/test-utils';
import { ProjectsApiMock } from '@/../tests/unit/mock/api/projects';
@ -11,10 +10,8 @@ import { Project } from '@/types/projects';
import ProjectMembersArea from '@/components/team/ProjectMembersArea.vue';
const localVue = createLocalVue();
localVue.use(Vuex);
const projectsApi = new ProjectsApiMock();
const store = new Vuex.Store({});
describe('ProjectMembersArea.vue', () => {
const project = new Project('id', 'projectName', 'projectDescription', 'test', 'testOwnerId', true);
@ -32,7 +29,6 @@ describe('ProjectMembersArea.vue', () => {
it('renders correctly', async (): Promise<void> => {
const wrapper = shallowMount<ProjectMembersArea>(ProjectMembersArea, {
store,
localVue,
});
@ -45,7 +41,6 @@ describe('ProjectMembersArea.vue', () => {
// store.commit(FETCH, testProjectMembersPage);
const wrapper = shallowMount<ProjectMembersArea>(ProjectMembersArea, {
store,
localVue,
});
@ -56,7 +51,6 @@ describe('ProjectMembersArea.vue', () => {
// store.commit(FETCH, testProjectMembersPage);
const wrapper = shallowMount<ProjectMembersArea>(ProjectMembersArea, {
store,
localVue,
});
@ -75,13 +69,12 @@ describe('ProjectMembersArea.vue', () => {
// store.commit(FETCH, testProjectMembersPage);
const wrapper = shallowMount<ProjectMembersArea>(ProjectMembersArea, {
store,
localVue,
});
wrapper.vm.onMemberCheckChange(projectMember1);
expect(store.getters.selectedProjectMembers.length).toBe(1);
// expect(store.getters.selectedProjectMembers.length).toBe(1);
});
it('clear selection works correctly', () => {
@ -95,13 +88,12 @@ describe('ProjectMembersArea.vue', () => {
// store.commit(FETCH, testProjectMembersPage);
const wrapper = shallowMount<ProjectMembersArea>(ProjectMembersArea, {
store,
localVue,
});
wrapper.vm.onMemberCheckChange(projectMember3);
expect(store.getters.selectedProjectMembers.length).toBe(0);
// expect(store.getters.selectedProjectMembers.length).toBe(0);
});
it('Reversing list order triggers rerender', () => {
@ -114,11 +106,10 @@ describe('ProjectMembersArea.vue', () => {
// store.commit(FETCH, testPage);
const wrapper = shallowMount<ProjectMembersArea>(ProjectMembersArea, {
store,
localVue,
});
expect(wrapper.vm.projectMembers[0].user.id).toBe(projectMember1.user.id);
// expect(wrapper.vm.projectMembers[0].user.id).toBe(projectMember1.user.id);
testProjectMembersPage.projectMembers = [projectMember2, projectMember1];
@ -138,7 +129,6 @@ describe('ProjectMembersArea.vue', () => {
// store.commit(FETCH, testPage1);
const wrapper = shallowMount<ProjectMembersArea>(ProjectMembersArea, {
store,
localVue,
});

17
web/satellite/tests/unit/ignore/store/buckets.spec.ts
View File

@ -1,22 +1,15 @@
// Copyright (C) 2019 Storj Labs, Inc.
// See LICENSE for copying information.
import Vuex from 'vuex';
import { createLocalVue } from '@vue/test-utils';
import { BucketsApiGql } from '@/api/buckets';
import { Bucket, BucketCursor, BucketPage } from '@/types/buckets';
import { Bucket, BucketPage } from '@/types/buckets';
import { Project } from '@/types/projects';
const Vue = createLocalVue();
const bucketsApi = new BucketsApiGql();
const selectedProject = new Project();
selectedProject.id = '1';
Vue.use(Vuex);
const store = new Vuex.Store({});
// const state = store.state.bucketsModule;
const bucket = new Bucket('test', 10, 10, 1, 1, new Date(), new Date());
const page: BucketPage = { buckets: [bucket], currentPage: 1, pageCount: 1, offset: 0, limit: 7, search: 'test', totalCount: 1 };
@ -71,16 +64,16 @@ describe('getters', () => {
// await store.dispatch(FETCH, 1);
const storePage = store.getters.page;
// const storePage = store.getters.page;
expect(storePage).toEqual(page);
// expect(storePage).toEqual(page);
});
it('cursor of buckets', () => {
// store.dispatch(CLEAR);
const cursor = store.getters.cursor;
// const cursor = store.getters.cursor;
expect(cursor).toEqual(new BucketCursor('', 7, 1));
// expect(cursor).toEqual(new BucketCursor('', 7, 1));
});
});

10
web/satellite/tests/unit/ignore/views/DashboardArea.spec.ts
View File

@ -1,7 +1,6 @@
// Copyright (C) 2019 Storj Labs, Inc.
// See LICENSE for copying information.
import Vuex from 'vuex';
import { createLocalVue, shallowMount } from '@vue/test-utils';
import { RouteConfig, router } from '@/router';
@ -10,10 +9,6 @@ import { AnalyticsHttpApi } from '@/api/analytics';
import DashboardArea from '@/views/DashboardArea.vue';
const localVue = createLocalVue();
localVue.use(Vuex);
const store = new Vuex.Store({});
localVue.use(new NotificatorPlugin());
describe('Dashboard', () => {
@ -24,7 +19,6 @@ describe('Dashboard', () => {
it('renders correctly when data is loading', () => {
const wrapper = shallowMount(DashboardArea, {
store,
localVue,
router,
});
@ -36,7 +30,6 @@ describe('Dashboard', () => {
it('renders correctly when data is loaded', () => {
const wrapper = shallowMount(DashboardArea, {
store,
localVue,
router,
});
@ -56,7 +49,6 @@ describe('Dashboard', () => {
const wrapper = await shallowMount(DashboardArea, {
localVue,
router,
store,
});
setTimeout(() => {
@ -78,7 +70,6 @@ describe('Dashboard', () => {
const wrapper = await shallowMount(DashboardArea, {
localVue,
router,
store,
});
setTimeout(() => {
@ -90,7 +81,6 @@ describe('Dashboard', () => {
it('loads routes correctly when not authorithed', () => {
const wrapper = shallowMount(DashboardArea, {
store,
localVue,
router,
});