Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Assessment page no streams #231

Merged
merged 2 commits into from
Aug 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions src/components/assessment/NoStreams.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<template>
<div class="d-flex justify-center align-center" style="height: 70vh">
<v-card width="50%" class="text-center">
<v-card-text class="white--text">
<p>You have not been assigned to any streams.</p>
<p>
Please go to your selected server,
<a :href="serverUrl" target="_blank">{{ serverUrl }}</a>
, and either create a new stream or be added to an existing one.
</p>
<p>
For more information on how to use Speckle, please visit the
<a :href="SpeckleDocsUrl" target="_blank">Speckle docs</a>.
</p>
</v-card-text>
</v-card>
</div>
</template>
<script lang="ts">
import { Component, Vue, Prop } from "vue-property-decorator";

@Component
export default class NoStreams extends Vue {
@Prop() serverUrl!: string;

get SpeckleDocsUrl() {
return this.serverUrl.includes("arup")
? "https://speckle.arup.com/tutorials/get_started.html"
: "https://speckle.guide/";
}
}
</script>
17 changes: 3 additions & 14 deletions src/components/core/VersionUpdateDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,24 +56,13 @@ export default class VersionUpdateDialog extends Vue {
@Prop() dialog!: boolean;
@Prop() version!: string;

features: { title: string; subtitle: string }[] = [
{
title: "Material buildup",
subtitle:
"Objects in assessments can now have multiple materials assigned to them, allowing for material buildups to be used instead of single materials",
},
{
title: "Grouping filters update",
subtitle:
"Grouping filters that require it now have an 'undefined' field, meaning that a filter will not need to appear on every object to allow it to be used for object grouping",
},
];
features: { title: string; subtitle: string }[] = [];

fixes: { title: string; subtitle: string }[] = [
{
title: "Large models bug",
title: "Assessment page bug",
subtitle:
"Fixed a bug causing an 'out of memory' error to sometimes occur when loading large models",
"Fixed a bug leading to the assessment page not showing anything when a user is not assigned to any Speckle streams",
},
];

Expand Down
2 changes: 1 addition & 1 deletion src/store/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Vue.use(Vuex);

export default new Vuex.Store({
state: {
version: "0.12.2 \u00DF",
version: "0.12.3 \u00DF",
speckleFolderName: "actcarbonreport",
speckleViewer: {
viewer: undefined,
Expand Down
5 changes: 4 additions & 1 deletion src/views/Assessment.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<v-main>
<loading-spinner v-if="loading" :text="loadingSpinnerText" />
<v-container
v-else
v-else-if="availableStreams.length !== 0"
fluid
class="d-flex justify-flex-start flex-row"
style="margin: 10px; padding: 10px; width: 100%"
Expand Down Expand Up @@ -59,6 +59,7 @@
:loadingBar="false"
/>
</v-container>
<NoStreams :serverUrl="$store.state.selectedServer.url" v-else />
<new-branch-dialog
:dialog="newBranchDialog"
:branchNames="branchNames"
Expand Down Expand Up @@ -88,6 +89,7 @@ import * as AddParams from "./utils/add-params/addParams";
import AssessmentStepper from "@/components/assessment/AssessmentStepper.vue";
import SESnackBar from "@/components/shared/SESnackBar.vue";
import NewBranchDialog from "@/components/assessment/NewBranchDialog.vue";
import NoStreams from "@/components/assessment/NoStreams.vue";

import { findStringProps } from "./utils/propertyFiltering";

Expand Down Expand Up @@ -140,6 +142,7 @@ interface AvailableStream {
SESnackBar,
NewBranchDialog,
LoadingSpinner,
NoStreams,
},
})
export default class Assessment extends Vue {
Expand Down
Loading