Skip to content

fix: QA v15 #144

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Nov 15, 2022
Merged

fix: QA v15 #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
915c99a
fix: log out, variable upload, output
ArmanNik Nov 15, 2022
ac8ef90
revert changes
ArmanNik Nov 15, 2022
08e6ac8
fix: only redirect if session is current
ArmanNik Nov 15, 2022
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
7 changes: 6 additions & 1 deletion src/routes/console/account/sessions/[[page]]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@
} from '$lib/elements/table';
import { Container } from '$lib/layout';
import { sdkForConsole } from '$lib/stores/sdk';
import { invalidate } from '$app/navigation';
import { goto, invalidate } from '$app/navigation';
import { Dependencies } from '$lib/constants';
import type { Models } from '@aw-labs/appwrite-console';
import type { PageData } from './$types';
import { trackEvent } from '$lib/actions/analytics';
import { base } from '$app/paths';

export let data: PageData;

Expand All @@ -28,11 +29,15 @@
const logout = async (session: Models.Session) => {
await sdkForConsole.account.deleteSession(session.$id);
trackEvent('submit_account_delete_session');
if (session.current) {
await goto(`${base}/login`);
}
invalidate(Dependencies.ACCOUNT_SESSIONS);
};
const logoutAll = async () => {
await sdkForConsole.account.deleteSessions();
trackEvent('submit_account_delete_all_sessions');
await goto(`${base}/login`);
invalidate(Dependencies.ACCOUNT_SESSIONS);
};
</script>
Expand Down
10 changes: 5 additions & 5 deletions src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import { page } from '$app/stores';
import type { Models } from '@aw-labs/appwrite-console';
import Variable from '../../createVariable.svelte';
import Upload from './uploadVariables.svelte';
// import Upload from './uploadVariables.svelte';
import { toLocaleDateTime } from '$lib/helpers/date';
import { Roles } from '$lib/components/permissions';
import { symmetricDifference } from '$lib/helpers/array';
Expand All @@ -38,7 +38,7 @@
const functionId = $page.params.function;
let showDelete = false;
let selectedVar: Models.Variable = null;
let showVariablesUpload = false;
// let showVariablesUpload = false;
let showVariablesModal = false;
let showVariablesValue = [];
let showVariablesDropdown = [];
Expand Down Expand Up @@ -439,10 +439,10 @@
<span class="icon-download" />
<span class="text">Download .env file</span>
</Button>
<Button secondary on:click={() => (showVariablesUpload = true)}>
<!-- <Button secondary on:click={() => (showVariablesUpload = true)}>
<span class="icon-upload" />
<span class="text">Import .env file</span>
</Button>
</Button> -->
</div>
<table class="table is-remove-outer-styles">
<thead class="table-thead">
Expand Down Expand Up @@ -575,5 +575,5 @@
bind:showCreate={showVariablesModal}
on:created={handleVariableCreated}
on:updated={handleVariableUpdated} />
<Upload bind:show={showVariablesUpload} on:uploaded={handleVariableCreated} />
<!-- <Upload bind:show={showVariablesUpload} on:uploaded={handleVariableCreated} /> -->
<EventModal bind:show={showEvents} on:created={handleEvent} />