diff --git a/backbone/packer/scripts/cleanup.sh b/backbone/packer/scripts/cleanup.sh index 0fa8ec1c..87a371db 100644 --- a/backbone/packer/scripts/cleanup.sh +++ b/backbone/packer/scripts/cleanup.sh @@ -47,7 +47,7 @@ dpkg --list \ # delete docs packages dpkg --list \ | awk '{ print $2 }' \ - | grep -- '-doc$' \ + | grep -- '-pg$' \ | xargs apt-get -y purge # Delete X11 libraries @@ -64,13 +64,13 @@ echo "==> Setup dpkg excludes for linux-firmware" cat <<_EOF_ | cat >> /etc/dpkg/dpkg.cfg.d/excludes #BENTO-BEGIN path-exclude=/lib/firmware/* -path-exclude=/usr/share/doc/linux-firmware/* +path-exclude=/usr/share/pg/linux-firmware/* #BENTO-END _EOF_ # Delete the massive firmware packages rm -rf /lib/firmware/* -rm -rf /usr/share/doc/linux-firmware/* +rm -rf /usr/share/pg/linux-firmware/* # Clean up orphaned packages with deborphan apt-get -y install deborphan @@ -85,7 +85,7 @@ apt-get -y autoclean apt-get -y clean # Remove docs -rm -rf /usr/share/doc/* +rm -rf /usr/share/pg/* # Remove man pages rm -rf /usr/share/man/* diff --git a/dashboard/src/App.vue b/dashboard/src/App.vue index 1c686d65..c24bce6e 100644 --- a/dashboard/src/App.vue +++ b/dashboard/src/App.vue @@ -68,7 +68,7 @@ const isHideSidebar = computed(() => { return true; return ( - route.meta.hideSidebar && session.user && team?.doc?.hide_sidebar === true + route.meta.hideSidebar && session.user && team?.pg?.hide_sidebar === true ); }); diff --git a/dashboard/src/components/AccessRequestButton.vue b/dashboard/src/components/AccessRequestButton.vue index d7d5df09..f287c4b8 100644 --- a/dashboard/src/components/AccessRequestButton.vue +++ b/dashboard/src/components/AccessRequestButton.vue @@ -34,14 +34,14 @@ import AccessRequestStatusDialog from './AccessRequestStatusDialog.vue'; const props = defineProps<{ doctype: string; docname: string; - doc?: any; + pg?: any; error?: Error; }>(); const team = getTeam(); const buttonProps = computed(() => { - if (props.doc) { + if (props.pg) { return { label: '', icon: 'unlock', @@ -63,11 +63,11 @@ const isPermissionError = computed(() => { }); const canRequestAccess = computed(() => { - return Boolean(team.doc?.can_request_access); + return Boolean(team.pg?.can_request_access); }); const isOwner = computed(() => { - return props.doc?.team === team.doc?.name; + return props.pg?.team === team.pg?.name; }); const hasAccess = computed(() => { @@ -75,7 +75,7 @@ const hasAccess = computed(() => { }); const DialogComponent = computed(() => { - if (props.doc) { + if (props.pg) { return AccessRequestStatusDialog; } else { return AccessRequestDialog; diff --git a/dashboard/src/components/AccessRequestDialog.vue b/dashboard/src/components/AccessRequestDialog.vue index bafdec4a..ece1b5c4 100644 --- a/dashboard/src/components/AccessRequestDialog.vue +++ b/dashboard/src/components/AccessRequestDialog.vue @@ -112,7 +112,7 @@ const request = createResource({ ); return { - doc: { + pg: { doctype: 'Support Access', reason: reason.value, resources: [ diff --git a/dashboard/src/components/AddTagDialog.vue b/dashboard/src/components/AddTagDialog.vue index d003a58f..e749cf55 100644 --- a/dashboard/src/components/AddTagDialog.vue +++ b/dashboard/src/components/AddTagDialog.vue @@ -68,9 +68,9 @@ export default { methods: { addNewTag(value) { if (!value) return; - let $doc = getCachedDocumentResource(this.doctype, this.docname); - if (!$doc) return; - return $doc.addTag.submit({ tag: value }).then(() => { + let $pg = getCachedDocumentResource(this.doctype, this.docname); + if (!$pg) return; + return $pg.addTag.submit({ tag: value }).then(() => { this.$emit('added', value); this.show = false; }); diff --git a/dashboard/src/components/AddressForm.vue b/dashboard/src/components/AddressForm.vue index e291cb4e..9d3e3543 100644 --- a/dashboard/src/components/AddressForm.vue +++ b/dashboard/src/components/AddressForm.vue @@ -68,7 +68,7 @@ export default { url: 'press.api.account.country_list', auto: true, onSuccess() { - let userCountry = this.$team?.doc.country; + let userCountry = this.$team?.pg.country; if (userCountry) { let country = this.countryList.find((d) => d.label === userCountry); if (country) { diff --git a/dashboard/src/components/AddressableErrorDialog.vue b/dashboard/src/components/AddressableErrorDialog.vue index 69ab9cb7..017470ba 100644 --- a/dashboard/src/components/AddressableErrorDialog.vue +++ b/dashboard/src/components/AddressableErrorDialog.vue @@ -1,21 +1,21 @@