Updated index.svelte with the same changes from +page.svelte
This commit is contained in:
		@@ -366,11 +366,12 @@
 | 
				
			|||||||
	async function reloadCompose() {
 | 
						async function reloadCompose() {
 | 
				
			||||||
		if (loading.reloadCompose) return;
 | 
							if (loading.reloadCompose) return;
 | 
				
			||||||
		loading.reloadCompose = true;
 | 
							loading.reloadCompose = true;
 | 
				
			||||||
 | 
							try {
 | 
				
			||||||
 | 
								if (application.gitSource.type === 'github') {
 | 
				
			||||||
				const composeLocation = application.dockerComposeFileLocation.startsWith('/')
 | 
									const composeLocation = application.dockerComposeFileLocation.startsWith('/')
 | 
				
			||||||
				? application.dockerComposeFileLocation
 | 
									? application.dockerComposeFileLocation
 | 
				
			||||||
				: `/${application.dockerComposeFileLocation}`;
 | 
									: `/${application.dockerComposeFileLocation}`;
 | 
				
			||||||
		try {
 | 
									
 | 
				
			||||||
			if (application.gitSource.type === 'github') {
 | 
					 | 
				
			||||||
				const headers = isPublicRepository
 | 
									const headers = isPublicRepository
 | 
				
			||||||
					? {}
 | 
										? {}
 | 
				
			||||||
					: {
 | 
										: {
 | 
				
			||||||
@@ -397,6 +398,17 @@
 | 
				
			|||||||
				if (!$appSession.tokens.gitlab) {
 | 
									if (!$appSession.tokens.gitlab) {
 | 
				
			||||||
					await getGitlabToken();
 | 
										await getGitlabToken();
 | 
				
			||||||
				}
 | 
									}
 | 
				
			||||||
 | 
									
 | 
				
			||||||
 | 
									const composeLocation = application.dockerComposeFileLocation.startsWith('/')
 | 
				
			||||||
 | 
									? application.dockerComposeFileLocation.substring(1) // Remove the '/' from the start
 | 
				
			||||||
 | 
									: application.dockerComposeFileLocation;
 | 
				
			||||||
 | 
									
 | 
				
			||||||
 | 
									// If the file is in a subdirectory, lastIndex will be > 0
 | 
				
			||||||
 | 
									// Otherwise it will be -1 and path will be an empty string
 | 
				
			||||||
 | 
									const lastIndex = composeLocation.lastIndexOf('/') + 1
 | 
				
			||||||
 | 
									const path = composeLocation.substring(0, lastIndex)
 | 
				
			||||||
 | 
									const fileName = composeLocation.substring(lastIndex)
 | 
				
			||||||
 | 
													
 | 
				
			||||||
				const headers = isPublicRepository
 | 
									const headers = isPublicRepository
 | 
				
			||||||
					? {}
 | 
										? {}
 | 
				
			||||||
					: {
 | 
										: {
 | 
				
			||||||
@@ -404,13 +416,13 @@
 | 
				
			|||||||
					  };
 | 
										  };
 | 
				
			||||||
				const url = isPublicRepository
 | 
									const url = isPublicRepository
 | 
				
			||||||
					? ``
 | 
										? ``
 | 
				
			||||||
					: `/v4/projects/${application.projectId}/repository/tree`;
 | 
										: `/v4/projects/${application.projectId}/repository/tree?path=${path}`;
 | 
				
			||||||
				const files = await get(`${apiUrl}${url}`, {
 | 
									const files = await get(`${apiUrl}${url}`, {
 | 
				
			||||||
					...headers
 | 
										...headers
 | 
				
			||||||
				});
 | 
									});
 | 
				
			||||||
				const dockerComposeFileYml = files.find(
 | 
									const dockerComposeFileYml = files.find(
 | 
				
			||||||
					(file: { name: string; type: string }) =>
 | 
										(file: { name: string; type: string }) =>
 | 
				
			||||||
						file.name === composeLocation && file.type === 'blob'
 | 
											file.name === fileName && file.type === 'blob'
 | 
				
			||||||
				);
 | 
									);
 | 
				
			||||||
				const id = dockerComposeFileYml.id;
 | 
									const id = dockerComposeFileYml.id;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user