Merge pull request 'instance-migration' (#3470) from instance-migration into develop

Reviewed-on: https://git.pleroma.social/pleroma/pleroma-fe/pulls/3470

src/components/settings_modal/helpers/attachment_setting.js

@@ -1,8 +1,11 @@
 import Attachment from 'src/components/attachment/attachment.vue'
 import MediaUpload from 'src/components/media_upload/media_upload.vue'
-import { fileTypeExt } from 'src/services/file_type/file_type.service.js'
 import Setting from './setting.js'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+
+import { fileTypeExt } from 'src/services/file_type/file_type.service.js'
+
 export default {
   ...Setting,
   props: {
@@ -24,9 +27,7 @@ export default {
     attachment() {
       const path = this.realDraftMode ? this.draft : this.state
       // The "server" part is primarily for local dev, but could be useful for alt-domain or multiuser usage.
-      const url = path.includes('://')
-        ? path
-        : this.$store.state.instance.server + path
+      const url = path.includes('://') ? path : useInstanceStore().server + path
       return {
         mimetype: fileTypeExt(url),
         url,

src/components/settings_modal/helpers/pwa_manifest_icons_setting.js

@@ -3,9 +3,12 @@ import { clone } from 'lodash'
 import Attachment from 'src/components/attachment/attachment.vue'
 import MediaUpload from 'src/components/media_upload/media_upload.vue'
 import Select from 'src/components/select/select.vue'
-import { fileTypeExt } from 'src/services/file_type/file_type.service.js'
 import Setting from './setting.js'
 
+import { useInstanceStore } from 'src/stores/instance.js'
+
+import { fileTypeExt } from 'src/services/file_type/file_type.service.js'
+
 export default {
   ...Setting,
   components: {
@@ -34,9 +37,7 @@ export default {
           url: '',
         }
       }
-      const url = path.includes('://')
-        ? path
-        : this.$store.state.instance.server + path
+      const url = path.includes('://') ? path : useInstanceStore().server + path
 
       return {
         mimetype: fileTypeExt(url),

src/components/settings_modal/helpers/setting.js

@@ -15,6 +15,10 @@ export default {
       type: String,
       default: null,
     },
+    description: {
+      type: String,
+      default: null,
+    },
     path: {
       type: [String, Array],
       required: false,

src/components/settings_modal/helpers/vertical_tab_switcher.jsx

@@ -8,7 +8,7 @@ import { FontAwesomeIcon as FAIcon } from '@fortawesome/vue-fontawesome'
 
 import './vertical_tab_switcher.scss'
 
-import { useInterfaceStore } from 'src/stores/interface'
+import { useInterfaceStore } from 'src/stores/interface.js'
 
 const findFirstUsable = (slots) => slots.findIndex((_) => _.props)
 
@@ -35,11 +35,6 @@ export default {
       type: Boolean,
       default: false,
     },
-    parentCollapsed: {
-      required: false,
-      type: Boolean,
-      default: null,
-    },
   },
   data() {
     return {
@@ -202,7 +197,7 @@ export default {
         </div>
         <div
           role="tabpanel"
-          class={'contents' + (this.scrollableTabs ? ' scrollable-tabs' : '')}
+          class="contents"
           v-body-scroll-lock={this.bodyScrollLock}
           ref="contents"
         >