Skip to content
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.

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

chore: fix remove view desc test #6696

Merged
merged 3 commits into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/rust_ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ env:

jobs:
self-hosted-job:
if: github.event.pull_request.head.repo.full_name != github.repository
if: github.event.pull_request.head.repo.full_name == github.repository
runs-on: self-hosted
steps:
- name: Checkout source code
Expand Down
26 changes: 14 additions & 12 deletions frontend/appflowy_tauri/src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion frontend/rust-lib/event-integration-test/src/chat_event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ impl EventIntegrationTest {
let payload = CreateViewPayloadPB {
parent_view_id: parent_id.to_string(),
name: "chat".to_string(),
desc: "".to_string(),
thumbnail: None,
layout: ViewLayoutPB::Chat,
initial_data: vec![],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ impl EventIntegrationTest {
let payload = CreateViewPayloadPB {
parent_view_id: parent_id.to_string(),
name,
desc: "".to_string(),
thumbnail: None,
layout: ViewLayoutPB::Grid,
initial_data,
Expand Down Expand Up @@ -71,7 +70,6 @@ impl EventIntegrationTest {
let payload = CreateViewPayloadPB {
parent_view_id: parent_id.to_string(),
name,
desc: "".to_string(),
thumbnail: None,
layout: ViewLayoutPB::Board,
initial_data,
Expand Down Expand Up @@ -99,7 +97,6 @@ impl EventIntegrationTest {
let payload = CreateViewPayloadPB {
parent_view_id: parent_id.to_string(),
name,
desc: "".to_string(),
thumbnail: None,
layout: ViewLayoutPB::Calendar,
initial_data,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ impl DocumentEventTest {
let payload = CreateViewPayloadPB {
parent_view_id: parent_id.to_string(),
name: "document".to_string(),
desc: "".to_string(),
thumbnail: None,
layout: ViewLayoutPB::Document,
initial_data: vec![],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ impl EventIntegrationTest {
let payload = CreateViewPayloadPB {
parent_view_id: parent_id.to_string(),
name,
desc: "".to_string(),
thumbnail: None,
layout: ViewLayoutPB::Document,
initial_data,
Expand Down
4 changes: 0 additions & 4 deletions frontend/rust-lib/event-integration-test/src/folder_event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ impl EventIntegrationTest {
.map(|view| CreateViewParams {
parent_view_id: view.parent_view_id,
name: view.name,
desc: "".to_string(),
layout: view.layout.into(),
view_id: view.id,
initial_data: ViewData::Empty,
Expand Down Expand Up @@ -154,7 +153,6 @@ impl EventIntegrationTest {
pub async fn create_orphan_view(&self, name: &str, view_id: &str, layout: ViewLayoutPB) {
let payload = CreateOrphanViewPayloadPB {
name: name.to_string(),
desc: "".to_string(),
layout,
view_id: view_id.to_string(),
initial_data: vec![],
Expand Down Expand Up @@ -288,7 +286,6 @@ impl EventIntegrationTest {
let payload = CreateViewPayloadPB {
parent_view_id: parent_id.to_string(),
name,
desc: "".to_string(),
thumbnail: None,
layout,
initial_data: vec![],
Expand Down Expand Up @@ -354,7 +351,6 @@ impl ViewTest {
let payload = CreateViewPayloadPB {
parent_view_id: workspace.id.clone(),
name: "View A".to_string(),
desc: "".to_string(),
thumbnail: Some("http://1.png".to_string()),
layout: layout.into(),
initial_data: data,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,13 +254,12 @@ pub async fn create_view(
sdk: &EventIntegrationTest,
parent_view_id: &str,
name: &str,
desc: &str,
_desc: &str,
layout: ViewLayout,
) -> ViewPB {
let request = CreateViewPayloadPB {
parent_view_id: parent_view_id.to_string(),
name: name.to_string(),
desc: desc.to_string(),
thumbnail: None,
layout: layout.into(),
initial_data: vec![],
Expand Down
2 changes: 0 additions & 2 deletions frontend/rust-lib/flowy-folder/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,4 @@ pub mod manager_test_util;

pub mod publish_util;
pub mod share;
#[cfg(feature = "test_helper")]
mod test_helper;
mod util;
58 changes: 0 additions & 58 deletions frontend/rust-lib/flowy-folder/src/test_helper.rs

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ impl UserDataMigration for CollabDocKeyWithWorkspaceIdMigration {
"collab_doc_key_with_workspace_id"
}

fn run_when(&self, first_installed_version: &Option<Version>, _current_version: &Version) -> bool {
fn run_when(
&self,
first_installed_version: &Option<Version>,
_current_version: &Version,
) -> bool {
match first_installed_version {
None => {
// The user's initial installed version is None if they were using an AppFlowy version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ impl UserDataMigration for HistoricalEmptyDocumentMigration {
"historical_empty_document"
}

fn run_when(&self, first_installed_version: &Option<Version>, _current_version: &Version) -> bool {
fn run_when(
&self,
first_installed_version: &Option<Version>,
_current_version: &Version,
) -> bool {
match first_installed_version {
None => true,
Some(version) => version < &Version::new(0, 4, 0),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ impl UserDataMigration for FavoriteV1AndWorkspaceArrayMigration {
"workspace_favorite_v1_and_workspace_array_migration"
}

fn run_when(&self, first_installed_version: &Option<Version>, _current_version: &Version) -> bool {
fn run_when(
&self,
first_installed_version: &Option<Version>,
_current_version: &Version,
) -> bool {
match first_installed_version {
None => true,
Some(version) => version < &Version::new(0, 4, 0),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ impl UserDataMigration for WorkspaceTrashMapToSectionMigration {
"workspace_trash_map_to_section_migration"
}

fn run_when(&self, first_installed_version: &Option<Version>, _current_version: &Version) -> bool {
fn run_when(
&self,
first_installed_version: &Option<Version>,
_current_version: &Version,
) -> bool {
match first_installed_version {
None => true,
Some(version) => version < &Version::new(0, 4, 0),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ use crate::services::entities::{UserConfig, UserPaths};
use crate::services::sqlite_sql::user_sql::vacuum_database;
use collab_integrate::CollabKVDB;


use arc_swap::ArcSwapOption;
use collab_plugins::local_storage::kv::doc::CollabKVAction;
use collab_plugins::local_storage::kv::KVTransactionDB;
Expand Down
Loading