From f73fa6daff38ea21d33a71f7bdcba34a86421333 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 21 Nov 2023 09:15:06 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../candidates/show/ml_candidates_show.vue | 206 +---------------- .../routes/candidates/show/translations.js | 26 --- .../components/candidate_detail.vue | 207 ++++++++++++++++++ .../components/candidate_detail_row.vue | 0 .../ml/model_registry/translations.js | 20 +- .../permissions/components/settings_panel.vue | 10 +- .../source_viewer/source_viewer_new.vue | 1 + app/helpers/ci/runners_helper.rb | 2 +- app/helpers/notes_helper.rb | 13 -- app/helpers/notifications_helper.rb | 36 --- app/helpers/packages_helper.rb | 4 - app/helpers/profiles_helper.rb | 4 - app/helpers/tab_helper.rb | 8 - .../ci/runner/_how_to_setup_runner.html.haml | 2 +- .../development/adherence_report_ui.yml | 8 - .../approval_rules_disable_joins.yml | 8 - .../compliance_adherence_report.yml | 8 - ...are_index_for_org_id_and_id_on_projects.rb | 15 ++ db/schema_migrations/20231120161159 | 1 + doc/api/members.md | 6 +- doc/development/ai_features/index.md | 10 +- doc/user/analytics/ci_cd_analytics.md | 15 +- .../compliance/compliance_center/index.md | 6 +- locale/gitlab.pot | 93 ++++---- qa/qa/page/project/settings/runners.rb | 19 +- .../visibility_features_permissions.rb | 8 +- .../show/ml_candidates_show_spec.js | 203 ++--------------- .../routes/candidates/show/mock_data.js | 41 ---- .../components/candidate_detail_row_spec.js | 2 +- .../components/candidate_detail_spec.js | 183 ++++++++++++++++ spec/frontend/ml/model_registry/mock_data.js | 42 ++++ spec/helpers/notes_helper_spec.rb | 17 -- spec/helpers/notifications_helper_spec.rb | 6 - vendor/project_templates/android.tar.gz | Bin 131955 -> 145318 bytes .../project_templates/astro_tailwind.tar.gz | Bin 181171 -> 181120 bytes vendor/project_templates/bridgetown.tar.gz | Bin 38125 -> 38135 bytes .../cluster_management.tar.gz | Bin 12083 -> 11542 bytes vendor/project_templates/dotnetcore.tar.gz | Bin 9775 -> 8634 bytes vendor/project_templates/express.tar.gz | Bin 28962 -> 28675 bytes vendor/project_templates/gatsby.tar.gz | Bin 739260 -> 451708 bytes .../gitpod_spring_petclinic.tar.gz | Bin 402980 -> 402764 bytes vendor/project_templates/gomicro.tar.gz | Bin 4495 -> 39222 bytes vendor/project_templates/hexo.tar.gz | Bin 546434 -> 537155 bytes vendor/project_templates/hugo.tar.gz | Bin 26755 -> 26666 bytes vendor/project_templates/iosswift.tar.gz | Bin 2421857 -> 2424935 bytes vendor/project_templates/jekyll.tar.gz | Bin 59551 -> 16962 bytes vendor/project_templates/jsonnet.tar.gz | Bin 3857 -> 4139 bytes .../kotlin_native_linux.tar.gz | Bin 60265 -> 59894 bytes vendor/project_templates/laravel.tar.gz | Bin 74342 -> 73958 bytes vendor/project_templates/middleman.tar.gz | Bin 37406 -> 37654 bytes vendor/project_templates/nfgitbook.tar.gz | Bin 121618 -> 3822 bytes vendor/project_templates/nfhexo.tar.gz | Bin 654150 -> 536459 bytes vendor/project_templates/nfhugo.tar.gz | Bin 1158440 -> 1040704 bytes vendor/project_templates/nfjekyll.tar.gz | Bin 131307 -> 13761 bytes vendor/project_templates/nfplainhtml.tar.gz | Bin 121444 -> 3652 bytes vendor/project_templates/pelican.tar.gz | Bin 42448 -> 44308 bytes vendor/project_templates/plainhtml.tar.gz | Bin 10445 -> 4391 bytes vendor/project_templates/rails.tar.gz | Bin 149743 -> 150754 bytes vendor/project_templates/salesforcedx.tar.gz | Bin 431023 -> 432762 bytes .../serverless_framework.tar.gz | Bin 94665 -> 94151 bytes vendor/project_templates/spring.tar.gz | Bin 48912 -> 53487 bytes .../tencent_serverless_framework.tar.gz | Bin 119709 -> 119287 bytes .../typo3_distribution.tar.gz | Bin 77280 -> 75443 bytes 63 files changed, 577 insertions(+), 653 deletions(-) delete mode 100644 app/assets/javascripts/ml/experiment_tracking/routes/candidates/show/translations.js create mode 100644 app/assets/javascripts/ml/model_registry/components/candidate_detail.vue rename app/assets/javascripts/ml/{experiment_tracking/routes/candidates/show => model_registry}/components/candidate_detail_row.vue (100%) delete mode 100644 config/feature_flags/development/adherence_report_ui.yml delete mode 100644 config/feature_flags/development/approval_rules_disable_joins.yml delete mode 100644 config/feature_flags/development/compliance_adherence_report.yml create mode 100644 db/post_migrate/20231120161159_prepare_index_for_org_id_and_id_on_projects.rb create mode 100644 db/schema_migrations/20231120161159 delete mode 100644 spec/frontend/ml/experiment_tracking/routes/candidates/show/mock_data.js rename spec/frontend/ml/{experiment_tracking/routes/candidates/show => model_registry}/components/candidate_detail_row_spec.js (88%) create mode 100644 spec/frontend/ml/model_registry/components/candidate_detail_spec.js diff --git a/app/assets/javascripts/ml/experiment_tracking/routes/candidates/show/ml_candidates_show.vue b/app/assets/javascripts/ml/experiment_tracking/routes/candidates/show/ml_candidates_show.vue index 43d28e3d699..ea942012af3 100644 --- a/app/assets/javascripts/ml/experiment_tracking/routes/candidates/show/ml_candidates_show.vue +++ b/app/assets/javascripts/ml/experiment_tracking/routes/candidates/show/ml_candidates_show.vue @@ -1,45 +1,15 @@ @@ -126,106 +44,6 @@ export default { /> -
- - - - {{ info.iid }} - - - {{ info.eid }} - - {{ info.status }} - - - - {{ info.experiment_name }} - - - - - - {{ $options.i18n.ARTIFACTS_LABEL }} - - - -
-
- -
-

{{ $options.i18n.CI_SECTION_LABEL }}

- - - - - - {{ ciJob.name }} - - - - - - - {{ ciJob.user.name }} - - - - - - - !{{ ciJob.merge_request.iid }} {{ ciJob.merge_request.title }} - - - -
- -
{{ $options.i18n.NO_CI_MESSAGE }}
-
- -
-

{{ $options.i18n.PARAMETERS_LABEL }}

- - - - - {{ item.value }} - - -
- -
{{ $options.i18n.NO_PARAMETERS_MESSAGE }}
-
- -
-

{{ $options.i18n.METADATA_LABEL }}

- - - - - {{ item.value }} - - -
- -
{{ $options.i18n.NO_METADATA_MESSAGE }}
-
- -
-

{{ $options.i18n.PERFORMANCE_LABEL }}

- -
- -
- -
{{ $options.i18n.NO_METRICS_MESSAGE }}
-
+ diff --git a/app/assets/javascripts/ml/experiment_tracking/routes/candidates/show/translations.js b/app/assets/javascripts/ml/experiment_tracking/routes/candidates/show/translations.js deleted file mode 100644 index 98988e1db35..00000000000 --- a/app/assets/javascripts/ml/experiment_tracking/routes/candidates/show/translations.js +++ /dev/null @@ -1,26 +0,0 @@ -import { __, s__ } from '~/locale'; - -export const TITLE_LABEL = s__('MlExperimentTracking|Model candidate details'); -export const INFO_LABEL = s__('MlExperimentTracking|Info'); -export const ID_LABEL = s__('MlExperimentTracking|ID'); -export const MLFLOW_ID_LABEL = s__('MlExperimentTracking|MLflow run ID'); -export const STATUS_LABEL = s__('MlExperimentTracking|Status'); -export const EXPERIMENT_LABEL = s__('MlExperimentTracking|Experiment'); -export const ARTIFACTS_LABEL = s__('MlExperimentTracking|Artifacts'); -export const PARAMETERS_LABEL = s__('MlExperimentTracking|Parameters'); -export const METRICS_LABEL = s__('MlExperimentTracking|Metrics'); -export const PERFORMANCE_LABEL = s__('MlExperimentTracking|Model performance'); -export const METADATA_LABEL = s__('MlExperimentTracking|Metadata'); -export const NO_PARAMETERS_MESSAGE = s__('MlExperimentTracking|No logged parameters'); -export const NO_METRICS_MESSAGE = s__('MlExperimentTracking|No logged metrics'); -export const NO_METADATA_MESSAGE = s__('MlExperimentTracking|No logged metadata'); -export const NO_CI_MESSAGE = s__('MlExperimentTracking|Candidate not linked to a CI build'); -export const DELETE_CANDIDATE_CONFIRMATION_MESSAGE = s__( - 'MlExperimentTracking|Deleting this candidate will delete the associated parameters, metrics, and metadata.', -); -export const DELETE_CANDIDATE_PRIMARY_ACTION_LABEL = s__('MlExperimentTracking|Delete candidate'); -export const DELETE_CANDIDATE_MODAL_TITLE = s__('MLExperimentTracking|Delete candidate?'); -export const CI_SECTION_LABEL = s__('MLExperimentTracking|CI Info'); -export const JOB_LABEL = __('Job'); -export const CI_USER_LABEL = s__('MlExperimentTracking|Triggered by'); -export const CI_MR_LABEL = __('Merge request'); diff --git a/app/assets/javascripts/ml/model_registry/components/candidate_detail.vue b/app/assets/javascripts/ml/model_registry/components/candidate_detail.vue new file mode 100644 index 00000000000..8c32fb3a2c6 --- /dev/null +++ b/app/assets/javascripts/ml/model_registry/components/candidate_detail.vue @@ -0,0 +1,207 @@ + + + diff --git a/app/assets/javascripts/ml/experiment_tracking/routes/candidates/show/components/candidate_detail_row.vue b/app/assets/javascripts/ml/model_registry/components/candidate_detail_row.vue similarity index 100% rename from app/assets/javascripts/ml/experiment_tracking/routes/candidates/show/components/candidate_detail_row.vue rename to app/assets/javascripts/ml/model_registry/components/candidate_detail_row.vue diff --git a/app/assets/javascripts/ml/model_registry/translations.js b/app/assets/javascripts/ml/model_registry/translations.js index 89b3f45ed94..689eeb45b00 100644 --- a/app/assets/javascripts/ml/model_registry/translations.js +++ b/app/assets/javascripts/ml/model_registry/translations.js @@ -1,4 +1,4 @@ -import { s__, n__ } from '~/locale'; +import { __, s__, n__ } from '~/locale'; export const MODEL_DETAILS_TAB_LABEL = s__('MlModelRegistry|Details'); export const MODEL_OTHER_VERSIONS_TAB_LABEL = s__('MlModelRegistry|Versions'); @@ -14,3 +14,21 @@ export const NO_MODELS_LABEL = s__('MlModelRegistry|No models registered in this export const modelsCountLabel = (modelCount) => n__('MlModelRegistry|%d model', 'MlModelRegistry|%d models', modelCount); + +export const INFO_LABEL = s__('MlModelRegistry|Info'); +export const ID_LABEL = s__('MlModelRegistry|ID'); +export const MLFLOW_ID_LABEL = s__('MlModelRegistry|MLflow run ID'); +export const STATUS_LABEL = s__('MlModelRegistry|Status'); +export const EXPERIMENT_LABEL = s__('MlModelRegistry|Experiment'); +export const ARTIFACTS_LABEL = s__('MlModelRegistry|Artifacts'); +export const PARAMETERS_LABEL = s__('MlModelRegistry|Parameters'); +export const PERFORMANCE_LABEL = s__('MlModelRegistry|Model performance'); +export const METADATA_LABEL = s__('MlModelRegistry|Metadata'); +export const NO_PARAMETERS_MESSAGE = s__('MlModelRegistry|No logged parameters'); +export const NO_METRICS_MESSAGE = s__('MlModelRegistry|No logged metrics'); +export const NO_METADATA_MESSAGE = s__('MlModelRegistry|No logged metadata'); +export const NO_CI_MESSAGE = s__('MlModelRegistry|Candidate not linked to a CI build'); +export const CI_SECTION_LABEL = s__('MlModelRegistry|CI Info'); +export const JOB_LABEL = __('Job'); +export const CI_USER_LABEL = s__('MlModelRegistry|Triggered by'); +export const CI_MR_LABEL = __('Merge request'); diff --git a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue index 6ff48b7de95..c6d18a1328b 100644 --- a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue +++ b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue @@ -571,7 +571,7 @@ export default { :disabled="!canChangeVisibilityLevel" name="project[visibility_level]" class="form-control select-control" - data-qa-selector="project_visibility_dropdown" + data-testid="project-visibility-dropdown" >