Skip to content

Commit

Permalink
chore: move common workspace plan/feature config to @speckle/shared
Browse files Browse the repository at this point in the history
fix: gqlgen regenerated
  • Loading branch information
fabis94 committed Feb 26, 2025
1 parent eabb50a commit d8fe8df
Show file tree
Hide file tree
Showing 61 changed files with 2,798 additions and 1,550 deletions.
42 changes: 42 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ workflows:
- test-objectsender:
filters: *filters-allow-all

- test-shared:
filters: *filters-allow-all

- test-preview-service:
filters: *filters-allow-all

Expand Down Expand Up @@ -184,6 +187,7 @@ workflows:
- test-frontend-2
- test-viewer
- test-objectsender
- test-shared
- test-server
- test-server-no-ff
- test-server-multiregion
Expand All @@ -200,6 +204,7 @@ workflows:
- test-frontend-2
- test-viewer
- test-objectsender
- test-shared
- test-server
- test-server-no-ff
- test-server-multiregion
Expand All @@ -216,6 +221,7 @@ workflows:
- test-frontend-2
- test-viewer
- test-objectsender
- test-shared
- test-server
- test-server-no-ff
- test-server-multiregion
Expand All @@ -232,6 +238,7 @@ workflows:
- test-frontend-2
- test-viewer
- test-objectsender
- test-shared
- test-server
- test-server-no-ff
- test-server-multiregion
Expand All @@ -248,6 +255,7 @@ workflows:
- test-frontend-2
- test-viewer
- test-objectsender
- test-shared
- test-server
- test-server-no-ff
- test-server-multiregion
Expand All @@ -264,6 +272,7 @@ workflows:
- test-frontend-2
- test-viewer
- test-objectsender
- test-shared
- test-server
- test-server-no-ff
- test-server-multiregion
Expand All @@ -286,6 +295,7 @@ workflows:
- test-frontend-2
- test-viewer
- test-objectsender
- test-shared
- test-server
- test-server-no-ff
- test-server-multiregion
Expand All @@ -302,6 +312,7 @@ workflows:
- test-frontend-2
- test-viewer
- test-objectsender
- test-shared
- test-server
- test-server-no-ff
- test-server-multiregion
Expand Down Expand Up @@ -349,6 +360,7 @@ workflows:
- test-frontend-2
- test-viewer
- test-objectsender
- test-shared
- test-preview-service

- publish-viewer-sandbox-cloudflare-pages:
Expand Down Expand Up @@ -729,6 +741,36 @@ jobs:
command: yarn test
working_directory: 'packages/preview-service'

test-shared:
docker: *docker-node-browsers-image
resource_class: medium+
steps:
- checkout
- restore_cache:
name: Restore Yarn Package Cache
keys:
- yarn-packages-server-{{ checksum "yarn.lock" }}
- run:
name: Install Dependencies
command: yarn

- save_cache:
name: Save Yarn Package Cache
key: yarn-packages-server-{{ checksum "yarn.lock" }}
paths:
- .yarn/cache
- .yarn/unplugged

- run:
name: Lint
command: yarn lint:ci
working_directory: 'packages/shared'

- run:
name: Run tests
command: yarn test:single-run
working_directory: 'packages/shared'

test-objectsender:
docker: *docker-node-browsers-image
resource_class: large
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
"prettier": "^2.5.1",
"ts-node": "^10.9.1",
"tsconfig-paths": "^4.0.0",
"vitest": "^3.0.7",
"zx": "^8.1.2"
},
"resolutions": {
Expand Down Expand Up @@ -91,7 +92,8 @@
"typescript": "^5.7.3",
"typescript-eslint": "^8.20.0",
"wait-on": ">=7.2.0",
"vue-tsc@npm:2.2.2/@vue/language-core": "2.2.0"
"vue-tsc@npm:2.2.2/@vue/language-core": "2.2.0",
"vitest": "^3.0.7"
},
"config": {
"commitizen": {
Expand Down
1 change: 1 addition & 0 deletions packages/frontend-2/codegen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ const config: CodegenConfig = {
'./lib/common/generated/gql/': {
preset: 'client',
config: {
enumsAsConst: true,
useTypeImports: true,
fragmentMasking: false,
dedupeFragments: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,7 @@
<div class="flex flex-col sm:flex-row gap-2 sm:items-center truncate">
<div class="sm:truncate">
<div
v-if="
[
AutomateRunStatus.Initializing,
AutomateRunStatus.Running,
AutomateRunStatus.Pending
].includes(functionRun.status)
"
v-if="isStartingOrRunning"
class="text-body-2xs text-foreground-2 italic whitespace-normal sm:truncate"
>
Function is {{ functionRun.status.toLowerCase() }}.
Expand Down Expand Up @@ -141,4 +135,14 @@ const results = useAutomationFunctionRunResults({
const showAttachmentDialog = ref(false)
const attachments = computed(() => results.value?.values.blobIds || [])
const isStartingOrRunning = computed(() =>
(
[
AutomateRunStatus.Initializing,
AutomateRunStatus.Running,
AutomateRunStatus.Pending
] as string[]
).includes(props.functionRun.status)
)
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,13 @@ const hasValidContextView = computed(() => {
})
const statusMessage = computed(() => {
const isFinished = ![
AutomateRunStatus.Initializing,
AutomateRunStatus.Running,
AutomateRunStatus.Pending
].includes(props.functionRun.status)
const isFinished = !(
[
AutomateRunStatus.Initializing,
AutomateRunStatus.Running,
AutomateRunStatus.Pending
] as string[]
).includes(props.functionRun.status)
return isFinished
? props.functionRun.statusMessage ?? 'No status message'
Expand Down
Loading

0 comments on commit d8fe8df

Please sign in to comment.