Skip to content

Commit 484f7f6

Browse files
dterefedterefe
committed
Fix.
1 parent 6caa77e commit 484f7f6

File tree

1 file changed

+84
-74
lines changed

1 file changed

+84
-74
lines changed

‎DUUIWeb/src/routes/processes/+page.svelte

Lines changed: 84 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -107,98 +107,108 @@ import {
107107
path: ''
108108
}
109109
110-
inputAliases = hasConnections($processSettingsStore.input.provider) ? getCloudProviderAliases($userSession?.connections[$processSettingsStore.input.provider.toLowerCase()]) : new Map()
111-
outputAliases = hasConnections($processSettingsStore.output.provider) ? getCloudProviderAliases($userSession?.connections[$processSettingsStore.output.provider.toLowerCase()]) : new Map()
112-
fileUploadAliases = hasConnections(fileStorage.provider) ? getCloudProviderAliases($userSession?.connections[fileStorage.provider.toLowerCase()]) : new Map()
110+
try {
111+
inputAliases = hasConnections($processSettingsStore.input.provider) ? getCloudProviderAliases($userSession?.connections[$processSettingsStore.input.provider.toLowerCase()]) : new Map()
112+
outputAliases = hasConnections($processSettingsStore.output.provider) ? getCloudProviderAliases($userSession?.connections[$processSettingsStore.output.provider.toLowerCase()]) : new Map()
113+
fileUploadAliases = hasConnections(fileStorage.provider) ? getCloudProviderAliases($userSession?.connections[fileStorage.provider.toLowerCase()]) : new Map()
113114
114-
fileStorage.provider_id = fileUploadAliases.size > 0 ? Array.from(fileUploadAliases.keys())[0] : ""
115+
fileStorage.provider_id = fileUploadAliases.size > 0 ? Array.from(fileUploadAliases.keys())[0] : ""
116+
} catch (err) {
117+
toastStore.trigger(errorToast('Error initializing aliases:' + err))
118+
}
115119
116-
const params = $page.url.searchParams
117120
118-
const reset = (params.get('reset') || 'false') === 'true'
121+
try {
119122
120-
if (reset) {
121-
$processSettingsStore = blankSettings()
122-
goto(`/processes?pipeline_id=${params.get('pipeline_id')}`)
123-
}
123+
const params = $page.url.searchParams
124124
125+
const reset = (params.get('reset') || 'false') === 'true'
125126
126-
$processSettingsStore.pipeline_id =
127-
params.get('pipeline_id') || $processSettingsStore.pipeline_id
127+
if (reset) {
128+
$processSettingsStore = blankSettings()
129+
goto(`/processes?pipeline_id=${params.get('pipeline_id')}`)
130+
}
128131
129-
$processSettingsStore.settings.language =
130-
params.get('language') || $processSettingsStore.settings.language
132+
$processSettingsStore.pipeline_id =
133+
params.get('pipeline_id') || $processSettingsStore.pipeline_id
131134
132-
$processSettingsStore.settings.notify =
133-
params.get('notify') === 'true' || $processSettingsStore.settings.notify
135+
$processSettingsStore.settings.language =
136+
params.get('language') || $processSettingsStore.settings.language
134137
135-
$processSettingsStore.settings.check_target =
136-
params.get('check_target') === 'true' || $processSettingsStore.settings.check_target
138+
$processSettingsStore.settings.notify =
139+
params.get('notify') === 'true' || $processSettingsStore.settings.notify
137140
138-
$processSettingsStore.settings.recursive =
139-
params.get('recursive') === 'true' || $processSettingsStore.settings.recursive
141+
$processSettingsStore.settings.check_target =
142+
params.get('check_target') === 'true' || $processSettingsStore.settings.check_target
140143
141-
$processSettingsStore.settings.overwrite =
142-
params.get('overwrite') === 'true' || $processSettingsStore.settings.overwrite
144+
$processSettingsStore.settings.recursive =
145+
params.get('recursive') === 'true' || $processSettingsStore.settings.recursive
143146
144-
$processSettingsStore.settings.sort_by_size =
145-
params.get('sort_by_size') === 'true' || $processSettingsStore.settings.sort_by_size
147+
$processSettingsStore.settings.overwrite =
148+
params.get('overwrite') === 'true' || $processSettingsStore.settings.overwrite
146149
147-
$processSettingsStore.settings.ignore_errors =
148-
params.get('ignore_errors') === 'true' || $processSettingsStore.settings.ignore_errors
150+
$processSettingsStore.settings.sort_by_size =
151+
params.get('sort_by_size') === 'true' || $processSettingsStore.settings.sort_by_size
149152
150-
$processSettingsStore.settings.minimum_size = +(
151-
params.get('minimum_size') || $processSettingsStore.settings.minimum_size
152-
)
153-
$processSettingsStore.settings.worker_count = +(
154-
params.get('worker_count') || $processSettingsStore.settings.worker_count
155-
)
153+
$processSettingsStore.settings.ignore_errors =
154+
params.get('ignore_errors') === 'true' || $processSettingsStore.settings.ignore_errors
156155
157-
$processSettingsStore.input.provider =
158-
(params.get('input_provider') as IOProvider) || $processSettingsStore.input.provider
159-
160-
$processSettingsStore.input.provider_id ||=
161-
params.get('input_provider_id') || Array.from(inputAliases.keys())[0] || "";
162-
163-
$processSettingsStore.input.path = params.get('input_path') || $processSettingsStore.input.path
164-
$processSettingsStore.input.content =
165-
params.get('input_content') || $processSettingsStore.input.content
166-
$processSettingsStore.input.file_extension =
167-
(params.get('input_file_extension') as FileExtension) ||
168-
$processSettingsStore.input.file_extension
169-
170-
$processSettingsStore.output.provider =
171-
(params.get('output_provider') as IOProvider) || $processSettingsStore.output.provider
172-
173-
$processSettingsStore.output.provider_id ||=
174-
params.get('output_provider_id') || Array.from(outputAliases.keys())[0] || "";
175-
$processSettingsStore.output.path =
176-
params.get('output_path') || $processSettingsStore.output.path
177-
$processSettingsStore.output.content =
178-
params.get('output_content') || $processSettingsStore.output.content
179-
$processSettingsStore.output.file_extension =
180-
(params.get('output_file_extension') as OutputFileExtension) ||
181-
$processSettingsStore.output.file_extension
182-
183-
if (hasFolderPicker($processSettingsStore.input.provider, true)) {
184-
setInputTree($processSettingsStore.input.provider, $processSettingsStore.input.provider_id, false)
185-
}
156+
$processSettingsStore.settings.minimum_size = +(
157+
params.get('minimum_size') || $processSettingsStore.settings.minimum_size
158+
)
159+
$processSettingsStore.settings.worker_count = +(
160+
params.get('worker_count') || $processSettingsStore.settings.worker_count
161+
)
186162
187-
if (hasFolderPicker($processSettingsStore.output.provider, true)) {
188-
setOutputTree($processSettingsStore.output.provider, $processSettingsStore.output.provider_id, false)
189-
}
163+
$processSettingsStore.input.provider =
164+
(params.get('input_provider') as IOProvider) || $processSettingsStore.input.provider
190165
191-
if (hasFolderPicker(fileStorage.provider, true)) {
192-
setFileUploadTree(fileStorage.provider, fileStorage.provider_id, false)
193-
}
166+
$processSettingsStore.input.provider_id ||=
167+
params.get('input_provider_id') || Array.from(inputAliases.keys())[0] || "";
194168
195-
if ($processSettingsStore.input.provider === IO.File) {
196-
$processSettingsStore.input.path = ''
197-
}
169+
$processSettingsStore.input.path = params.get('input_path') || $processSettingsStore.input.path
170+
$processSettingsStore.input.content =
171+
params.get('input_content') || $processSettingsStore.input.content
172+
$processSettingsStore.input.file_extension =
173+
(params.get('input_file_extension') as FileExtension) ||
174+
$processSettingsStore.input.file_extension
198175
199-
if ($processSettingsStore.input.provider !== IO.Text) {
200-
$processSettingsStore.input.content = ''
201-
}
176+
$processSettingsStore.output.provider =
177+
(params.get('output_provider') as IOProvider) || $processSettingsStore.output.provider
178+
179+
$processSettingsStore.output.provider_id ||=
180+
params.get('output_provider_id') || Array.from(outputAliases.keys())[0] || "";
181+
$processSettingsStore.output.path =
182+
params.get('output_path') || $processSettingsStore.output.path
183+
$processSettingsStore.output.content =
184+
params.get('output_content') || $processSettingsStore.output.content
185+
$processSettingsStore.output.file_extension =
186+
(params.get('output_file_extension') as OutputFileExtension) ||
187+
$processSettingsStore.output.file_extension
188+
189+
190+
if (hasFolderPicker($processSettingsStore.input.provider, true)) {
191+
setInputTree($processSettingsStore.input.provider, $processSettingsStore.input.provider_id, false)
192+
}
193+
194+
if (hasFolderPicker($processSettingsStore.output.provider, true)) {
195+
setOutputTree($processSettingsStore.output.provider, $processSettingsStore.output.provider_id, false)
196+
}
197+
198+
if (hasFolderPicker(fileStorage.provider, true)) {
199+
setFileUploadTree(fileStorage.provider, fileStorage.provider_id, false)
200+
}
201+
202+
if ($processSettingsStore.input.provider === IO.File) {
203+
$processSettingsStore.input.path = ''
204+
}
205+
206+
if ($processSettingsStore.input.provider !== IO.Text) {
207+
$processSettingsStore.input.content = ''
208+
}
209+
} catch (err) {
210+
toastStore.trigger(errorToast('Error initializing process settings: ' + err))
211+
}
202212
})
203213
204214
let onCancelURL =
@@ -875,7 +885,7 @@ import {
875885
{/if}
876886
</div>
877887
{#if equals($processSettingsStore.output.provider, IO.LocalDrive) }
878-
{#if Object.keys(lfs).length > 0}
888+
{#if lfs && Object.keys(lfs).length > 0}
879889
<FolderStructure
880890
tree={lfs}
881891
label="Folder Picker"

0 commit comments

Comments
 (0)