Skip to content

Commit 5b7ab46

Browse files
committed
Merge branch 'develop' of https://github.com/mathesar-foundation/mathesar into simplify-install
2 parents 78278bd + 5108099 commit 5b7ab46

File tree

8 files changed

+14
-17
lines changed

8 files changed

+14
-17
lines changed

docker-compose.dev.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ services:
3636
dev-service:
3737
container_name: mathesar_service_dev
3838
image: mathesar/mathesar-dev:latest
39+
pull_policy: never
3940
build:
4041
context: .
4142
target: development
@@ -80,6 +81,7 @@ services:
8081
- POSTGRES_PASSWORD=mathesar
8182
- POSTGRES_HOST=mathesar_dev_db
8283
- POSTGRES_PORT=5432
84+
pull_policy: never
8385
build:
8486
context: .
8587
target: ${TARGET-testing}

mathesar_ui/src/components/SchemaName.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
77
export let schema: Schema;
88
9-
$: ({ name, isPublicSchema } = schema);
9+
$: ({ name } = schema);
1010
</script>
1111

1212
<NameWithIcon icon={iconSchema} name={$name} />

mathesar_ui/src/components/sheet/clipboard/paste.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { get } from 'svelte/store';
33
import { _ } from 'svelte-i18n';
44

55
import type { Column } from '@mathesar/api/rpc/columns';
6-
import type { ResultValue } from '@mathesar/api/rpc/records';
76
import {
87
type RecordRow,
98
type RecordsData,
@@ -101,8 +100,11 @@ function getDestinationColumns(
101100
}
102101

103102
function insertViaPaste(
103+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
104104
payload: Payload,
105+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
105106
selection: SheetSelection,
107+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
106108
context: PastingContext,
107109
) {
108110
throw new Error('Insert via paste is not yet implemented.');

mathesar_ui/src/pages/database/DatabasePageWrapper.svelte

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import { getUserProfileStoreFromContext } from '@mathesar/stores/userProfile';
2727
import EditDatabaseModal from '@mathesar/systems/databases/edit-database/EditDatabaseModal.svelte';
2828
import UpgradeDatabaseModal from '@mathesar/systems/databases/upgrade-database/UpgradeDatabaseModal.svelte';
29-
import { preloadCommonData } from '@mathesar/utils/preloadData';
3029
import {
3130
Button,
3231
ButtonMenuItem,
@@ -43,13 +42,13 @@
4342
$: ({ database, underlyingDatabase } = $databaseRouteContext);
4443
$: void underlyingDatabase.runConservatively({ database_id: database.id });
4544
46-
const commonData = preloadCommonData();
47-
48-
$: currentRoleOwnsDatabase =
49-
$underlyingDatabase.resolvedValue?.currentAccess.currentRoleOwns;
50-
$: isDatabaseInInternalServer =
51-
database.server.host === commonData.internal_db.host &&
52-
database.server.port === commonData.internal_db.port;
45+
// // TODO Allow dropping databases
46+
// const commonData = preloadCommonData();
47+
// $: currentRoleOwnsDatabase =
48+
// $underlyingDatabase.resolvedValue?.currentAccess.currentRoleOwns;
49+
// $: isDatabaseInInternalServer =
50+
// database.server.host === commonData.internal_db.host &&
51+
// database.server.port === commonData.internal_db.port;
5352
5453
const permissionsModal = modal.spawnModalController();
5554
const disconnectModal = modal.spawnModalController<Database>();

mathesar_ui/src/pages/database/schemas/SchemaConstituentCounts.svelte

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<script lang="ts">
2-
import { _ } from 'svelte-i18n';
3-
42
import type { Schema } from '@mathesar/models/Schema';
53
64
export let schema: Schema;

mathesar_ui/src/pages/home/database-card/DatabaseCardContent.svelte

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<script lang="ts">
2-
import { _ } from 'svelte-i18n';
3-
42
import { iconDatabase, iconExpandRight } from '@mathesar/icons';
53
import type { Database } from '@mathesar/models/Database';
64
import { Icon } from '@mathesar-component-library';

mathesar_ui/src/stores/table-data/__tests__/utils.test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { get, readable } from 'svelte/store';
2-
import { _ } from 'svelte-i18n';
1+
import { readable } from 'svelte/store';
32

43
import type { RequestStatus } from '@mathesar/api/rest/utils/requestUtils';
54
import { ImmutableMap } from '@mathesar/component-library';

mathesar_ui/src/systems/table-view/row/RowCell.svelte

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
States,
88
} from '@mathesar/api/rest/utils/requestUtils';
99
import type { ResultValue } from '@mathesar/api/rpc/records';
10-
import type { TablePrivilege } from '@mathesar/api/rpc/tables';
1110
import CellFabric from '@mathesar/components/cell-fabric/CellFabric.svelte';
1211
import CellBackground from '@mathesar/components/CellBackground.svelte';
1312
import Identifier from '@mathesar/components/Identifier.svelte';

0 commit comments

Comments
 (0)